From ae2c25954cfc9e8b746f798c0683bddc1ad449bf Mon Sep 17 00:00:00 2001 From: Matjaz Debelak Date: Tue, 24 Sep 2024 14:53:07 +0200 Subject: [PATCH] Moved the logging config function from an old project locally into this project --- backend/analytics/utils.go | 3 +- backend/applications/middleware.go | 2 +- backend/asset/copy-objects.go | 2 +- backend/asset/ingest.go | 2 +- backend/asset/s3_files.go | 2 +- backend/asset/timedmetadata.go | 2 +- backend/auth0/authentication.go | 2 +- backend/cmd/api/handlers.go | 2 +- backend/cmd/api/loaders.go | 2 +- backend/cmd/api/main.go | 2 +- backend/cmd/jobs/main.go | 2 +- backend/cmd/jobs/server/server.go | 2 +- backend/cmd/jobs/update-handler.go | 2 +- backend/cmd/rewriter/api.go | 2 +- backend/cmd/rewriter/main.go | 2 +- backend/cmd/staging-sync/main.go | 2 +- backend/cmd/tools/assets.go | 2 +- backend/cmd/tools/main.go | 2 +- backend/common/locale-string.go | 2 +- backend/crowdin/build.go | 2 +- backend/crowdin/client.go | 2 +- backend/crowdin/files.go | 2 +- backend/crowdin/items.go | 2 +- backend/crowdin/sync.go | 2 +- backend/events/event-handler.go | 2 +- backend/export/export.go | 2 +- backend/graph/api/collection-resolver.go | 2 +- backend/graph/api/model/calendar-entry.go | 2 +- backend/graph/api/mutations.resolvers.go | 2 +- backend/graph/api/persons.resolvers.go | 2 +- backend/graph/api/resolver.go | 2 +- backend/graph/api/schema.resolvers.go | 2 +- backend/items/collection/filter.go | 2 +- backend/items/collection/loader.go | 2 +- backend/jsonlogic/filter.go | 2 +- backend/jsonlogic/filter_test.go | 2 +- backend/loaders/loader.go | 2 +- backend/log/log.go | 40 +++++++++++++++++++++++ backend/maintenance/views.go | 2 +- backend/notifications/targets.go | 2 +- backend/push/client.go | 2 +- backend/remotecache/lock.go | 3 +- backend/scheduler/client.go | 2 +- backend/search/indexing.go | 2 +- backend/signing/signer.go | 2 +- backend/signing/signer_test.go | 2 +- backend/sqlc/config.go | 2 +- backend/statistics/event-handler.go | 2 +- backend/user/middleware/fake_user.go | 2 +- backend/user/middleware/profiles.go | 2 +- backend/user/middleware/user.go | 2 +- backend/utils/converters.go | 2 +- backend/utils/database.go | 2 +- backend/utils/errors.go | 2 +- backend/utils/language-map.go | 2 +- backend/utils/redis.go | 2 +- backend/utils/tracing.go | 2 +- go.mod | 1 - go.sum | 2 -- 59 files changed, 98 insertions(+), 59 deletions(-) create mode 100644 backend/log/log.go diff --git a/backend/analytics/utils.go b/backend/analytics/utils.go index 37bc44025..507f5d3bf 100644 --- a/backend/analytics/utils.go +++ b/backend/analytics/utils.go @@ -8,8 +8,9 @@ import ( "math/rand" "strconv" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" + + "github.com/bcc-code/bcc-media-platform/backend/log" ) // GenerateID for use in analytics based on profileID diff --git a/backend/applications/middleware.go b/backend/applications/middleware.go index 71dc2a4e6..04c095202 100644 --- a/backend/applications/middleware.go +++ b/backend/applications/middleware.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/ansel1/merry/v2" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/user" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/samber/lo" ) diff --git a/backend/asset/copy-objects.go b/backend/asset/copy-objects.go index bc53326a7..b31f669e0 100644 --- a/backend/asset/copy-objects.go +++ b/backend/asset/copy-objects.go @@ -12,7 +12,7 @@ import ( "github.com/ansel1/merry/v2" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "go.opentelemetry.io/otel" ) diff --git a/backend/asset/ingest.go b/backend/asset/ingest.go index e461950fb..78a12244e 100644 --- a/backend/asset/ingest.go +++ b/backend/asset/ingest.go @@ -28,7 +28,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/bcc-code/bcc-media-platform/backend/events" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" cloudevents "github.com/cloudevents/sdk-go/v2" "github.com/google/uuid" "github.com/samber/lo" diff --git a/backend/asset/s3_files.go b/backend/asset/s3_files.go index 117fc569d..1a34aa674 100644 --- a/backend/asset/s3_files.go +++ b/backend/asset/s3_files.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/bcc-code/bcc-media-platform/backend/asset/smil" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" ) func readJSONFromS3[T any](ctx context.Context, client *s3.Client, bucket *string, path string, obj *T) error { diff --git a/backend/asset/timedmetadata.go b/backend/asset/timedmetadata.go index 7ac4d8fb0..6f379c494 100644 --- a/backend/asset/timedmetadata.go +++ b/backend/asset/timedmetadata.go @@ -5,9 +5,9 @@ import ( "context" "sync" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/backend/auth0/authentication.go b/backend/auth0/authentication.go index b270730ab..af22dc6b6 100644 --- a/backend/auth0/authentication.go +++ b/backend/auth0/authentication.go @@ -2,12 +2,12 @@ package auth0 import ( "context" + "github.com/bcc-code/bcc-media-platform/backend/log" "net/url" "strconv" "strings" "time" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/samber/lo" diff --git a/backend/cmd/api/handlers.go b/backend/cmd/api/handlers.go index c025f780a..b8d4c6758 100644 --- a/backend/cmd/api/handlers.go +++ b/backend/cmd/api/handlers.go @@ -18,13 +18,13 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/graph/gqltracer" graphpublic "github.com/bcc-code/bcc-media-platform/backend/graph/public" graphpublicgenerated "github.com/bcc-code/bcc-media-platform/backend/graph/public/generated" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/remotecache" "github.com/bcc-code/bcc-media-platform/backend/search" "github.com/bcc-code/bcc-media-platform/backend/signing" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/vektah/gqlparser/v2/gqlerror" ) diff --git a/backend/cmd/api/loaders.go b/backend/cmd/api/loaders.go index 1b69acf31..c3f811577 100644 --- a/backend/cmd/api/loaders.go +++ b/backend/cmd/api/loaders.go @@ -13,10 +13,10 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/common" "github.com/bcc-code/bcc-media-platform/backend/items/collection" "github.com/bcc-code/bcc-media-platform/backend/loaders" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/members" "github.com/bcc-code/bcc-media-platform/backend/memorycache" "github.com/bcc-code/bcc-media-platform/backend/sqlc" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" "gopkg.in/guregu/null.v4" diff --git a/backend/cmd/api/main.go b/backend/cmd/api/main.go index dc89ddb25..1d572c9c2 100644 --- a/backend/cmd/api/main.go +++ b/backend/cmd/api/main.go @@ -30,6 +30,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/bcc-code/bcc-media-platform/backend/auth0" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/members" "github.com/bcc-code/bcc-media-platform/backend/search" "github.com/bcc-code/bcc-media-platform/backend/signing" @@ -37,7 +38,6 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" "github.com/bcc-code/bcc-media-platform/backend/version" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" _ "github.com/lib/pq" diff --git a/backend/cmd/jobs/main.go b/backend/cmd/jobs/main.go index 21c7c6ab8..8a27266fb 100644 --- a/backend/cmd/jobs/main.go +++ b/backend/cmd/jobs/main.go @@ -13,6 +13,7 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/crowdin" "github.com/bcc-code/bcc-media-platform/backend/events" "github.com/bcc-code/bcc-media-platform/backend/files" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/members" "github.com/bcc-code/bcc-media-platform/backend/notifications" "github.com/bcc-code/bcc-media-platform/backend/push" @@ -24,7 +25,6 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/utils" "github.com/bcc-code/bcc-media-platform/backend/version" "github.com/bcc-code/bcc-media-platform/backend/videomanipulator" - "github.com/bcc-code/mediabank-bridge/log" "github.com/bsm/redislock" "github.com/gin-gonic/gin" _ "github.com/lib/pq" diff --git a/backend/cmd/jobs/server/server.go b/backend/cmd/jobs/server/server.go index c3ac34b8d..9224f5bd4 100644 --- a/backend/cmd/jobs/server/server.go +++ b/backend/cmd/jobs/server/server.go @@ -18,9 +18,9 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/crowdin" "github.com/bcc-code/bcc-media-platform/backend/events" externalevents "github.com/bcc-code/bcc-media-platform/backend/external-events" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/maintenance" "github.com/bcc-code/bcc-media-platform/backend/pubsub" - "github.com/bcc-code/mediabank-bridge/log" cloudevents "github.com/cloudevents/sdk-go/v2" "github.com/davecgh/go-spew/spew" "github.com/gin-gonic/gin" diff --git a/backend/cmd/jobs/update-handler.go b/backend/cmd/jobs/update-handler.go index 25af17452..c464ae849 100644 --- a/backend/cmd/jobs/update-handler.go +++ b/backend/cmd/jobs/update-handler.go @@ -5,13 +5,13 @@ import ( "time" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/members" "github.com/bcc-code/bcc-media-platform/backend/notifications" "github.com/bcc-code/bcc-media-platform/backend/push" "github.com/bcc-code/bcc-media-platform/backend/remotecache" "github.com/bcc-code/bcc-media-platform/backend/scheduler" "github.com/bcc-code/bcc-media-platform/backend/sqlc" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" ) diff --git a/backend/cmd/rewriter/api.go b/backend/cmd/rewriter/api.go index 96f2de1d4..fc2c3f683 100644 --- a/backend/cmd/rewriter/api.go +++ b/backend/cmd/rewriter/api.go @@ -4,8 +4,8 @@ import ( _ "embed" "encoding/json" "github.com/ansel1/merry/v2" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "io" "net/http" "os" diff --git a/backend/cmd/rewriter/main.go b/backend/cmd/rewriter/main.go index bf9032e3f..ed5448276 100644 --- a/backend/cmd/rewriter/main.go +++ b/backend/cmd/rewriter/main.go @@ -3,9 +3,9 @@ package main import ( "bytes" "fmt" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/utils" "github.com/bcc-code/bcc-media-platform/backend/version" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/rs/zerolog" "golang.org/x/net/html" diff --git a/backend/cmd/staging-sync/main.go b/backend/cmd/staging-sync/main.go index 46edae2db..3dfca6311 100644 --- a/backend/cmd/staging-sync/main.go +++ b/backend/cmd/staging-sync/main.go @@ -7,9 +7,9 @@ import ( "os/exec" "time" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/utils" "github.com/bcc-code/bcc-media-platform/migrations" - "github.com/bcc-code/mediabank-bridge/log" _ "github.com/lib/pq" "github.com/pressly/goose/v3" "github.com/rs/zerolog" diff --git a/backend/cmd/tools/assets.go b/backend/cmd/tools/assets.go index e731f81a4..a891eca62 100644 --- a/backend/cmd/tools/assets.go +++ b/backend/cmd/tools/assets.go @@ -3,8 +3,8 @@ package main import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/samber/lo" "gopkg.in/guregu/null.v4" diff --git a/backend/cmd/tools/main.go b/backend/cmd/tools/main.go index 3ec528ad7..2a9d4ec21 100644 --- a/backend/cmd/tools/main.go +++ b/backend/cmd/tools/main.go @@ -2,9 +2,9 @@ package main import ( "context" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/rs/zerolog" "os" diff --git a/backend/common/locale-string.go b/backend/common/locale-string.go index f3c9bc846..348a59072 100644 --- a/backend/common/locale-string.go +++ b/backend/common/locale-string.go @@ -2,9 +2,9 @@ package common import ( "encoding/json" + "github.com/bcc-code/bcc-media-platform/backend/log" "strings" - "github.com/bcc-code/mediabank-bridge/log" "gopkg.in/guregu/null.v4" ) diff --git a/backend/crowdin/build.go b/backend/crowdin/build.go index 4d8df6c0e..7b027344d 100644 --- a/backend/crowdin/build.go +++ b/backend/crowdin/build.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/samber/lo" ) diff --git a/backend/crowdin/client.go b/backend/crowdin/client.go index db0b764da..257df747e 100644 --- a/backend/crowdin/client.go +++ b/backend/crowdin/client.go @@ -11,7 +11,7 @@ import ( cache "github.com/Code-Hex/go-generics-cache" "github.com/ansel1/merry/v2" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/go-resty/resty/v2" "github.com/samber/lo" ) diff --git a/backend/crowdin/files.go b/backend/crowdin/files.go index f37024150..195318dfe 100644 --- a/backend/crowdin/files.go +++ b/backend/crowdin/files.go @@ -6,7 +6,7 @@ import ( "time" cache "github.com/Code-Hex/go-generics-cache" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/samber/lo" ) diff --git a/backend/crowdin/items.go b/backend/crowdin/items.go index 0abedae4b..81f7a6777 100644 --- a/backend/crowdin/items.go +++ b/backend/crowdin/items.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" "gopkg.in/guregu/null.v4" diff --git a/backend/crowdin/sync.go b/backend/crowdin/sync.go index 0d7acd0d6..fce017010 100644 --- a/backend/crowdin/sync.go +++ b/backend/crowdin/sync.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/samber/lo" ) diff --git a/backend/events/event-handler.go b/backend/events/event-handler.go index 9c9868111..590b28bae 100644 --- a/backend/events/event-handler.go +++ b/backend/events/event-handler.go @@ -4,7 +4,7 @@ import ( "context" "github.com/ansel1/merry/v2" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" cevent "github.com/cloudevents/sdk-go/v2/event" ) diff --git a/backend/export/export.go b/backend/export/export.go index cf4b99435..d3e278e0c 100644 --- a/backend/export/export.go +++ b/backend/export/export.go @@ -27,8 +27,8 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/export/sqlexport" "github.com/bcc-code/bcc-media-platform/backend/items/collection" "github.com/bcc-code/bcc-media-platform/backend/items/show" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" - "github.com/bcc-code/mediabank-bridge/log" _ "github.com/glebarez/go-sqlite" "github.com/samber/lo" diff --git a/backend/graph/api/collection-resolver.go b/backend/graph/api/collection-resolver.go index dad2d75bd..ec5231ded 100644 --- a/backend/graph/api/collection-resolver.go +++ b/backend/graph/api/collection-resolver.go @@ -9,9 +9,9 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/common" "github.com/bcc-code/bcc-media-platform/backend/graph/api/model" "github.com/bcc-code/bcc-media-platform/backend/items/collection" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" ) diff --git a/backend/graph/api/model/calendar-entry.go b/backend/graph/api/model/calendar-entry.go index 72c539e55..e7ff558e5 100644 --- a/backend/graph/api/model/calendar-entry.go +++ b/backend/graph/api/model/calendar-entry.go @@ -3,9 +3,9 @@ package model import ( "context" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "strconv" "time" ) diff --git a/backend/graph/api/mutations.resolvers.go b/backend/graph/api/mutations.resolvers.go index bbab110c4..951ab2562 100644 --- a/backend/graph/api/mutations.resolvers.go +++ b/backend/graph/api/mutations.resolvers.go @@ -17,11 +17,11 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/email" "github.com/bcc-code/bcc-media-platform/backend/graph/api/generated" "github.com/bcc-code/bcc-media-platform/backend/graph/api/model" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/ratelimit" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" null "gopkg.in/guregu/null.v4" diff --git a/backend/graph/api/persons.resolvers.go b/backend/graph/api/persons.resolvers.go index f26626293..a0d5d2e46 100644 --- a/backend/graph/api/persons.resolvers.go +++ b/backend/graph/api/persons.resolvers.go @@ -12,9 +12,9 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/common" "github.com/bcc-code/bcc-media-platform/backend/graph/api/generated" "github.com/bcc-code/bcc-media-platform/backend/graph/api/model" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/samber/lo" ) diff --git a/backend/graph/api/resolver.go b/backend/graph/api/resolver.go index a8577f5de..907b1fde8 100644 --- a/backend/graph/api/resolver.go +++ b/backend/graph/api/resolver.go @@ -12,7 +12,6 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/remotecache" "github.com/bcc-code/bcc-media-platform/backend/ratelimit" - "github.com/bcc-code/mediabank-bridge/log" "github.com/cloudevents/sdk-go/v2/event/datacodec/json" "github.com/google/uuid" "github.com/sqlc-dev/pqtype" @@ -22,6 +21,7 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/export" "github.com/bcc-code/bcc-media-platform/backend/graph/api/model" "github.com/bcc-code/bcc-media-platform/backend/loaders" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/memorycache" "github.com/gin-gonic/gin" "go.opentelemetry.io/otel" diff --git a/backend/graph/api/schema.resolvers.go b/backend/graph/api/schema.resolvers.go index 19d360a7a..3c9b4fc47 100644 --- a/backend/graph/api/schema.resolvers.go +++ b/backend/graph/api/schema.resolvers.go @@ -20,12 +20,12 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/export" "github.com/bcc-code/bcc-media-platform/backend/graph/api/generated" "github.com/bcc-code/bcc-media-platform/backend/graph/api/model" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/memorycache" "github.com/bcc-code/bcc-media-platform/backend/ratelimit" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/lestrrat-go/jwx/v2/jwa" "github.com/lestrrat-go/jwx/v2/jwt" diff --git a/backend/items/collection/filter.go b/backend/items/collection/filter.go index 75e84769c..697e41772 100644 --- a/backend/items/collection/filter.go +++ b/backend/items/collection/filter.go @@ -8,7 +8,7 @@ import ( "github.com/Masterminds/squirrel" "github.com/bcc-code/bcc-media-platform/backend/common" "github.com/bcc-code/bcc-media-platform/backend/jsonlogic" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/google/uuid" "github.com/lib/pq" "strconv" diff --git a/backend/items/collection/loader.go b/backend/items/collection/loader.go index e21b2977c..9a44c6f6c 100644 --- a/backend/items/collection/loader.go +++ b/backend/items/collection/loader.go @@ -10,7 +10,7 @@ import ( "github.com/samber/lo/parallel" "github.com/bcc-code/bcc-media-platform/backend/common" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/graph-gophers/dataloader/v7" "github.com/samber/lo" ) diff --git a/backend/jsonlogic/filter.go b/backend/jsonlogic/filter.go index 48aabe7f4..c1eb34fcd 100644 --- a/backend/jsonlogic/filter.go +++ b/backend/jsonlogic/filter.go @@ -3,11 +3,11 @@ package jsonlogic import ( "encoding/json" "fmt" + "github.com/bcc-code/bcc-media-platform/backend/log" "strings" "github.com/Masterminds/squirrel" "github.com/ansel1/merry/v2" - "github.com/bcc-code/mediabank-bridge/log" "github.com/lib/pq" ) diff --git a/backend/jsonlogic/filter_test.go b/backend/jsonlogic/filter_test.go index 175a933f2..6e80688fb 100644 --- a/backend/jsonlogic/filter_test.go +++ b/backend/jsonlogic/filter_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Masterminds/squirrel" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/lib/pq" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" diff --git a/backend/loaders/loader.go b/backend/loaders/loader.go index 9165c59f2..bda81e848 100644 --- a/backend/loaders/loader.go +++ b/backend/loaders/loader.go @@ -2,9 +2,9 @@ package loaders import ( "context" + "github.com/bcc-code/bcc-media-platform/backend/log" "reflect" - "github.com/bcc-code/mediabank-bridge/log" "github.com/graph-gophers/dataloader/v7" ) diff --git a/backend/log/log.go b/backend/log/log.go new file mode 100644 index 000000000..2d201175f --- /dev/null +++ b/backend/log/log.go @@ -0,0 +1,40 @@ +package log + +import ( + "os" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/pkgerrors" +) + +// L is the main exposed logger +var L *zerolog.Logger + +// ConfigureGlobalLogger with the correct formatter and debug level +func ConfigureGlobalLogger(logLevel zerolog.Level) { + zerolog.SetGlobalLevel(logLevel) + zerolog.LevelFieldName = "severity" + + zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack + + logger := zerolog. + New(os.Stderr). + With(). + Timestamp(). + Stack() + + // Automatically detect if we are in GCR and apply Stackdriver log format + // https://cloud.google.com/run/docs/reference/container-contract#env-vars + serviceName := os.Getenv("K_SERVICE") + println("Service Name: " + serviceName) + if serviceName != "" { + logger.Str("service", serviceName). + Str("revision", os.Getenv("K_REVISION")).Logger() + l := logger.Logger() + L = &l + return + } + + l := logger.Logger().Output(zerolog.ConsoleWriter{Out: os.Stderr, NoColor: false}) + L = &l +} diff --git a/backend/maintenance/views.go b/backend/maintenance/views.go index c389f6ca2..1e903c905 100644 --- a/backend/maintenance/views.go +++ b/backend/maintenance/views.go @@ -5,8 +5,8 @@ import ( "github.com/ansel1/merry/v2" "github.com/bcc-code/bcc-media-platform/backend/events" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" - "github.com/bcc-code/mediabank-bridge/log" cloudevents "github.com/cloudevents/sdk-go/v2" "go.opentelemetry.io/otel" ) diff --git a/backend/notifications/targets.go b/backend/notifications/targets.go index 6e7eb7721..4ee524a24 100644 --- a/backend/notifications/targets.go +++ b/backend/notifications/targets.go @@ -4,9 +4,9 @@ import ( "context" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/targets" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" ) diff --git a/backend/push/client.go b/backend/push/client.go index 3cb709783..42e591271 100644 --- a/backend/push/client.go +++ b/backend/push/client.go @@ -6,8 +6,8 @@ import ( "firebase.google.com/go" "firebase.google.com/go/messaging" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" - "github.com/bcc-code/mediabank-bridge/log" "github.com/samber/lo/parallel" ) diff --git a/backend/remotecache/lock.go b/backend/remotecache/lock.go index 21fa366f1..2605a2c03 100644 --- a/backend/remotecache/lock.go +++ b/backend/remotecache/lock.go @@ -2,8 +2,9 @@ package remotecache import ( "context" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bsm/redislock" + "time" ) diff --git a/backend/scheduler/client.go b/backend/scheduler/client.go index 58ab15eee..4a7bf1127 100644 --- a/backend/scheduler/client.go +++ b/backend/scheduler/client.go @@ -6,8 +6,8 @@ import ( "context" "encoding/json" "errors" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "google.golang.org/api/iterator" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/backend/search/indexing.go b/backend/search/indexing.go index 8b40f0e06..fa0a0a7a2 100644 --- a/backend/search/indexing.go +++ b/backend/search/indexing.go @@ -10,7 +10,7 @@ import ( "github.com/algolia/algoliasearch-client-go/v3/algolia/opt" "github.com/algolia/algoliasearch-client-go/v3/algolia/search" "github.com/bcc-code/bcc-media-platform/backend/common" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/samber/lo" ) diff --git a/backend/signing/signer.go b/backend/signing/signer.go index 4fb451b0f..332dbea3f 100644 --- a/backend/signing/signer.go +++ b/backend/signing/signer.go @@ -2,13 +2,13 @@ package signing import ( "encoding/base64" + "github.com/bcc-code/bcc-media-platform/backend/log" "net/url" "regexp" "time" "github.com/ansel1/merry/v2" "github.com/aws/aws-sdk-go/service/cloudfront/sign" - "github.com/bcc-code/mediabank-bridge/log" "github.com/lestrrat-go/jwx/v2/jwa" "github.com/lestrrat-go/jwx/v2/jwk" "github.com/lestrrat-go/jwx/v2/jwt" diff --git a/backend/signing/signer_test.go b/backend/signing/signer_test.go index 303bc732c..de832802a 100644 --- a/backend/signing/signer_test.go +++ b/backend/signing/signer_test.go @@ -1,7 +1,7 @@ package signing import ( - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/rs/zerolog" ) diff --git a/backend/sqlc/config.go b/backend/sqlc/config.go index 7a7e6d2a5..b814e112a 100644 --- a/backend/sqlc/config.go +++ b/backend/sqlc/config.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" "github.com/bcc-code/bcc-media-platform/backend/common" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" ) // GetGlobalConfig returns configuration options for app diff --git a/backend/statistics/event-handler.go b/backend/statistics/event-handler.go index 22eba2c98..f7ea83099 100644 --- a/backend/statistics/event-handler.go +++ b/backend/statistics/event-handler.go @@ -6,9 +6,9 @@ import ( "embed" "errors" "github.com/ansel1/merry/v2" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/google/uuid" "github.com/samber/lo" "go.opentelemetry.io/otel" diff --git a/backend/user/middleware/fake_user.go b/backend/user/middleware/fake_user.go index e644280e9..ebd75bf5e 100644 --- a/backend/user/middleware/fake_user.go +++ b/backend/user/middleware/fake_user.go @@ -5,8 +5,8 @@ import ( "github.com/bcc-code/bcc-media-platform/backend/auth0" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/user" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" ) diff --git a/backend/user/middleware/profiles.go b/backend/user/middleware/profiles.go index 99f5f614b..965da7f4f 100644 --- a/backend/user/middleware/profiles.go +++ b/backend/user/middleware/profiles.go @@ -7,11 +7,11 @@ import ( cache "github.com/Code-Hex/go-generics-cache" "github.com/bcc-code/bcc-media-platform/backend/applications" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/remotecache" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/samber/lo" diff --git a/backend/user/middleware/user.go b/backend/user/middleware/user.go index f3812f280..e17bb4beb 100644 --- a/backend/user/middleware/user.go +++ b/backend/user/middleware/user.go @@ -13,12 +13,12 @@ import ( "github.com/ansel1/merry/v2" "github.com/bcc-code/bcc-media-platform/backend/auth0" "github.com/bcc-code/bcc-media-platform/backend/common" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/bcc-code/bcc-media-platform/backend/members" "github.com/bcc-code/bcc-media-platform/backend/remotecache" "github.com/bcc-code/bcc-media-platform/backend/sqlc" "github.com/bcc-code/bcc-media-platform/backend/user" "github.com/bcc-code/bcc-media-platform/backend/utils" - "github.com/bcc-code/mediabank-bridge/log" "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/samber/lo" diff --git a/backend/utils/converters.go b/backend/utils/converters.go index 7f6dee074..8fd2d3dac 100644 --- a/backend/utils/converters.go +++ b/backend/utils/converters.go @@ -2,7 +2,7 @@ package utils import ( "github.com/ansel1/merry/v2" - "github.com/bcc-code/mediabank-bridge/log" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/google/uuid" "github.com/samber/lo" ) diff --git a/backend/utils/database.go b/backend/utils/database.go index 437ad2200..f6888db53 100644 --- a/backend/utils/database.go +++ b/backend/utils/database.go @@ -3,9 +3,9 @@ package utils import ( "context" "database/sql" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/XSAM/otelsql" - "github.com/bcc-code/mediabank-bridge/log" "github.com/samber/lo" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" ) diff --git a/backend/utils/errors.go b/backend/utils/errors.go index 66753dd92..6d10d87f4 100644 --- a/backend/utils/errors.go +++ b/backend/utils/errors.go @@ -1,6 +1,6 @@ package utils -import "github.com/bcc-code/mediabank-bridge/log" +import "github.com/bcc-code/bcc-media-platform/backend/log" // LogError if it occurs func LogError(f func() error) { diff --git a/backend/utils/language-map.go b/backend/utils/language-map.go index c0175f779..14562f678 100644 --- a/backend/utils/language-map.go +++ b/backend/utils/language-map.go @@ -1,6 +1,6 @@ package utils -import "github.com/bcc-code/mediabank-bridge/log" +import "github.com/bcc-code/bcc-media-platform/backend/log" var langMap = map[string]string{ "nor": "no", diff --git a/backend/utils/redis.go b/backend/utils/redis.go index afcc0c561..c18cd64e9 100644 --- a/backend/utils/redis.go +++ b/backend/utils/redis.go @@ -2,9 +2,9 @@ package utils import ( "context" + "github.com/bcc-code/bcc-media-platform/backend/log" "github.com/samber/lo" - "github.com/bcc-code/mediabank-bridge/log" "github.com/redis/go-redis/v9" ) diff --git a/backend/utils/tracing.go b/backend/utils/tracing.go index 8fede21d0..48ef563d1 100644 --- a/backend/utils/tracing.go +++ b/backend/utils/tracing.go @@ -1,11 +1,11 @@ package utils import ( + "github.com/bcc-code/bcc-media-platform/backend/log" "os" "strconv" texporter "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace" - "github.com/bcc-code/mediabank-bridge/log" "github.com/uptrace/uptrace-go/uptrace" "go.opentelemetry.io/otel" stdout "go.opentelemetry.io/otel/exporters/stdout/stdouttrace" diff --git a/go.mod b/go.mod index 1e5e4dba5..ea645bcce 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.19.0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.24.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.40.2 - github.com/bcc-code/mediabank-bridge v1.1.1 github.com/bsm/redislock v0.9.4 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index 580f4d8f2..4e396e98e 100644 --- a/go.sum +++ b/go.sum @@ -519,8 +519,6 @@ github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/bcc-code/mediabank-bridge v1.1.1 h1:9nnoicJvAnIY0IeNamQwKnj0/LRS2jLYF8ZOcHYvzDM= -github.com/bcc-code/mediabank-bridge v1.1.1/go.mod h1:q4CQKCNK/y0JnytZ8rTouRN2TVXOh0tJlz2U8qFHtNk= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=