diff --git a/automod/consumer/firehose.go b/automod/consumer/firehose.go index 6dfc7770..ac0d1c82 100644 --- a/automod/consumer/firehose.go +++ b/automod/consumer/firehose.go @@ -13,13 +13,13 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/automod" + "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/autoscaling" "github.com/bluesky-social/indigo/events/schedulers/parallel" lexutil "github.com/bluesky-social/indigo/lex/util" - - "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/repomgr" + "github.com/earthboundkid/versioninfo/v2" "github.com/gorilla/websocket" "github.com/redis/go-redis/v9" diff --git a/cmd/beemo/firehose_consumer.go b/cmd/beemo/firehose_consumer.go index de5330e4..10216da7 100644 --- a/cmd/beemo/firehose_consumer.go +++ b/cmd/beemo/firehose_consumer.go @@ -11,12 +11,12 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" appbsky "github.com/bluesky-social/indigo/api/bsky" "github.com/bluesky-social/indigo/atproto/syntax" + "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/parallel" lexutil "github.com/bluesky-social/indigo/lex/util" - - "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/repo" "github.com/bluesky-social/indigo/repomgr" + "github.com/earthboundkid/versioninfo/v2" "github.com/gorilla/websocket" ) diff --git a/cmd/bigsky/main.go b/cmd/bigsky/main.go index 73e48988..b6f0296e 100644 --- a/cmd/bigsky/main.go +++ b/cmd/bigsky/main.go @@ -5,7 +5,6 @@ import ( "fmt" "log/slog" "net/http" - _ "net/http/pprof" "net/url" "os" "os/signal" @@ -14,6 +13,10 @@ import ( "syscall" "time" + _ "github.com/joho/godotenv/autoload" + _ "go.uber.org/automaxprocs" + _ "net/http/pprof" + libbgs "github.com/bluesky-social/indigo/bgs" "github.com/bluesky-social/indigo/carstore" "github.com/bluesky-social/indigo/did" @@ -28,9 +31,6 @@ import ( "github.com/bluesky-social/indigo/util/cliutil" "github.com/bluesky-social/indigo/xrpc" - _ "github.com/joho/godotenv/autoload" - _ "go.uber.org/automaxprocs" - "github.com/earthboundkid/versioninfo/v2" "github.com/urfave/cli/v2" "go.opentelemetry.io/otel" diff --git a/cmd/bluepages/firehose.go b/cmd/bluepages/firehose.go index 2bbcd38b..b6b59abe 100644 --- a/cmd/bluepages/firehose.go +++ b/cmd/bluepages/firehose.go @@ -10,9 +10,9 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" + "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/parallel" - "github.com/bluesky-social/indigo/events" "github.com/earthboundkid/versioninfo/v2" "github.com/gorilla/websocket" "github.com/redis/go-redis/v9" diff --git a/cmd/bluepages/main.go b/cmd/bluepages/main.go index bae62aa3..b493e083 100644 --- a/cmd/bluepages/main.go +++ b/cmd/bluepages/main.go @@ -6,16 +6,17 @@ import ( "fmt" "io" "log/slog" - _ "net/http/pprof" "os" "runtime" "strings" + _ "github.com/joho/godotenv/autoload" + _ "net/http/pprof" + "github.com/bluesky-social/indigo/atproto/identity/apidir" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/earthboundkid/versioninfo/v2" - _ "github.com/joho/godotenv/autoload" "github.com/urfave/cli/v2" ) diff --git a/cmd/fakermaker/main.go b/cmd/fakermaker/main.go index 5d9f5807..4a2fa5ef 100644 --- a/cmd/fakermaker/main.go +++ b/cmd/fakermaker/main.go @@ -11,13 +11,13 @@ import ( "os" "runtime" + _ "github.com/joho/godotenv/autoload" + _ "go.uber.org/automaxprocs" + comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/fakedata" "github.com/bluesky-social/indigo/util/cliutil" - _ "github.com/joho/godotenv/autoload" - _ "go.uber.org/automaxprocs" - "github.com/earthboundkid/versioninfo/v2" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" diff --git a/cmd/gosky/account.go b/cmd/gosky/account.go index edabfaf2..6df0709a 100644 --- a/cmd/gosky/account.go +++ b/cmd/gosky/account.go @@ -10,7 +10,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/util/cliutil" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) var accountCmd = &cli.Command{ diff --git a/cmd/gosky/admin.go b/cmd/gosky/admin.go index bf11d8e7..ad012652 100644 --- a/cmd/gosky/admin.go +++ b/cmd/gosky/admin.go @@ -17,7 +17,8 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/handles" "github.com/bluesky-social/indigo/util/cliutil" - cli "github.com/urfave/cli/v2" + + "github.com/urfave/cli/v2" ) var adminCmd = &cli.Command{ diff --git a/cmd/gosky/bgs.go b/cmd/gosky/bgs.go index 5e49f34a..20867f5c 100644 --- a/cmd/gosky/bgs.go +++ b/cmd/gosky/bgs.go @@ -9,7 +9,8 @@ import ( "strconv" "github.com/bluesky-social/indigo/xrpc" - cli "github.com/urfave/cli/v2" + + "github.com/urfave/cli/v2" ) var bgsAdminCmd = &cli.Command{ diff --git a/cmd/gosky/bsky.go b/cmd/gosky/bsky.go index 95f4a7a6..cc1641de 100644 --- a/cmd/gosky/bsky.go +++ b/cmd/gosky/bsky.go @@ -13,7 +13,7 @@ import ( "github.com/bluesky-social/indigo/util" "github.com/bluesky-social/indigo/util/cliutil" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) var bskyCmd = &cli.Command{ diff --git a/cmd/gosky/car.go b/cmd/gosky/car.go index 288a4640..2098a2cd 100644 --- a/cmd/gosky/car.go +++ b/cmd/gosky/car.go @@ -12,7 +12,7 @@ import ( "github.com/bluesky-social/indigo/repo" "github.com/ipfs/go-cid" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) var carCmd = &cli.Command{ diff --git a/cmd/gosky/debug.go b/cmd/gosky/debug.go index d7e28dc1..7aa644c2 100644 --- a/cmd/gosky/debug.go +++ b/cmd/gosky/debug.go @@ -34,7 +34,7 @@ import ( "github.com/ipfs/go-cid" "github.com/ipfs/go-libipfs/blocks" "github.com/ipld/go-car/v2" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) var debugCmd = &cli.Command{ diff --git a/cmd/gosky/did.go b/cmd/gosky/did.go index 405ef999..f60af491 100644 --- a/cmd/gosky/did.go +++ b/cmd/gosky/did.go @@ -9,7 +9,7 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/util/cliutil" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) var didCmd = &cli.Command{ diff --git a/cmd/gosky/handle.go b/cmd/gosky/handle.go index ae32ab80..a12b214d 100644 --- a/cmd/gosky/handle.go +++ b/cmd/gosky/handle.go @@ -9,7 +9,7 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/util/cliutil" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) var handleCmd = &cli.Command{ diff --git a/cmd/gosky/main.go b/cmd/gosky/main.go index 8459fe9e..49385f47 100644 --- a/cmd/gosky/main.go +++ b/cmd/gosky/main.go @@ -15,6 +15,8 @@ import ( "syscall" "time" + _ "github.com/joho/godotenv/autoload" + "github.com/bluesky-social/indigo/api/atproto" comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/api/bsky" @@ -28,22 +30,19 @@ import ( "github.com/bluesky-social/indigo/util" "github.com/bluesky-social/indigo/util/cliutil" "github.com/bluesky-social/indigo/xrpc" - "golang.org/x/time/rate" + "github.com/earthboundkid/versioninfo/v2" "github.com/gorilla/websocket" lru "github.com/hashicorp/golang-lru/v2" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" blockstore "github.com/ipfs/go-ipfs-blockstore" "github.com/ipld/go-car" - - _ "github.com/joho/godotenv/autoload" - - "github.com/earthboundkid/versioninfo/v2" "github.com/polydawn/refmt/cbor" rejson "github.com/polydawn/refmt/json" "github.com/polydawn/refmt/shared" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" + "golang.org/x/time/rate" ) var log = slog.Default().With("system", "gosky") diff --git a/cmd/gosky/streamdiff.go b/cmd/gosky/streamdiff.go index 0ff59f88..e1ab67af 100644 --- a/cmd/gosky/streamdiff.go +++ b/cmd/gosky/streamdiff.go @@ -8,8 +8,9 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/sequential" + "github.com/gorilla/websocket" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) // TODO: WIP - turns out to be more complicated than i initially thought diff --git a/cmd/hepa/main.go b/cmd/hepa/main.go index 65892fdd..cf99824c 100644 --- a/cmd/hepa/main.go +++ b/cmd/hepa/main.go @@ -7,12 +7,14 @@ import ( "io" "log/slog" "net/http" - _ "net/http/pprof" "os" "runtime" "strings" "time" + _ "github.com/joho/godotenv/autoload" + _ "net/http/pprof" + "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/identity/redisdir" "github.com/bluesky-social/indigo/atproto/syntax" @@ -20,8 +22,7 @@ import ( "github.com/bluesky-social/indigo/automod/consumer" "github.com/earthboundkid/versioninfo/v2" - _ "github.com/joho/godotenv/autoload" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" "golang.org/x/time/rate" ) diff --git a/cmd/lexgen/main.go b/cmd/lexgen/main.go index 620bcba1..25681310 100644 --- a/cmd/lexgen/main.go +++ b/cmd/lexgen/main.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - lex "github.com/bluesky-social/indigo/lex" - cli "github.com/urfave/cli/v2" + "github.com/bluesky-social/indigo/lex" + "github.com/urfave/cli/v2" ) func findSchemas(dir string, out []string) ([]string, error) { diff --git a/cmd/netsync/main.go b/cmd/netsync/main.go index f7714e3f..2ee50648 100644 --- a/cmd/netsync/main.go +++ b/cmd/netsync/main.go @@ -19,18 +19,18 @@ import ( "syscall" "time" + _ "github.com/joho/godotenv/autoload" + "github.com/bluesky-social/indigo/atproto/atdata" "github.com/bluesky-social/indigo/repo" + + "github.com/earthboundkid/versioninfo/v2" "github.com/ipfs/go-cid" - _ "github.com/joho/godotenv/autoload" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" - - "golang.org/x/time/rate" - - "github.com/earthboundkid/versioninfo/v2" "github.com/urfave/cli/v2" + "golang.org/x/time/rate" ) func main() { diff --git a/cmd/palomar/main.go b/cmd/palomar/main.go index 9de47176..f5e29123 100644 --- a/cmd/palomar/main.go +++ b/cmd/palomar/main.go @@ -13,13 +13,6 @@ import ( "time" _ "github.com/joho/godotenv/autoload" - "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" - "go.opentelemetry.io/otel/sdk/resource" - tracesdk "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.4.0" - "golang.org/x/time/rate" "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/search" @@ -27,7 +20,14 @@ import ( "github.com/earthboundkid/versioninfo/v2" es "github.com/opensearch-project/opensearch-go/v2" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" + "go.opentelemetry.io/otel/sdk/resource" + tracesdk "go.opentelemetry.io/otel/sdk/trace" + semconv "go.opentelemetry.io/otel/semconv/v1.4.0" + "golang.org/x/time/rate" ) func main() { diff --git a/cmd/querycheck/main.go b/cmd/querycheck/main.go index b1a4f7c8..3a06440e 100644 --- a/cmd/querycheck/main.go +++ b/cmd/querycheck/main.go @@ -5,26 +5,24 @@ import ( "fmt" "log" "log/slog" + "net/http" "os" "os/signal" "sync" "syscall" - "net/http" _ "net/http/pprof" "github.com/bluesky-social/indigo/querycheck" "github.com/bluesky-social/indigo/util/tracing" + + "github.com/earthboundkid/versioninfo/v2" "github.com/labstack/echo-contrib/pprof" "github.com/labstack/echo/v4" - "github.com/labstack/echo/v4/middleware" - "github.com/prometheus/client_golang/prometheus/promhttp" - "go.opentelemetry.io/otel/trace" - - "github.com/earthboundkid/versioninfo/v2" "github.com/urfave/cli/v2" + "go.opentelemetry.io/otel/trace" ) func main() { diff --git a/cmd/sonar/main.go b/cmd/sonar/main.go index 8cb471e0..3864204a 100644 --- a/cmd/sonar/main.go +++ b/cmd/sonar/main.go @@ -13,13 +13,14 @@ import ( "syscall" "time" + _ "go.uber.org/automaxprocs" + "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/schedulers/sequential" - "github.com/gorilla/websocket" - "github.com/prometheus/client_golang/prometheus/promhttp" - _ "go.uber.org/automaxprocs" "github.com/earthboundkid/versioninfo/v2" + "github.com/gorilla/websocket" + "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/urfave/cli/v2" ) diff --git a/cmd/stress/main.go b/cmd/stress/main.go index 056aa32e..129992c8 100644 --- a/cmd/stress/main.go +++ b/cmd/stress/main.go @@ -9,6 +9,8 @@ import ( "sync" "time" + _ "github.com/joho/godotenv/autoload" + comatproto "github.com/bluesky-social/indigo/api/atproto" appbsky "github.com/bluesky-social/indigo/api/bsky" "github.com/bluesky-social/indigo/carstore" @@ -18,16 +20,13 @@ import ( "github.com/bluesky-social/indigo/util/cliutil" "github.com/bluesky-social/indigo/xrpc" + "github.com/earthboundkid/versioninfo/v2" "github.com/ipfs/go-cid" "github.com/ipfs/go-datastore" blockstore "github.com/ipfs/go-ipfs-blockstore" cbor "github.com/ipfs/go-ipld-cbor" - - _ "github.com/joho/godotenv/autoload" - - "github.com/earthboundkid/versioninfo/v2" "github.com/ipld/go-car" - cli "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2" ) func main() { diff --git a/cmd/supercollider/main.go b/cmd/supercollider/main.go index 42941b2b..a527277a 100644 --- a/cmd/supercollider/main.go +++ b/cmd/supercollider/main.go @@ -7,6 +7,7 @@ import ( "log" "log/slog" "net" + "net/http" "os" "os/signal" "path/filepath" @@ -15,7 +16,7 @@ import ( "syscall" "time" - "net/http" + _ "go.uber.org/automaxprocs" _ "net/http/pprof" "github.com/bluesky-social/indigo/api/atproto" @@ -26,31 +27,29 @@ import ( "github.com/bluesky-social/indigo/events" "github.com/bluesky-social/indigo/events/yolopersist" "github.com/bluesky-social/indigo/indexer" + lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/bluesky-social/indigo/models" "github.com/bluesky-social/indigo/plc" - petname "github.com/dustinkirkland/golang-petname" - "github.com/icrowley/fake" - "github.com/labstack/echo-contrib/pprof" - "github.com/urfave/cli/v2" - godid "github.com/whyrusleeping/go-did" - "golang.org/x/crypto/acme/autocert" - "golang.org/x/time/rate" - - lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/bluesky-social/indigo/repomgr" "github.com/bluesky-social/indigo/util" + + petname "github.com/dustinkirkland/golang-petname" + "github.com/earthboundkid/versioninfo/v2" "github.com/gorilla/websocket" + "github.com/icrowley/fake" + "github.com/labstack/echo-contrib/pprof" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" - _ "go.uber.org/automaxprocs" + "github.com/urfave/cli/v2" + cbg "github.com/whyrusleeping/cbor-gen" + godid "github.com/whyrusleeping/go-did" + "golang.org/x/crypto/acme/autocert" + "golang.org/x/time/rate" "gorm.io/driver/sqlite" "gorm.io/gorm" - - "github.com/earthboundkid/versioninfo/v2" - cbg "github.com/whyrusleeping/cbor-gen" ) var eventsGeneratedCounter = promauto.NewCounter(prometheus.CounterOpts{ diff --git a/search/firehose.go b/search/firehose.go index e0ccd99a..0dea17c9 100644 --- a/search/firehose.go +++ b/search/firehose.go @@ -17,11 +17,11 @@ import ( "github.com/bluesky-social/indigo/events/schedulers/autoscaling" lexutil "github.com/bluesky-social/indigo/lex/util" "github.com/bluesky-social/indigo/repo" - typegen "github.com/whyrusleeping/cbor-gen" "github.com/earthboundkid/versioninfo/v2" "github.com/gorilla/websocket" "github.com/ipfs/go-cid" + typegen "github.com/whyrusleeping/cbor-gen" ) func (idx *Indexer) getLastCursor() (int64, error) { @@ -219,7 +219,7 @@ func (idx *Indexer) handleCreateOrUpdate(ctx context.Context, rawDID string, rev } switch rec := rec.(type) { - case *bsky.FeedPost: + case *appbsky.FeedPost: rkey, err := syntax.ParseTID(parts[1]) if err != nil { logger.Warn("skipping post record with non-TID rkey") @@ -236,7 +236,7 @@ func (idx *Indexer) handleCreateOrUpdate(ctx context.Context, rawDID string, rev // Send the job to the bulk indexer idx.postQueue <- &job postsIndexed.Inc() - case *bsky.ActorProfile: + case *appbsky.ActorProfile: if parts[1] != "self" { return nil } @@ -330,7 +330,7 @@ func (idx *Indexer) processTooBigCommit(ctx context.Context, evt *comatproto.Syn } switch rec := rec.(type) { - case *bsky.FeedPost: + case *appbsky.FeedPost: rkey, err := syntax.ParseTID(parts[1]) if err != nil { logger.Warn("skipping post record with non-TID rkey") @@ -346,7 +346,7 @@ func (idx *Indexer) processTooBigCommit(ctx context.Context, evt *comatproto.Syn // Send the job to the bulk indexer idx.postQueue <- &job - case *bsky.ActorProfile: + case *appbsky.ActorProfile: if parts[1] != "self" { return nil } diff --git a/search/server.go b/search/server.go index bd5bb479..9cd9c92e 100644 --- a/search/server.go +++ b/search/server.go @@ -9,6 +9,8 @@ import ( "os" "strings" + _ "net/http/pprof" // For pprof in the metrics server + "github.com/bluesky-social/indigo/atproto/identity" "github.com/earthboundkid/versioninfo/v2" @@ -18,8 +20,6 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" slogecho "github.com/samber/slog-echo" "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" - - _ "net/http/pprof" // For pprof in the metrics server ) type LastSeq struct { diff --git a/xrpc/xrpc.go b/xrpc/xrpc.go index f1cd14b8..0df0f149 100644 --- a/xrpc/xrpc.go +++ b/xrpc/xrpc.go @@ -14,6 +14,7 @@ import ( "time" "github.com/bluesky-social/indigo/util" + "github.com/earthboundkid/versioninfo/v2" )