Merge pull request #1009 from bcc-code/chore/logging-lib

Moved the logging config function from an old project locally into th…

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

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"
 )

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"
 )
 

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"

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 {

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"

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"
 

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"
 )

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"

backend/cmd/api/main.go

@@ -30,14 +30,14 @@ 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"
 	"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/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"

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"

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"

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"
 )

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"

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"

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"

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"

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"

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"
 )
 

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"
 )
 

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"
 )

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"
 )
 

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"

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"
 )
 

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"
 )
 

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"
 

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"
 )

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"
 )

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"

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"
 )
 

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"

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"

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"

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"
 )

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"
 )