From 9888798158ca4c8246596a8ff52df816f7cc4059 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Mon, 28 Jul 2025 16:36:10 +0530 Subject: [PATCH 01/25] initial commit --- pkg/gofr/container/datasources.go | 8 + .../dbresolver/dbresolver-wrapper.go | 69 ++++ pkg/gofr/datasource/dbresolver/go.mod | 88 ++++ pkg/gofr/datasource/dbresolver/go.sum | 342 ++++++++++++++++ pkg/gofr/datasource/dbresolver/logger.go | 40 ++ pkg/gofr/datasource/dbresolver/metrics.go | 11 + pkg/gofr/datasource/dbresolver/resolver.go | 378 ++++++++++++++++++ pkg/gofr/datasource/dbresolver/strategy.go | 62 +++ pkg/gofr/external_db.go | 102 +++++ 9 files changed, 1100 insertions(+) create mode 100644 pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go create mode 100644 pkg/gofr/datasource/dbresolver/go.mod create mode 100644 pkg/gofr/datasource/dbresolver/go.sum create mode 100644 pkg/gofr/datasource/dbresolver/logger.go create mode 100644 pkg/gofr/datasource/dbresolver/metrics.go create mode 100644 pkg/gofr/datasource/dbresolver/resolver.go create mode 100644 pkg/gofr/datasource/dbresolver/strategy.go diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go index 4430c6059..5ee125f75 100644 --- a/pkg/gofr/container/datasources.go +++ b/pkg/gofr/container/datasources.go @@ -721,3 +721,11 @@ type ElasticsearchProvider interface { provider } + +// DBResolverProvider defines an interface for SQL read/write splitting providers +type DBResolverProvider interface { + // Build creates a resolver with the given primary and replicas + Build(primary DB, replicas []DB) DB + + provider +} diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go new file mode 100644 index 000000000..f06e4290d --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go @@ -0,0 +1,69 @@ +package dbresolver + +import ( + "gofr.dev/pkg/gofr/container" +) + +// ResolverWrapper implements container.Provider interface +// and acts as an adapter to the actual Resolver implementation +type ResolverWrapper struct { + logger Logger + metrics Metrics + tracer interface{} + strategy string + readFallback bool +} + +// NewProvider creates a new resolver provider +func NewProvider(strategy string, readFallback bool) *ResolverWrapper { + return &ResolverWrapper{ + strategy: strategy, + readFallback: readFallback, + } +} + +// UseLogger sets the logger for the resolver +func (r *ResolverWrapper) UseLogger(logger interface{}) { + if l, ok := logger.(Logger); ok { + r.logger = l + } +} + +// UseMetrics sets the metrics for the resolver +func (r *ResolverWrapper) UseMetrics(metrics interface{}) { + if m, ok := metrics.(Metrics); ok { + r.metrics = m + } +} + +// UseTracer sets the tracer for the resolver +func (r *ResolverWrapper) UseTracer(tracer interface{}) { + r.tracer = tracer +} + +// Connect is a no-op as we don't need to establish connections +func (r *ResolverWrapper) Connect() { + // No-op - we don't create connections, we use existing ones +} + +// Build creates a resolver with the given primary and replicas +func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) container.DB { + if primary == nil { + panic("primary database cannot be nil") + } + + // Create options for the resolver + opts := []Option{ + WithStrategy(r.strategy), + WithReadFallback(r.readFallback), + } + + // Add strategy option + opts = append(opts, WithStrategy(r.strategy)) + + // Add read fallback option + opts = append(opts, WithReadFallback(r.readFallback)) + + // Create and return the resolver + return New(primary, replicas, r.logger, r.metrics, opts...) +} diff --git a/pkg/gofr/datasource/dbresolver/go.mod b/pkg/gofr/datasource/dbresolver/go.mod new file mode 100644 index 000000000..1f05f8317 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/go.mod @@ -0,0 +1,88 @@ +module gofr.dev/pkg/gofr/datasource/dbresolver + +go 1.24.5 + +require gofr.dev v1.42.4 + +require ( + cloud.google.com/go v0.120.0 // indirect + cloud.google.com/go/auth v0.16.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect + cloud.google.com/go/compute/metadata v0.7.0 // indirect + cloud.google.com/go/iam v1.5.2 // indirect + cloud.google.com/go/pubsub v1.49.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect + github.com/XSAM/otelsql v0.39.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-sql-driver/mysql v1.9.3 // indirect + github.com/golang-jwt/jwt/v5 v5.2.2 // indirect + github.com/google/s2a-go v0.1.9 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect + github.com/googleapis/gax-go/v2 v2.14.2 // indirect + github.com/gorilla/mux v1.8.1 // indirect + github.com/gorilla/websocket v1.5.3 // indirect + github.com/joho/godotenv v1.5.1 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/ncruces/go-strftime v0.1.9 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.22.0 // indirect + github.com/prometheus/client_model v0.6.2 // indirect + github.com/prometheus/common v0.65.0 // indirect + github.com/prometheus/procfs v0.16.1 // indirect + github.com/redis/go-redis/extra/rediscmd/v9 v9.11.0 // indirect + github.com/redis/go-redis/extra/redisotel/v9 v9.11.0 // indirect + github.com/redis/go-redis/v9 v9.11.0 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/segmentio/kafka-go v0.4.48 // indirect + github.com/stretchr/testify v1.10.0 // indirect + github.com/xdg-go/pbkdf2 v1.0.0 // indirect + github.com/xdg-go/scram v1.1.2 // indirect + github.com/xdg-go/stringprep v1.0.4 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.62.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect + go.opentelemetry.io/otel v1.37.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.59.0 // indirect + go.opentelemetry.io/otel/metric v1.37.0 // indirect + go.opentelemetry.io/otel/sdk v1.37.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect + go.opentelemetry.io/otel/trace v1.37.0 // indirect + go.uber.org/mock v0.5.2 // indirect + golang.org/x/crypto v0.39.0 // indirect + golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect + golang.org/x/net v0.41.0 // indirect + golang.org/x/oauth2 v0.30.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/sys v0.34.0 // indirect + golang.org/x/term v0.33.0 // indirect + golang.org/x/text v0.27.0 // indirect + golang.org/x/time v0.12.0 // indirect + google.golang.org/api v0.241.0 // indirect + google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect + google.golang.org/grpc v1.73.0 // indirect + google.golang.org/protobuf v1.36.6 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + modernc.org/libc v1.65.10 // indirect + modernc.org/mathutil v1.7.1 // indirect + modernc.org/memory v1.11.0 // indirect + modernc.org/sqlite v1.38.0 // indirect +) diff --git a/pkg/gofr/datasource/dbresolver/go.sum b/pkg/gofr/datasource/dbresolver/go.sum new file mode 100644 index 000000000..ba60eb31d --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/go.sum @@ -0,0 +1,342 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA= +cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q= +cloud.google.com/go/auth v0.16.2 h1:QvBAGFPLrDeoiNjyfVunhQ10HKNYuOwZ5noee0M5df4= +cloud.google.com/go/auth v0.16.2/go.mod h1:sRBas2Y1fB1vZTdurouM0AzuYQBMZinrUYL8EufhtEA= +cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= +cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c= +cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU= +cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo= +cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8= +cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE= +cloud.google.com/go/kms v1.21.2 h1:c/PRUSMNQ8zXrc1sdAUnsenWWaNXN+PzTXfXOcSFdoE= +cloud.google.com/go/kms v1.21.2/go.mod h1:8wkMtHV/9Z8mLXEXr1GK7xPSBdi6knuLXIhqjuWcI6w= +cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE= +cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY= +cloud.google.com/go/pubsub v1.49.0 h1:5054IkbslnrMCgA2MAEPcsN3Ky+AyMpEZcii/DoySPo= +cloud.google.com/go/pubsub v1.49.0/go.mod h1:K1FswTWP+C1tI/nfi3HQecoVeFvL4HUOB1tdaNXKhUY= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= +github.com/XSAM/otelsql v0.39.0 h1:4o374mEIMweaeevL7fd8Q3C710Xi2Jh/c8G4Qy9bvCY= +github.com/XSAM/otelsql v0.39.0/go.mod h1:uMOXLUX+wkuAuP0AR3B45NXX7E9lJS2mERa8gqdU8R0= +github.com/alicebob/miniredis/v2 v2.35.0 h1:QwLphYqCEAo1eu1TqPRN2jgVMPBweeQcR21jeqDCONI= +github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +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= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= +github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= +github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0= +github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4= +github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA= +github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0= +github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= +github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= +github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= +github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= +github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE= +github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= +github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= +github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= +github.com/redis/go-redis/extra/rediscmd/v9 v9.11.0 h1:vP5CH2rJ3L4yk3o8FdXqiPL1lGl5APjHcxk5/OT6H0Q= +github.com/redis/go-redis/extra/rediscmd/v9 v9.11.0/go.mod h1:/2yj0RD4xjZQ7wOg9u7gVoBM0IgMGrHunAql1hr1NDg= +github.com/redis/go-redis/extra/redisotel/v9 v9.11.0 h1:dMNmusapfQefntfUqAYAvaVJMrJCdKUaQoPSZtd99WU= +github.com/redis/go-redis/extra/redisotel/v9 v9.11.0/go.mod h1:Yy5oaeVwWj7KMu6Mga/i4imlXFvgitQWN5HFiT5JqoE= +github.com/redis/go-redis/v9 v9.11.0 h1:E3S08Gl/nJNn5vkxd2i78wZxWAPNZgUNTp8WIJUAiIs= +github.com/redis/go-redis/v9 v9.11.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/segmentio/kafka-go v0.4.48 h1:9jyu9CWK4W5W+SroCe8EffbrRZVqAOkuaLd/ApID4Vs= +github.com/segmentio/kafka-go v0.4.48/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= +github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= +go.einride.tech/aip v0.68.1 h1:16/AfSxcQISGN5z9C5lM+0mLYXihrHbQ1onvYTr93aQ= +go.einride.tech/aip v0.68.1/go.mod h1:XaFtaj4HuA3Zwk9xoBtTWgNubZ0ZZXv9BZJCkuKuWbg= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo= +go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.62.0 h1:wCeciVlAfb5DC8MQl/DlmAv/FVPNpQgFvI/71+hatuc= +go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.62.0/go.mod h1:WfEApdZDMlLUAev/0QQpr8EJ/z0VWDKYZ5tF5RH5T1U= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY= +go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= +go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/otel/exporters/prometheus v0.59.0 h1:HHf+wKS6o5++XZhS98wvILrLVgHxjA/AMjqHKes+uzo= +go.opentelemetry.io/otel/exporters/prometheus v0.59.0/go.mod h1:R8GpRXTZrqvXHDEGVH5bF6+JqAZcK8PjJcZ5nGhEWiE= +go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= +go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= +go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= +go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= +go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= +go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= +go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= +go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= +gofr.dev v1.42.4 h1:Nd58Rw1/9ydzZ8dn9d6s5lh3DkzsVKXQ0gYKpLUEDfM= +gofr.dev v1.42.4/go.mod h1:y/tFyLFsRYdxYijVyLPqO9LjLqLd66Ee/pYgK/rxc28= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM= +golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= +golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= +golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= +golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= +golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= +golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo= +golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.241.0 h1:QKwqWQlkc6O895LchPEDUSYr22Xp3NCxpQRiWTB6avE= +google.golang.org/api v0.241.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78= +google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk= +google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY= +google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok= +google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s= +modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= +modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU= +modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE= +modernc.org/fileutil v1.3.3 h1:3qaU+7f7xxTUmvU1pJTZiDLAIoJVdUSSauJNHg9yXoA= +modernc.org/fileutil v1.3.3/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc= +modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= +modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= +modernc.org/libc v1.65.10 h1:ZwEk8+jhW7qBjHIT+wd0d9VjitRyQef9BnzlzGwMODc= +modernc.org/libc v1.65.10/go.mod h1:StFvYpx7i/mXtBAfVOjaU0PWZOvIRoZSgXhrwXzr8Po= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= +modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= +modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= +modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= +modernc.org/sqlite v1.38.0 h1:+4OrfPQ8pxHKuWG4md1JpR/EYAh3Md7TdejuuzE7EUI= +modernc.org/sqlite v1.38.0/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE= +modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= +modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= +modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= +modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= diff --git a/pkg/gofr/datasource/dbresolver/logger.go b/pkg/gofr/datasource/dbresolver/logger.go new file mode 100644 index 000000000..75a8e7e57 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/logger.go @@ -0,0 +1,40 @@ +package dbresolver + +import ( + "fmt" + "io" + "regexp" + "strings" +) + +// Logger defines the logging interface for dbresolver +type Logger interface { + Debug(args ...any) + Debugf(pattern string, args ...any) + Logf(pattern string, args ...any) + Errorf(pattern string, args ...any) + Warnf(pattern string, args ...any) +} + +// QueryLog contains information about a SQL query +type QueryLog struct { + Query string `json:"query"` + Duration int64 `json:"duration"` + Operation string `json:"operation"` + Target string `json:"target"` + QueryType string `json:"queryType"` +} + +// PrettyPrint formats the QueryLog for output +func (ql *QueryLog) PrettyPrint(writer io.Writer) { + fmt.Fprintf(writer, "\u001B[38;5;8m%-32s \u001B[38;5;206m%-6s\u001B[0m %8d\u001B[38;5;8mµs\u001B[0m %s %s\n", + clean(ql.Operation), "SQLROUTER", ql.Duration, + clean(fmt.Sprintf("%s %s", ql.Target, ql.QueryType)), clean(ql.Query)) +} + +func clean(query string) string { + // Replace multiple consecutive whitespace characters with a single space + query = regexp.MustCompile(`\s+`).ReplaceAllString(query, " ") + // Trim leading and trailing whitespace from the string + return strings.TrimSpace(query) +} diff --git a/pkg/gofr/datasource/dbresolver/metrics.go b/pkg/gofr/datasource/dbresolver/metrics.go new file mode 100644 index 000000000..6b543437e --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/metrics.go @@ -0,0 +1,11 @@ +package dbresolver + +import ( + "context" +) + +// Metrics defines the metrics interface for dbresolver +type Metrics interface { + NewHistogram(name, desc string, buckets ...float64) + RecordHistogram(ctx context.Context, name string, value float64, labels ...string) +} diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go new file mode 100644 index 000000000..e99cb48ec --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -0,0 +1,378 @@ +package dbresolver + +import ( + "context" + "database/sql" + "go.opentelemetry.io/otel/trace" + "regexp" + "strings" + "sync/atomic" + "time" + + "gofr.dev/pkg/gofr/container" + "gofr.dev/pkg/gofr/datasource" + gofrSQL "gofr.dev/pkg/gofr/datasource/sql" +) + +var ( + readQueryPrefixRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) +) + +// Config holds configuration for DB resolver +type Config struct { + ReplicaHosts []string + StrategyName string + FallbackToMain bool + ReplicaUser string + ReplicaPass string + ReplicaPort string +} + +// Resolver implements the DB interface and routes queries to primary or replicas +type Resolver struct { + primary container.DB + replicas []container.DB + strategy Strategy + readFallback bool + logger Logger + metrics Metrics + tracer trace.Tracer + stats *statistics +} + +type statistics struct { + primaryReads atomic.Uint64 + primaryWrites atomic.Uint64 + replicaReads atomic.Uint64 +} + +// New creates a new resolver with the given primary and replicas +func New(primary container.DB, replicas []container.DB, logger Logger, + metrics Metrics, opts ...Option) container.DB { + if primary == nil { + panic("primary database cannot be nil") + } + + r := &Resolver{ + primary: primary, + replicas: replicas, + readFallback: true, + logger: logger, + metrics: metrics, + stats: &statistics{}, + } + + // Default to round-robin strategy + r.strategy = NewRoundRobinStrategy(len(replicas)) + + // Apply options + for _, opt := range opts { + opt(r) + } + + // Initialize metrics + if r.metrics != nil { + r.metrics.NewHistogram("app_dbresolve_stats", + "Response time of SQL operations in milliseconds", + .05, .075, .1, .125, .15, .2, .3, .5, .75, 1, 2, 3, 4, 5, 7.5, 10) + } + + r.logger.Logf("DB Resolver initialized with %d replicas using %s strategy", + len(replicas), r.strategy.Name()) + + // Start health monitoring + go r.monitorHealth(context.Background()) + + return r +} + +// IsReadQuery determines if a query is a read operation +func IsReadQuery(query string) bool { + return readQueryPrefixRegex.MatchString(query) +} + +// Query routes to a replica if it's a read query, otherwise to primary +func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { + startTime := time.Now() + isRead := IsReadQuery(query) + + if isRead && len(r.replicas) > 0 { + db := r.strategy.Choose(r.replicas) + defer r.recordQueryStats("Query", "read", "replica", query, startTime) + + rows, err := db.Query(query, args...) + if err != nil && r.readFallback { + r.logger.Debugf("Failed to execute query on replica, falling back to primary: %v", err) + r.stats.primaryReads.Add(1) + defer r.recordQueryStats("Query", "read", "primary_fallback", query, startTime) + return r.primary.Query(query, args...) + } + + r.stats.replicaReads.Add(1) + return rows, err + } + + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("Query", "write", "primary", query, startTime) + return r.primary.Query(query, args...) +} + +// QueryContext routes to a replica if it's a read query, otherwise to primary +func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { + startTime := time.Now() + isRead := IsReadQuery(query) + + if isRead && len(r.replicas) > 0 { + db := r.strategy.Choose(r.replicas) + defer r.recordQueryStats("QueryContext", "read", "replica", query, startTime) + + rows, err := db.QueryContext(ctx, query, args...) + if err != nil && r.readFallback { + r.logger.Debugf("Failed to execute query on replica, falling back to primary: %v", err) + r.stats.primaryReads.Add(1) + defer r.recordQueryStats("QueryContext", "read", "primary_fallback", query, startTime) + return r.primary.QueryContext(ctx, query, args...) + } + + r.stats.replicaReads.Add(1) + return rows, err + } + + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("QueryContext", "write", "primary", query, startTime) + return r.primary.QueryContext(ctx, query, args...) +} + +// QueryRow routes to a replica if it's a read query, otherwise to primary +func (r *Resolver) QueryRow(query string, args ...any) *sql.Row { + startTime := time.Now() + isRead := IsReadQuery(query) + + if isRead && len(r.replicas) > 0 { + db := r.strategy.Choose(r.replicas) + r.stats.replicaReads.Add(1) + defer r.recordQueryStats("QueryRow", "read", "replica", query, startTime) + return db.QueryRow(query, args...) + } + + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("QueryRow", "write", "primary", query, startTime) + return r.primary.QueryRow(query, args...) +} + +// QueryRowContext routes to a replica if it's a read query, otherwise to primary +func (r *Resolver) QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row { + startTime := time.Now() + isRead := IsReadQuery(query) + + if isRead && len(r.replicas) > 0 { + db := r.strategy.Choose(r.replicas) + r.stats.replicaReads.Add(1) + defer r.recordQueryStats("QueryRowContext", "read", "replica", query, startTime) + return db.QueryRowContext(ctx, query, args...) + } + + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("QueryRowContext", "write", "primary", query, startTime) + return r.primary.QueryRowContext(ctx, query, args...) +} + +// Exec always routes to primary as it's a write operation +func (r *Resolver) Exec(query string, args ...any) (sql.Result, error) { + startTime := time.Now() + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("Exec", "write", "primary", query, startTime) + return r.primary.Exec(query, args...) +} + +// ExecContext always routes to primary as it's a write operation +func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { + startTime := time.Now() + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("ExecContext", "write", "primary", query, startTime) + return r.primary.ExecContext(ctx, query, args...) +} + +// Prepare always uses primary as prepared statements are usually for writes +func (r *Resolver) Prepare(query string) (*sql.Stmt, error) { + startTime := time.Now() + defer r.recordQueryStats("Prepare", "unknown", "primary", query, startTime) + return r.primary.Prepare(query) +} + +// Begin returns a transaction which always uses the primary +func (r *Resolver) Begin() (*gofrSQL.Tx, error) { + startTime := time.Now() + defer r.recordQueryStats("Begin", "write", "primary", "", startTime) + return r.primary.Begin() +} + +// Select routes to a replica if it's a read query, otherwise to primary +func (r *Resolver) Select(ctx context.Context, data any, query string, args ...any) { + startTime := time.Now() + isRead := IsReadQuery(query) + + if isRead && len(r.replicas) > 0 { + db := r.strategy.Choose(r.replicas) + r.stats.replicaReads.Add(1) + defer r.recordQueryStats("Select", "read", "replica", query, startTime) + db.Select(ctx, data, query, args...) + return + } + + r.stats.primaryWrites.Add(1) + defer r.recordQueryStats("Select", "write", "primary", query, startTime) + r.primary.Select(ctx, data, query, args...) +} + +// HealthCheck returns the health of both primary and replicas +func (r *Resolver) HealthCheck() *datasource.Health { + primaryHealth := r.primary.HealthCheck() + + health := &datasource.Health{ + Status: primaryHealth.Status, + Details: map[string]interface{}{ + "primary": primaryHealth, + "replicas": make([]interface{}, 0, len(r.replicas)), + "stats": map[string]interface{}{ + "primaryReads": r.stats.primaryReads.Load(), + "primaryWrites": r.stats.primaryWrites.Load(), + "replicaReads": r.stats.replicaReads.Load(), + }, + }, + } + + replicaDetails := make([]interface{}, 0, len(r.replicas)) + for i, replica := range r.replicas { + replicaHealth := replica.HealthCheck() + replicaDetails = append(replicaDetails, map[string]interface{}{ + "index": i, + "health": replicaHealth, + }) + } + health.Details["replicas"] = replicaDetails + + return health +} + +// Dialect returns the primary dialect +func (r *Resolver) Dialect() string { + return r.primary.Dialect() +} + +// Close closes all connections +func (r *Resolver) Close() error { + r.logger.Logf("Closing DB Resolver connections (1 primary, %d replicas)", len(r.replicas)) + + // Close primary + primaryErr := r.primary.Close() + + // Close all replicas + for i, replica := range r.replicas { + if err := replica.Close(); err != nil { + r.logger.Errorf("Failed to close replica %d: %v", i, err) + if primaryErr == nil { + primaryErr = err + } + } + } + + return primaryErr +} + +// Primary returns the primary DB for direct access +func (r *Resolver) Primary() container.DB { + return r.primary +} + +// Replica returns a replica DB for direct access +func (r *Resolver) Replica() container.DB { + if len(r.replicas) == 0 { + return r.primary + } + return r.strategy.Choose(r.replicas) +} + +// monitorHealth periodically checks the health of replicas +func (r *Resolver) monitorHealth(ctx context.Context) { + ticker := time.NewTicker(30 * time.Second) + defer ticker.Stop() + + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + r.checkReplicasHealth() + } + } +} + +// checkReplicasHealth checks the health of all replicas +func (r *Resolver) checkReplicasHealth() { + for i, replica := range r.replicas { + health := replica.HealthCheck() + if health.Status != "UP" { + r.logger.Warnf("Replica %d is not healthy: %s", i, health.Status) + } + } +} + +// recordQueryStats records metrics and logs query execution +func (r *Resolver) recordQueryStats(operation, queryType, target, query string, startTime time.Time) { + duration := time.Since(startTime).Microseconds() + + // Log the query + r.logger.Debug(&QueryLog{ + Query: query, + Duration: duration, + Operation: operation, + Target: target, + QueryType: queryType, + }) + + // Record metrics + if r.metrics != nil { + r.metrics.RecordHistogram(context.Background(), "app_dbresolve_stats", float64(duration), + "operation", operation, + "type", queryType, + "target", target, + ) + } +} + +// Option is a function that configures a Resolver +type Option func(*Resolver) + +// WithStrategy sets the replica selection strategy +func WithStrategy(strategyName string) Option { + return func(r *Resolver) { + switch strings.ToLower(strategyName) { + case "random": + r.strategy = NewRandomStrategy() + default: + r.strategy = NewRoundRobinStrategy(len(r.replicas)) + } + } +} + +// WithRoundRobin sets the round-robin strategy +func WithRoundRobin() Option { + return func(r *Resolver) { + r.strategy = NewRoundRobinStrategy(len(r.replicas)) + } +} + +// WithRandom sets the random strategy +func WithRandom() Option { + return func(r *Resolver) { + r.strategy = NewRandomStrategy() + } +} + +// WithReadFallback enables/disables fallback to primary for failed reads +func WithReadFallback(enabled bool) Option { + return func(r *Resolver) { + r.readFallback = enabled + } +} diff --git a/pkg/gofr/datasource/dbresolver/strategy.go b/pkg/gofr/datasource/dbresolver/strategy.go new file mode 100644 index 000000000..dded6ed80 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/strategy.go @@ -0,0 +1,62 @@ +package dbresolver + +import ( + "math/rand" + "sync/atomic" + + "gofr.dev/pkg/gofr/container" +) + +// Strategy defines how to choose a replica from available replicas +type Strategy interface { + Choose(replicas []container.DB) container.DB + Name() string +} + +// RoundRobinStrategy selects replicas in round-robin fashion +type RoundRobinStrategy struct { + current atomic.Int64 + count int +} + +// NewRoundRobinStrategy creates a new round-robin strategy +func NewRoundRobinStrategy(count int) Strategy { + return &RoundRobinStrategy{count: count} +} + +// Choose selects a replica using round-robin +func (s *RoundRobinStrategy) Choose(replicas []container.DB) container.DB { + if len(replicas) == 0 { + panic("no replicas available") + } + + idx := int(s.current.Add(1)) % len(replicas) + return replicas[idx] +} + +// Name returns the strategy name +func (s *RoundRobinStrategy) Name() string { + return "round-robin" +} + +// RandomStrategy selects replicas randomly +type RandomStrategy struct{} + +// NewRandomStrategy creates a new random strategy +func NewRandomStrategy() Strategy { + return &RandomStrategy{} +} + +// Choose selects a replica randomly +func (s *RandomStrategy) Choose(replicas []container.DB) container.DB { + if len(replicas) == 0 { + panic("no replicas available") + } + + return replicas[rand.Intn(len(replicas))] +} + +// Name returns the strategy name +func (s *RandomStrategy) Name() string { + return "random" +} diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 1afdad21c..d707b3a65 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -2,6 +2,9 @@ package gofr import ( "go.opentelemetry.io/otel" + "gofr.dev/pkg/gofr/config" + "gofr.dev/pkg/gofr/datasource/sql" + "strings" "gofr.dev/pkg/gofr/container" "gofr.dev/pkg/gofr/datasource/file" @@ -194,3 +197,102 @@ func (a *App) AddElasticsearch(db container.ElasticsearchProvider) { a.container.Elasticsearch = db } + +// AddDBResolver sets up read/write splitting for SQL databases +func (a *App) AddDBResolver(resolver container.DBResolverProvider) { + // Exit if SQL is not configured + if a.container.SQL == nil { + a.Logger().Errorf("Cannot set up DB resolver: SQL is not configured") + return + } + + // Set up logger, metrics, tracer + resolver.UseLogger(a.Logger()) + resolver.UseMetrics(a.Metrics()) + + tracer := otel.GetTracerProvider().Tracer("gofr.dbresolver") + resolver.UseTracer(tracer) + + // Connect (no-op for resolver) + resolver.Connect() + + // Create replica connections + replicas := a.createReplicaConnections() + if len(replicas) == 0 { + a.Logger().Debugf("No replicas configured, skipping DB resolver setup") + return + } + + // Build resolver with primary and replicas + a.container.SQL = resolver.Build(a.container.SQL, replicas) + + a.Logger().Logf("DB read/write splitting enabled with %d replicas", len(replicas)) +} + +// createReplicaConnections creates DB connections to replicas +func (a *App) createReplicaConnections() []container.DB { + // Get replica hosts + replicaHostsStr := a.Config.Get("DB_REPLICA_HOSTS") + if replicaHostsStr == "" { + return nil + } + + replicaHosts := strings.Split(replicaHostsStr, ",") + var replicas []container.DB + + // For each host, create a replica connection + for _, host := range replicaHosts { + host = strings.TrimSpace(host) + if host == "" { + continue + } + + // Create a config wrapper for this replica + replicaConfig := newReplicaConfig(a.Config, host) + + // Create a new SQL connection using the replica config + replica := sql.NewSQL(replicaConfig, a.Logger(), a.Metrics()) + if replica != nil { + replicas = append(replicas, replica) + a.Logger().Logf("Created DB replica connection to %s", host) + } + } + + return replicas +} + +// newReplicaConfig creates a config wrapper that overrides the host and optional settings +func newReplicaConfig(baseConfig config.Config, host string) config.Config { + return &replicaConfigWrapper{ + Config: baseConfig, + host: host, + } +} + +// replicaConfigWrapper wraps a config and overrides DB_HOST and optional replica settings +type replicaConfigWrapper struct { + config.Config + host string +} + +// Get overrides the config.Get method to provide replica-specific values +func (c *replicaConfigWrapper) Get(key string) string { + switch key { + case "DB_HOST": + return c.host + case "DB_USER": + if replicaUser := c.Config.Get("DB_REPLICA_USER"); replicaUser != "" { + return replicaUser + } + case "DB_PASSWORD": + if replicaPass := c.Config.Get("DB_REPLICA_PASSWORD"); replicaPass != "" { + return replicaPass + } + case "DB_PORT": + if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { + return replicaPort + } + } + + return c.Config.Get(key) +} From 0a8c2651767a304b76dacc03d4196d76c06c5e18 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Mon, 28 Jul 2025 17:47:29 +0530 Subject: [PATCH 02/25] add traces metrics and logs --- .../dbresolver/dbresolver-wrapper.go | 26 +- pkg/gofr/datasource/dbresolver/metrics.go | 6 +- pkg/gofr/datasource/dbresolver/resolver.go | 499 ++++++++++++------ 3 files changed, 370 insertions(+), 161 deletions(-) diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go index f06e4290d..fc3eedae9 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go @@ -46,24 +46,34 @@ func (r *ResolverWrapper) Connect() { // No-op - we don't create connections, we use existing ones } +// createStrategy creates a Strategy instance from string name +func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { + switch r.strategy { + case "round-robin": + return NewRoundRobinStrategy(replicaCount) + case "random": + return NewRandomStrategy() + default: + // Default to round-robin if unknown strategy + return NewRoundRobinStrategy(replicaCount) + } +} + // Build creates a resolver with the given primary and replicas func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) container.DB { if primary == nil { panic("primary database cannot be nil") } + // Create strategy instance based on string name + strategy := r.createStrategy(len(replicas)) + // Create options for the resolver opts := []Option{ - WithStrategy(r.strategy), - WithReadFallback(r.readFallback), + WithStrategy(strategy), + WithFallback(r.readFallback), } - // Add strategy option - opts = append(opts, WithStrategy(r.strategy)) - - // Add read fallback option - opts = append(opts, WithReadFallback(r.readFallback)) - // Create and return the resolver return New(primary, replicas, r.logger, r.metrics, opts...) } diff --git a/pkg/gofr/datasource/dbresolver/metrics.go b/pkg/gofr/datasource/dbresolver/metrics.go index 6b543437e..29f18445a 100644 --- a/pkg/gofr/datasource/dbresolver/metrics.go +++ b/pkg/gofr/datasource/dbresolver/metrics.go @@ -4,8 +4,10 @@ import ( "context" ) -// Metrics defines the metrics interface for dbresolver +// Metrics interface for metrics operations type Metrics interface { - NewHistogram(name, desc string, buckets ...float64) + NewHistogram(name, description string, buckets ...float64) + NewGauge(name, description string) RecordHistogram(ctx context.Context, name string, value float64, labels ...string) + SetGauge(name string, value float64, labels ...string) } diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index e99cb48ec..1d77970b2 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -3,12 +3,15 @@ package dbresolver import ( "context" "database/sql" - "go.opentelemetry.io/otel/trace" + "fmt" "regexp" "strings" "sync/atomic" "time" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/trace" + "gofr.dev/pkg/gofr/container" "gofr.dev/pkg/gofr/datasource" gofrSQL "gofr.dev/pkg/gofr/datasource/sql" @@ -28,6 +31,30 @@ type Config struct { ReplicaPort string } +// Option is a function type for configuring the resolver +type Option func(*Resolver) + +// WithStrategy sets the strategy for the resolver +func WithStrategy(strategy Strategy) Option { + return func(r *Resolver) { + r.strategy = strategy + } +} + +// WithFallback sets whether to fallback to primary on replica failure +func WithFallback(fallback bool) Option { + return func(r *Resolver) { + r.readFallback = fallback + } +} + +// WithTracer sets the tracer for the resolver +func WithTracer(tracer trace.Tracer) Option { + return func(r *Resolver) { + r.tracer = tracer + } +} + // Resolver implements the DB interface and routes queries to primary or replicas type Resolver struct { primary container.DB @@ -41,9 +68,12 @@ type Resolver struct { } type statistics struct { - primaryReads atomic.Uint64 - primaryWrites atomic.Uint64 - replicaReads atomic.Uint64 + primaryReads atomic.Uint64 + primaryWrites atomic.Uint64 + replicaReads atomic.Uint64 + primaryFallbacks atomic.Uint64 + replicaFailures atomic.Uint64 + totalQueries atomic.Uint64 } // New creates a new resolver with the given primary and replicas @@ -71,11 +101,7 @@ func New(primary container.DB, replicas []container.DB, logger Logger, } // Initialize metrics - if r.metrics != nil { - r.metrics.NewHistogram("app_dbresolve_stats", - "Response time of SQL operations in milliseconds", - .05, .075, .1, .125, .15, .2, .3, .5, .75, 1, 2, 3, 4, 5, 7.5, 10) - } + r.initializeMetrics() r.logger.Logf("DB Resolver initialized with %d replicas using %s strategy", len(replicas), r.strategy.Name()) @@ -86,146 +112,351 @@ func New(primary container.DB, replicas []container.DB, logger Logger, return r } +// initializeMetrics sets up all DB resolver metrics following GoFr patterns +func (r *Resolver) initializeMetrics() { + if r.metrics == nil { + return + } + + // Histogram for query response times (following GoFr SQL pattern) + dbResolverBuckets := []float64{.05, .075, .1, .125, .15, .2, .3, .5, .75, 1, 2, 3, 4, 5, 7.5, 10} + r.metrics.NewHistogram("app_dbresolve_stats", + "Response time of DB resolver operations in microseconds", dbResolverBuckets...) + + // Gauges for operation tracking + r.metrics.NewGauge("app_dbresolve_primary_reads", "Total number of reads routed to primary") + r.metrics.NewGauge("app_dbresolve_primary_writes", "Total number of writes routed to primary") + r.metrics.NewGauge("app_dbresolve_replica_reads", "Total number of reads routed to replicas") + r.metrics.NewGauge("app_dbresolve_fallbacks", "Total number of replica fallbacks to primary") + r.metrics.NewGauge("app_dbresolve_replica_failures", "Total number of replica failures") + r.metrics.NewGauge("app_dbresolve_total_queries", "Total number of queries processed") + + // Start metrics collection goroutine + go r.pushMetrics() +} + +// pushMetrics continuously updates gauge metrics +func (r *Resolver) pushMetrics() { + ticker := time.NewTicker(10 * time.Second) + defer ticker.Stop() + + for range ticker.C { + if r.metrics != nil { + r.metrics.SetGauge("app_dbresolve_primary_reads", float64(r.stats.primaryReads.Load())) + r.metrics.SetGauge("app_dbresolve_primary_writes", float64(r.stats.primaryWrites.Load())) + r.metrics.SetGauge("app_dbresolve_replica_reads", float64(r.stats.replicaReads.Load())) + r.metrics.SetGauge("app_dbresolve_fallbacks", float64(r.stats.primaryFallbacks.Load())) + r.metrics.SetGauge("app_dbresolve_replica_failures", float64(r.stats.replicaFailures.Load())) + r.metrics.SetGauge("app_dbresolve_total_queries", float64(r.stats.totalQueries.Load())) + } + } +} + +// addTrace starts a new trace span following GoFr patterns +func (r *Resolver) addTrace(ctx context.Context, method, query string) (context.Context, trace.Span) { + if r.tracer != nil { + tracedCtx, span := r.tracer.Start(ctx, fmt.Sprintf("dbresolve-%s", method)) + + span.SetAttributes( + attribute.String("dbresolve.query", query), + attribute.String("dbresolve.method", method), + ) + + return tracedCtx, span + } + + return ctx, nil +} + // IsReadQuery determines if a query is a read operation func IsReadQuery(query string) bool { return readQueryPrefixRegex.MatchString(query) } +// Dialect returns the database dialect (required by container.DB interface) +func (r *Resolver) Dialect() string { + return r.primary.Dialect() +} + +// Close closes all database connections (required by container.DB interface) +func (r *Resolver) Close() error { + var lastErr error + + // Close primary + if err := r.primary.Close(); err != nil { + lastErr = err + } + + // Close all replicas + for _, replica := range r.replicas { + if err := replica.Close(); err != nil { + lastErr = err + } + } + + return lastErr +} + // Query routes to a replica if it's a read query, otherwise to primary func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) + + ctx := context.Background() + tracedCtx, span := r.addTrace(ctx, "query", query) + defer r.sendOperationStats(startTime, "Query", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { db := r.strategy.Choose(r.replicas) - defer r.recordQueryStats("Query", "read", "replica", query, startTime) rows, err := db.Query(query, args...) if err != nil && r.readFallback { r.logger.Debugf("Failed to execute query on replica, falling back to primary: %v", err) + r.stats.replicaFailures.Add(1) + r.stats.primaryFallbacks.Add(1) r.stats.primaryReads.Add(1) - defer r.recordQueryStats("Query", "read", "primary_fallback", query, startTime) - return r.primary.Query(query, args...) + + if span != nil { + span.SetAttributes(attribute.Bool("dbresolve.fallback", true)) + } + + return r.primary.QueryContext(tracedCtx, query, args...) } r.stats.replicaReads.Add(1) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "replica")) + } return rows, err } r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("Query", "write", "primary", query, startTime) - return r.primary.Query(query, args...) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + return r.primary.QueryContext(tracedCtx, query, args...) } // QueryContext routes to a replica if it's a read query, otherwise to primary func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) + + tracedCtx, span := r.addTrace(ctx, "query-context", query) + defer r.sendOperationStats(startTime, "QueryContext", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { db := r.strategy.Choose(r.replicas) - defer r.recordQueryStats("QueryContext", "read", "replica", query, startTime) - rows, err := db.QueryContext(ctx, query, args...) + rows, err := db.QueryContext(tracedCtx, query, args...) if err != nil && r.readFallback { r.logger.Debugf("Failed to execute query on replica, falling back to primary: %v", err) + r.stats.replicaFailures.Add(1) + r.stats.primaryFallbacks.Add(1) r.stats.primaryReads.Add(1) - defer r.recordQueryStats("QueryContext", "read", "primary_fallback", query, startTime) - return r.primary.QueryContext(ctx, query, args...) + + if span != nil { + span.SetAttributes(attribute.Bool("dbresolve.fallback", true)) + } + + return r.primary.QueryContext(tracedCtx, query, args...) } r.stats.replicaReads.Add(1) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "replica")) + } return rows, err } r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("QueryContext", "write", "primary", query, startTime) - return r.primary.QueryContext(ctx, query, args...) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + return r.primary.QueryContext(tracedCtx, query, args...) } // QueryRow routes to a replica if it's a read query, otherwise to primary func (r *Resolver) QueryRow(query string, args ...any) *sql.Row { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) + + ctx := context.Background() + tracedCtx, span := r.addTrace(ctx, "query-row", query) + defer r.sendOperationStats(startTime, "QueryRow", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { db := r.strategy.Choose(r.replicas) r.stats.replicaReads.Add(1) - defer r.recordQueryStats("QueryRow", "read", "replica", query, startTime) - return db.QueryRow(query, args...) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "replica")) + } + + return db.QueryRowContext(tracedCtx, query, args...) } r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("QueryRow", "write", "primary", query, startTime) - return r.primary.QueryRow(query, args...) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + return r.primary.QueryRowContext(tracedCtx, query, args...) } // QueryRowContext routes to a replica if it's a read query, otherwise to primary func (r *Resolver) QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) + + tracedCtx, span := r.addTrace(ctx, "query-row-context", query) + defer r.sendOperationStats(startTime, "QueryRowContext", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { db := r.strategy.Choose(r.replicas) r.stats.replicaReads.Add(1) - defer r.recordQueryStats("QueryRowContext", "read", "replica", query, startTime) - return db.QueryRowContext(ctx, query, args...) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "replica")) + } + + return db.QueryRowContext(tracedCtx, query, args...) } r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("QueryRowContext", "write", "primary", query, startTime) - return r.primary.QueryRowContext(ctx, query, args...) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + return r.primary.QueryRowContext(tracedCtx, query, args...) +} + +// ExecContext always routes to primary as it's a write operation +func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { + startTime := time.Now() + r.stats.primaryWrites.Add(1) + r.stats.totalQueries.Add(1) + + tracedCtx, span := r.addTrace(ctx, "exec-context", query) + defer r.sendOperationStats(startTime, "ExecContext", query, "exec", span, false, args...) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + + return r.primary.ExecContext(tracedCtx, query, args...) } // Exec always routes to primary as it's a write operation func (r *Resolver) Exec(query string, args ...any) (sql.Result, error) { startTime := time.Now() r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("Exec", "write", "primary", query, startTime) - return r.primary.Exec(query, args...) + r.stats.totalQueries.Add(1) + + ctx := context.Background() + tracedCtx, span := r.addTrace(ctx, "exec", query) + defer r.sendOperationStats(startTime, "Exec", query, "exec", span, false, args...) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + + return r.primary.ExecContext(tracedCtx, query, args...) } -// ExecContext always routes to primary as it's a write operation -func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { +// Select routes to a replica if it's a read query, otherwise to primary +func (r *Resolver) Select(ctx context.Context, data any, query string, args ...any) { startTime := time.Now() + isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) + + tracedCtx, span := r.addTrace(ctx, "select", query) + defer r.sendOperationStats(startTime, "Select", query, "select", span, isRead, args...) + + if isRead && len(r.replicas) > 0 { + db := r.strategy.Choose(r.replicas) + r.stats.replicaReads.Add(1) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "replica")) + } + + db.Select(tracedCtx, data, query, args...) + return + } + r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("ExecContext", "write", "primary", query, startTime) - return r.primary.ExecContext(ctx, query, args...) + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + r.primary.Select(tracedCtx, data, query, args...) } -// Prepare always uses primary as prepared statements are usually for writes +// Prepare routes to primary (prepared statements should be consistent) func (r *Resolver) Prepare(query string) (*sql.Stmt, error) { startTime := time.Now() - defer r.recordQueryStats("Prepare", "unknown", "primary", query, startTime) + r.stats.totalQueries.Add(1) + + ctx := context.Background() + _, span := r.addTrace(ctx, "prepare", query) + defer r.sendOperationStats(startTime, "Prepare", query, "prepare", span, false) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + + return r.primary.Prepare(query) +} + +// PrepareContext routes to primary (prepared statements should be consistent) +func (r *Resolver) PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) { + startTime := time.Now() + r.stats.totalQueries.Add(1) + + _, span := r.addTrace(ctx, "prepare-context", query) + defer r.sendOperationStats(startTime, "PrepareContext", query, "prepare", span, false) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + return r.primary.Prepare(query) } -// Begin returns a transaction which always uses the primary +// Begin always routes to primary as transactions should be on primary func (r *Resolver) Begin() (*gofrSQL.Tx, error) { startTime := time.Now() - defer r.recordQueryStats("Begin", "write", "primary", "", startTime) + r.stats.totalQueries.Add(1) + + ctx := context.Background() + _, span := r.addTrace(ctx, "begin", "BEGIN") + defer r.sendOperationStats(startTime, "Begin", "BEGIN", "transaction", span, false) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) + } + return r.primary.Begin() } -// Select routes to a replica if it's a read query, otherwise to primary -func (r *Resolver) Select(ctx context.Context, data any, query string, args ...any) { +// BeginTx always routes to primary as transactions should be on primary +func (r *Resolver) BeginTx(ctx context.Context, opts *sql.TxOptions) (*gofrSQL.Tx, error) { startTime := time.Now() - isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) - if isRead && len(r.replicas) > 0 { - db := r.strategy.Choose(r.replicas) - r.stats.replicaReads.Add(1) - defer r.recordQueryStats("Select", "read", "replica", query, startTime) - db.Select(ctx, data, query, args...) - return + _, span := r.addTrace(ctx, "begin-tx", "BEGIN") + defer r.sendOperationStats(startTime, "BeginTx", "BEGIN", "transaction", span, false) + + if span != nil { + span.SetAttributes(attribute.String("dbresolve.target", "primary")) } - r.stats.primaryWrites.Add(1) - defer r.recordQueryStats("Select", "write", "primary", query, startTime) - r.primary.Select(ctx, data, query, args...) + return r.primary.Begin() } -// HealthCheck returns the health of both primary and replicas +// HealthCheck returns comprehensive health information func (r *Resolver) HealthCheck() *datasource.Health { primaryHealth := r.primary.HealthCheck() @@ -235,9 +466,12 @@ func (r *Resolver) HealthCheck() *datasource.Health { "primary": primaryHealth, "replicas": make([]interface{}, 0, len(r.replicas)), "stats": map[string]interface{}{ - "primaryReads": r.stats.primaryReads.Load(), - "primaryWrites": r.stats.primaryWrites.Load(), - "replicaReads": r.stats.replicaReads.Load(), + "primaryReads": r.stats.primaryReads.Load(), + "primaryWrites": r.stats.primaryWrites.Load(), + "replicaReads": r.stats.replicaReads.Load(), + "primaryFallbacks": r.stats.primaryFallbacks.Load(), + "replicaFailures": r.stats.replicaFailures.Load(), + "totalQueries": r.stats.totalQueries.Load(), }, }, } @@ -255,45 +489,65 @@ func (r *Resolver) HealthCheck() *datasource.Health { return health } -// Dialect returns the primary dialect -func (r *Resolver) Dialect() string { - return r.primary.Dialect() -} +// sendOperationStats records metrics and logs following GoFr patterns +func (r *Resolver) sendOperationStats(startTime time.Time, methodType, query string, + method string, span trace.Span, isRead bool, args ...any) { -// Close closes all connections -func (r *Resolver) Close() error { - r.logger.Logf("Closing DB Resolver connections (1 primary, %d replicas)", len(r.replicas)) + duration := time.Since(startTime).Microseconds() - // Close primary - primaryErr := r.primary.Close() + // Log following GoFr pattern + r.logger.Debug(&Log{ + Type: methodType, + Query: query, + Duration: duration, + IsRead: isRead, + Args: args, + }) - // Close all replicas - for i, replica := range r.replicas { - if err := replica.Close(); err != nil { - r.logger.Errorf("Failed to close replica %d: %v", i, err) - if primaryErr == nil { - primaryErr = err - } - } + // Set trace attributes + if span != nil { + defer span.End() + span.SetAttributes( + attribute.Int64(fmt.Sprintf("dbresolve.%s.duration", method), duration), + attribute.Bool("dbresolve.is_read", isRead), + ) } - return primaryErr -} + // Record histogram metrics + if r.metrics != nil { + target := "primary" + if isRead && len(r.replicas) > 0 { + target = "replica" + } -// Primary returns the primary DB for direct access -func (r *Resolver) Primary() container.DB { - return r.primary + r.metrics.RecordHistogram(context.Background(), "app_dbresolve_stats", + float64(duration), + "operation", methodType, + "target", target, + "type", getOperationType(query)) + } } -// Replica returns a replica DB for direct access -func (r *Resolver) Replica() container.DB { - if len(r.replicas) == 0 { - return r.primary +// getOperationType extracts operation type from query +func getOperationType(query string) string { + query = strings.TrimSpace(query) + words := strings.Split(query, " ") + if len(words) > 0 { + return strings.ToUpper(words[0]) } - return r.strategy.Choose(r.replicas) + return "UNKNOWN" } -// monitorHealth periodically checks the health of replicas +// Log structure following GoFr patterns +type Log struct { + Type string `json:"type"` + Query string `json:"query"` + Duration int64 `json:"duration"` + IsRead bool `json:"is_read"` + Args []any `json:"args,omitempty"` +} + +// monitorHealth continuously monitors the health of all connections func (r *Resolver) monitorHealth(ctx context.Context) { ticker := time.NewTicker(30 * time.Second) defer ticker.Stop() @@ -303,76 +557,19 @@ func (r *Resolver) monitorHealth(ctx context.Context) { case <-ctx.Done(): return case <-ticker.C: - r.checkReplicasHealth() - } - } -} - -// checkReplicasHealth checks the health of all replicas -func (r *Resolver) checkReplicasHealth() { - for i, replica := range r.replicas { - health := replica.HealthCheck() - if health.Status != "UP" { - r.logger.Warnf("Replica %d is not healthy: %s", i, health.Status) - } - } -} - -// recordQueryStats records metrics and logs query execution -func (r *Resolver) recordQueryStats(operation, queryType, target, query string, startTime time.Time) { - duration := time.Since(startTime).Microseconds() - - // Log the query - r.logger.Debug(&QueryLog{ - Query: query, - Duration: duration, - Operation: operation, - Target: target, - QueryType: queryType, - }) - - // Record metrics - if r.metrics != nil { - r.metrics.RecordHistogram(context.Background(), "app_dbresolve_stats", float64(duration), - "operation", operation, - "type", queryType, - "target", target, - ) - } -} - -// Option is a function that configures a Resolver -type Option func(*Resolver) + // Check primary health + primaryHealth := r.primary.HealthCheck() + if primaryHealth.Status != "UP" { + r.logger.Logf("Primary database health check failed: %v", primaryHealth) + } -// WithStrategy sets the replica selection strategy -func WithStrategy(strategyName string) Option { - return func(r *Resolver) { - switch strings.ToLower(strategyName) { - case "random": - r.strategy = NewRandomStrategy() - default: - r.strategy = NewRoundRobinStrategy(len(r.replicas)) + // Check replica health + for i, replica := range r.replicas { + replicaHealth := replica.HealthCheck() + if replicaHealth.Status != "UP" { + r.logger.Logf("Replica %d health check failed: %v", i, replicaHealth) + } + } } } } - -// WithRoundRobin sets the round-robin strategy -func WithRoundRobin() Option { - return func(r *Resolver) { - r.strategy = NewRoundRobinStrategy(len(r.replicas)) - } -} - -// WithRandom sets the random strategy -func WithRandom() Option { - return func(r *Resolver) { - r.strategy = NewRandomStrategy() - } -} - -// WithReadFallback enables/disables fallback to primary for failed reads -func WithReadFallback(enabled bool) Option { - return func(r *Resolver) { - r.readFallback = enabled - } -} From 75956dfd9fc4c16739d9115ce1a30547f3dd6350 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Tue, 29 Jul 2025 15:19:55 +0530 Subject: [PATCH 03/25] resolve linters --- .../dbresolver/dbresolver-wrapper.go | 34 ++--- pkg/gofr/datasource/dbresolver/go.mod | 16 +- pkg/gofr/datasource/dbresolver/logger.go | 6 +- pkg/gofr/datasource/dbresolver/metrics.go | 2 +- pkg/gofr/datasource/dbresolver/resolver.go | 140 ++++++++++++------ pkg/gofr/datasource/dbresolver/strategy.go | 31 ++-- pkg/gofr/external_db.go | 6 +- 7 files changed, 141 insertions(+), 94 deletions(-) diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go index fc3eedae9..2f1fd2379 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go @@ -5,16 +5,16 @@ import ( ) // ResolverWrapper implements container.Provider interface -// and acts as an adapter to the actual Resolver implementation +// and acts as an adapter to the actual Resolver implementation. type ResolverWrapper struct { logger Logger metrics Metrics - tracer interface{} + tracer any strategy string readFallback bool } -// NewProvider creates a new resolver provider +// NewProvider creates a new resolver provider. func NewProvider(strategy string, readFallback bool) *ResolverWrapper { return &ResolverWrapper{ strategy: strategy, @@ -22,31 +22,31 @@ func NewProvider(strategy string, readFallback bool) *ResolverWrapper { } } -// UseLogger sets the logger for the resolver -func (r *ResolverWrapper) UseLogger(logger interface{}) { +// UseLogger sets the logger for the resolver. +func (r *ResolverWrapper) UseLogger(logger any) { if l, ok := logger.(Logger); ok { r.logger = l } } -// UseMetrics sets the metrics for the resolver -func (r *ResolverWrapper) UseMetrics(metrics interface{}) { +// UseMetrics sets the metrics for the resolver. +func (r *ResolverWrapper) UseMetrics(metrics any) { if m, ok := metrics.(Metrics); ok { r.metrics = m } } -// UseTracer sets the tracer for the resolver -func (r *ResolverWrapper) UseTracer(tracer interface{}) { +// UseTracer sets the tracer for the resolver. +func (r *ResolverWrapper) UseTracer(tracer any) { r.tracer = tracer } -// Connect is a no-op as we don't need to establish connections -func (r *ResolverWrapper) Connect() { +// Connect is a no-op as we don't need to establish connections. +func (*ResolverWrapper) Connect() { // No-op - we don't create connections, we use existing ones } -// createStrategy creates a Strategy instance from string name +// createStrategy creates a Strategy instance from string name. func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { switch r.strategy { case "round-robin": @@ -54,26 +54,26 @@ func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { case "random": return NewRandomStrategy() default: - // Default to round-robin if unknown strategy + // Default to round-robin if unknown strategy. return NewRoundRobinStrategy(replicaCount) } } -// Build creates a resolver with the given primary and replicas +// Build creates a resolver with the given primary and replicas. func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) container.DB { if primary == nil { panic("primary database cannot be nil") } - // Create strategy instance based on string name + // Create strategy instance based on string name. strategy := r.createStrategy(len(replicas)) - // Create options for the resolver + // Create options for the resolver. opts := []Option{ WithStrategy(strategy), WithFallback(r.readFallback), } - // Create and return the resolver + // Create and return the resolver. return New(primary, replicas, r.logger, r.metrics, opts...) } diff --git a/pkg/gofr/datasource/dbresolver/go.mod b/pkg/gofr/datasource/dbresolver/go.mod index 1f05f8317..ff8c54f6e 100644 --- a/pkg/gofr/datasource/dbresolver/go.mod +++ b/pkg/gofr/datasource/dbresolver/go.mod @@ -2,7 +2,11 @@ module gofr.dev/pkg/gofr/datasource/dbresolver go 1.24.5 -require gofr.dev v1.42.4 +require ( + go.opentelemetry.io/otel v1.37.0 + go.opentelemetry.io/otel/trace v1.37.0 + gofr.dev v1.42.4 +) require ( cloud.google.com/go v0.120.0 // indirect @@ -58,15 +62,13 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.62.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect - go.opentelemetry.io/otel v1.37.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.59.0 // indirect go.opentelemetry.io/otel/metric v1.37.0 // indirect go.opentelemetry.io/otel/sdk v1.37.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect - go.opentelemetry.io/otel/trace v1.37.0 // indirect go.uber.org/mock v0.5.2 // indirect golang.org/x/crypto v0.39.0 // indirect - golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect + golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sync v0.16.0 // indirect @@ -78,11 +80,11 @@ require ( google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect - google.golang.org/grpc v1.73.0 // indirect + google.golang.org/grpc v1.74.2 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - modernc.org/libc v1.65.10 // indirect + modernc.org/libc v1.66.3 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect - modernc.org/sqlite v1.38.0 // indirect + modernc.org/sqlite v1.38.1 // indirect ) diff --git a/pkg/gofr/datasource/dbresolver/logger.go b/pkg/gofr/datasource/dbresolver/logger.go index 75a8e7e57..aa78aea22 100644 --- a/pkg/gofr/datasource/dbresolver/logger.go +++ b/pkg/gofr/datasource/dbresolver/logger.go @@ -7,7 +7,7 @@ import ( "strings" ) -// Logger defines the logging interface for dbresolver +// Logger defines the logging interface for dbresolver. type Logger interface { Debug(args ...any) Debugf(pattern string, args ...any) @@ -16,7 +16,7 @@ type Logger interface { Warnf(pattern string, args ...any) } -// QueryLog contains information about a SQL query +// QueryLog contains information about a SQL query. type QueryLog struct { Query string `json:"query"` Duration int64 `json:"duration"` @@ -25,7 +25,7 @@ type QueryLog struct { QueryType string `json:"queryType"` } -// PrettyPrint formats the QueryLog for output +// PrettyPrint formats the QueryLog for output. func (ql *QueryLog) PrettyPrint(writer io.Writer) { fmt.Fprintf(writer, "\u001B[38;5;8m%-32s \u001B[38;5;206m%-6s\u001B[0m %8d\u001B[38;5;8mµs\u001B[0m %s %s\n", clean(ql.Operation), "SQLROUTER", ql.Duration, diff --git a/pkg/gofr/datasource/dbresolver/metrics.go b/pkg/gofr/datasource/dbresolver/metrics.go index 29f18445a..63684b7a1 100644 --- a/pkg/gofr/datasource/dbresolver/metrics.go +++ b/pkg/gofr/datasource/dbresolver/metrics.go @@ -4,7 +4,7 @@ import ( "context" ) -// Metrics interface for metrics operations +// Metrics interface for metrics operations. type Metrics interface { NewHistogram(name, description string, buckets ...float64) NewGauge(name, description string) diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index 1d77970b2..9c2428773 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -11,7 +11,6 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "gofr.dev/pkg/gofr/container" "gofr.dev/pkg/gofr/datasource" gofrSQL "gofr.dev/pkg/gofr/datasource/sql" @@ -21,7 +20,16 @@ var ( readQueryPrefixRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) ) -// Config holds configuration for DB resolver +const ( + healthStatusUP = "UP" + healthStatusDOWN = "DOWN" + roundRobinStrategy = "round-robin" + randomStrategy = "random" + metricsPushInterval = 10 * time.Second + cleanupInterval = 10 * time.Second +) + +// Config holds configuration for DB resolver. type Config struct { ReplicaHosts []string StrategyName string @@ -31,31 +39,31 @@ type Config struct { ReplicaPort string } -// Option is a function type for configuring the resolver +// Option is a function type for configuring the resolver. type Option func(*Resolver) -// WithStrategy sets the strategy for the resolver +// WithStrategy sets the strategy for the resolver. func WithStrategy(strategy Strategy) Option { return func(r *Resolver) { r.strategy = strategy } } -// WithFallback sets whether to fallback to primary on replica failure +// WithFallback sets whether to fallback to primary on replica failure. func WithFallback(fallback bool) Option { return func(r *Resolver) { r.readFallback = fallback } } -// WithTracer sets the tracer for the resolver +// WithTracer sets the tracer for the resolver. func WithTracer(tracer trace.Tracer) Option { return func(r *Resolver) { r.tracer = tracer } } -// Resolver implements the DB interface and routes queries to primary or replicas +// Resolver implements the DB interface and routes queries to primary or replicas. type Resolver struct { primary container.DB replicas []container.DB @@ -76,7 +84,7 @@ type statistics struct { totalQueries atomic.Uint64 } -// New creates a new resolver with the given primary and replicas +// New creates a new resolver with the given primary and replicas. func New(primary container.DB, replicas []container.DB, logger Logger, metrics Metrics, opts ...Option) container.DB { if primary == nil { @@ -112,13 +120,14 @@ func New(primary container.DB, replicas []container.DB, logger Logger, return r } -// initializeMetrics sets up all DB resolver metrics following GoFr patterns +// initializeMetrics sets up all DB resolver metrics following GoFr patterns. + func (r *Resolver) initializeMetrics() { if r.metrics == nil { return } - // Histogram for query response times (following GoFr SQL pattern) + // Histogram for query response times (following GoFr SQL pattern). dbResolverBuckets := []float64{.05, .075, .1, .125, .15, .2, .3, .5, .75, 1, 2, 3, 4, 5, 7.5, 10} r.metrics.NewHistogram("app_dbresolve_stats", "Response time of DB resolver operations in microseconds", dbResolverBuckets...) @@ -131,13 +140,13 @@ func (r *Resolver) initializeMetrics() { r.metrics.NewGauge("app_dbresolve_replica_failures", "Total number of replica failures") r.metrics.NewGauge("app_dbresolve_total_queries", "Total number of queries processed") - // Start metrics collection goroutine + // Start metrics collection goroutine. go r.pushMetrics() } -// pushMetrics continuously updates gauge metrics +// pushMetrics continuously updates gauge metrics. func (r *Resolver) pushMetrics() { - ticker := time.NewTicker(10 * time.Second) + ticker := time.NewTicker(metricsPushInterval) defer ticker.Stop() for range ticker.C { @@ -152,7 +161,7 @@ func (r *Resolver) pushMetrics() { } } -// addTrace starts a new trace span following GoFr patterns +// addTrace starts a new trace span following GoFr patterns. func (r *Resolver) addTrace(ctx context.Context, method, query string) (context.Context, trace.Span) { if r.tracer != nil { tracedCtx, span := r.tracer.Start(ctx, fmt.Sprintf("dbresolve-%s", method)) @@ -168,17 +177,17 @@ func (r *Resolver) addTrace(ctx context.Context, method, query string) (context. return ctx, nil } -// IsReadQuery determines if a query is a read operation +// IsReadQuery determines if a query is a read operation. func IsReadQuery(query string) bool { return readQueryPrefixRegex.MatchString(query) } -// Dialect returns the database dialect (required by container.DB interface) +// Dialect returns the database dialect (required by container.DB interface). func (r *Resolver) Dialect() string { return r.primary.Dialect() } -// Close closes all database connections (required by container.DB interface) +// Close closes all database connections (required by container.DB interface). func (r *Resolver) Close() error { var lastErr error @@ -197,13 +206,15 @@ func (r *Resolver) Close() error { return lastErr } -// Query routes to a replica if it's a read query, otherwise to primary +// Query routes to a replica if it's a read query, otherwise to primary. func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) ctx := context.Background() + tracedCtx, span := r.addTrace(ctx, "query", query) defer r.sendOperationStats(startTime, "Query", query, "query", span, isRead, args...) @@ -225,23 +236,28 @@ func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { } r.stats.replicaReads.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "replica")) } + return rows, err } r.stats.primaryWrites.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "primary")) } + return r.primary.QueryContext(tracedCtx, query, args...) } -// QueryContext routes to a replica if it's a read query, otherwise to primary +// QueryContext routes to a replica if it's a read query, otherwise to primary. func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) tracedCtx, span := r.addTrace(ctx, "query-context", query) @@ -265,26 +281,32 @@ func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) } r.stats.replicaReads.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "replica")) } + return rows, err } r.stats.primaryWrites.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "primary")) } + return r.primary.QueryContext(tracedCtx, query, args...) } -// QueryRow routes to a replica if it's a read query, otherwise to primary +// QueryRow routes to a replica if it's a read query, otherwise to primary. func (r *Resolver) QueryRow(query string, args ...any) *sql.Row { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) ctx := context.Background() + tracedCtx, span := r.addTrace(ctx, "query-row", query) defer r.sendOperationStats(startTime, "QueryRow", query, "query", span, isRead, args...) @@ -300,16 +322,19 @@ func (r *Resolver) QueryRow(query string, args ...any) *sql.Row { } r.stats.primaryWrites.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "primary")) } + return r.primary.QueryRowContext(tracedCtx, query, args...) } -// QueryRowContext routes to a replica if it's a read query, otherwise to primary +// QueryRowContext routes to a replica if it's a read query, otherwise to primary. func (r *Resolver) QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) tracedCtx, span := r.addTrace(ctx, "query-row-context", query) @@ -327,15 +352,18 @@ func (r *Resolver) QueryRowContext(ctx context.Context, query string, args ...an } r.stats.primaryWrites.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "primary")) } + return r.primary.QueryRowContext(tracedCtx, query, args...) } -// ExecContext always routes to primary as it's a write operation +// ExecContext always routes to primary as it's a write operation. func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { startTime := time.Now() + r.stats.primaryWrites.Add(1) r.stats.totalQueries.Add(1) @@ -349,13 +377,15 @@ func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) ( return r.primary.ExecContext(tracedCtx, query, args...) } -// Exec always routes to primary as it's a write operation +// Exec always routes to primary as it's a write operation. func (r *Resolver) Exec(query string, args ...any) (sql.Result, error) { startTime := time.Now() + r.stats.primaryWrites.Add(1) r.stats.totalQueries.Add(1) ctx := context.Background() + tracedCtx, span := r.addTrace(ctx, "exec", query) defer r.sendOperationStats(startTime, "Exec", query, "exec", span, false, args...) @@ -366,10 +396,11 @@ func (r *Resolver) Exec(query string, args ...any) (sql.Result, error) { return r.primary.ExecContext(tracedCtx, query, args...) } -// Select routes to a replica if it's a read query, otherwise to primary +// Select routes to a replica if it's a read query, otherwise to primary. func (r *Resolver) Select(ctx context.Context, data any, query string, args ...any) { startTime := time.Now() isRead := IsReadQuery(query) + r.stats.totalQueries.Add(1) tracedCtx, span := r.addTrace(ctx, "select", query) @@ -384,22 +415,27 @@ func (r *Resolver) Select(ctx context.Context, data any, query string, args ...a } db.Select(tracedCtx, data, query, args...) + return } r.stats.primaryWrites.Add(1) + if span != nil { span.SetAttributes(attribute.String("dbresolve.target", "primary")) } + r.primary.Select(tracedCtx, data, query, args...) } -// Prepare routes to primary (prepared statements should be consistent) +// Prepare routes to primary (prepared statements should be consistent). func (r *Resolver) Prepare(query string) (*sql.Stmt, error) { startTime := time.Now() + r.stats.totalQueries.Add(1) ctx := context.Background() + _, span := r.addTrace(ctx, "prepare", query) defer r.sendOperationStats(startTime, "Prepare", query, "prepare", span, false) @@ -410,9 +446,10 @@ func (r *Resolver) Prepare(query string) (*sql.Stmt, error) { return r.primary.Prepare(query) } -// PrepareContext routes to primary (prepared statements should be consistent) +// PrepareContext routes to primary (prepared statements should be consistent). func (r *Resolver) PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) { startTime := time.Now() + r.stats.totalQueries.Add(1) _, span := r.addTrace(ctx, "prepare-context", query) @@ -425,12 +462,14 @@ func (r *Resolver) PrepareContext(ctx context.Context, query string) (*sql.Stmt, return r.primary.Prepare(query) } -// Begin always routes to primary as transactions should be on primary +// Begin always routes to primary as transactions should be on primary. func (r *Resolver) Begin() (*gofrSQL.Tx, error) { startTime := time.Now() + r.stats.totalQueries.Add(1) ctx := context.Background() + _, span := r.addTrace(ctx, "begin", "BEGIN") defer r.sendOperationStats(startTime, "Begin", "BEGIN", "transaction", span, false) @@ -441,9 +480,10 @@ func (r *Resolver) Begin() (*gofrSQL.Tx, error) { return r.primary.Begin() } -// BeginTx always routes to primary as transactions should be on primary -func (r *Resolver) BeginTx(ctx context.Context, opts *sql.TxOptions) (*gofrSQL.Tx, error) { +// BeginTx always routes to primary as transactions should be on primary. +func (r *Resolver) BeginTx(ctx context.Context) (*gofrSQL.Tx, error) { startTime := time.Now() + r.stats.totalQueries.Add(1) _, span := r.addTrace(ctx, "begin-tx", "BEGIN") @@ -456,16 +496,16 @@ func (r *Resolver) BeginTx(ctx context.Context, opts *sql.TxOptions) (*gofrSQL.T return r.primary.Begin() } -// HealthCheck returns comprehensive health information +// HealthCheck returns comprehensive health information. func (r *Resolver) HealthCheck() *datasource.Health { primaryHealth := r.primary.HealthCheck() health := &datasource.Health{ Status: primaryHealth.Status, - Details: map[string]interface{}{ + Details: map[string]any{ "primary": primaryHealth, - "replicas": make([]interface{}, 0, len(r.replicas)), - "stats": map[string]interface{}{ + "replicas": make([]any, 0, len(r.replicas)), + "stats": map[string]any{ "primaryReads": r.stats.primaryReads.Load(), "primaryWrites": r.stats.primaryWrites.Load(), "replicaReads": r.stats.replicaReads.Load(), @@ -476,26 +516,28 @@ func (r *Resolver) HealthCheck() *datasource.Health { }, } - replicaDetails := make([]interface{}, 0, len(r.replicas)) + replicaDetails := make([]any, 0, len(r.replicas)) + for i, replica := range r.replicas { replicaHealth := replica.HealthCheck() - replicaDetails = append(replicaDetails, map[string]interface{}{ + + replicaDetails = append(replicaDetails, map[string]any{ "index": i, "health": replicaHealth, }) } + health.Details["replicas"] = replicaDetails return health } -// sendOperationStats records metrics and logs following GoFr patterns +// sendOperationStats records metrics and logs following GoFr patterns. func (r *Resolver) sendOperationStats(startTime time.Time, methodType, query string, method string, span trace.Span, isRead bool, args ...any) { - duration := time.Since(startTime).Microseconds() - // Log following GoFr pattern + // Log following GoFr pattern. r.logger.Debug(&Log{ Type: methodType, Query: query, @@ -504,7 +546,7 @@ func (r *Resolver) sendOperationStats(startTime time.Time, methodType, query str Args: args, }) - // Set trace attributes + // Set trace attributes. if span != nil { defer span.End() span.SetAttributes( @@ -513,7 +555,7 @@ func (r *Resolver) sendOperationStats(startTime time.Time, methodType, query str ) } - // Record histogram metrics + // Record histogram metrics. if r.metrics != nil { target := "primary" if isRead && len(r.replicas) > 0 { @@ -528,17 +570,19 @@ func (r *Resolver) sendOperationStats(startTime time.Time, methodType, query str } } -// getOperationType extracts operation type from query +// getOperationType extracts operation type from query. func getOperationType(query string) string { query = strings.TrimSpace(query) words := strings.Split(query, " ") + if len(words) > 0 { return strings.ToUpper(words[0]) } + return "UNKNOWN" } -// Log structure following GoFr patterns +// Log structure following GoFr patterns. type Log struct { Type string `json:"type"` Query string `json:"query"` @@ -547,9 +591,9 @@ type Log struct { Args []any `json:"args,omitempty"` } -// monitorHealth continuously monitors the health of all connections +// monitorHealth continuously monitors the health of all connections. func (r *Resolver) monitorHealth(ctx context.Context) { - ticker := time.NewTicker(30 * time.Second) + ticker := time.NewTicker(cleanupInterval) defer ticker.Stop() for { @@ -557,16 +601,16 @@ func (r *Resolver) monitorHealth(ctx context.Context) { case <-ctx.Done(): return case <-ticker.C: - // Check primary health + // Check primary health. primaryHealth := r.primary.HealthCheck() - if primaryHealth.Status != "UP" { + if primaryHealth.Status != healthStatusUP { r.logger.Logf("Primary database health check failed: %v", primaryHealth) } - // Check replica health + // Check replica health. for i, replica := range r.replicas { replicaHealth := replica.HealthCheck() - if replicaHealth.Status != "UP" { + if replicaHealth.Status != healthStatusUP { r.logger.Logf("Replica %d health check failed: %v", i, replicaHealth) } } diff --git a/pkg/gofr/datasource/dbresolver/strategy.go b/pkg/gofr/datasource/dbresolver/strategy.go index dded6ed80..e3a9394ee 100644 --- a/pkg/gofr/datasource/dbresolver/strategy.go +++ b/pkg/gofr/datasource/dbresolver/strategy.go @@ -7,56 +7,57 @@ import ( "gofr.dev/pkg/gofr/container" ) -// Strategy defines how to choose a replica from available replicas +// Strategy defines how to choose a replica from available replicas. type Strategy interface { Choose(replicas []container.DB) container.DB Name() string } -// RoundRobinStrategy selects replicas in round-robin fashion +// RoundRobinStrategy selects replicas in round-robin fashion. type RoundRobinStrategy struct { current atomic.Int64 count int } -// NewRoundRobinStrategy creates a new round-robin strategy +// NewRoundRobinStrategy creates a new round-robin strategy. func NewRoundRobinStrategy(count int) Strategy { return &RoundRobinStrategy{count: count} } -// Choose selects a replica using round-robin +// Choose selects a replica using round-robin. func (s *RoundRobinStrategy) Choose(replicas []container.DB) container.DB { if len(replicas) == 0 { panic("no replicas available") } idx := int(s.current.Add(1)) % len(replicas) + return replicas[idx] } -// Name returns the strategy name -func (s *RoundRobinStrategy) Name() string { - return "round-robin" +// Name returns the strategy name. +func (*RoundRobinStrategy) Name() string { + return roundRobinStrategy } -// RandomStrategy selects replicas randomly +// RandomStrategy selects replicas randomly. type RandomStrategy struct{} -// NewRandomStrategy creates a new random strategy +// NewRandomStrategy creates a new random strategy. func NewRandomStrategy() Strategy { return &RandomStrategy{} } -// Choose selects a replica randomly -func (s *RandomStrategy) Choose(replicas []container.DB) container.DB { +// Choose selects a replica randomly. +func (*RandomStrategy) Choose(replicas []container.DB) container.DB { if len(replicas) == 0 { panic("no replicas available") } - return replicas[rand.Intn(len(replicas))] + return replicas[rand.Intn(len(replicas))] //nolint:gosec // weak RNG is okay for load balancing } -// Name returns the strategy name -func (s *RandomStrategy) Name() string { - return "random" +// Name returns the strategy name. +func (*RandomStrategy) Name() string { + return randomStrategy } diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index d707b3a65..e44f87d31 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -1,13 +1,13 @@ package gofr import ( - "go.opentelemetry.io/otel" - "gofr.dev/pkg/gofr/config" - "gofr.dev/pkg/gofr/datasource/sql" "strings" + "go.opentelemetry.io/otel" + "gofr.dev/pkg/gofr/config" "gofr.dev/pkg/gofr/container" "gofr.dev/pkg/gofr/datasource/file" + "gofr.dev/pkg/gofr/datasource/sql" ) // AddMongo sets the Mongo datasource in the app's container. From 7baeb3335cbf44535f39d34e1b1416a68230eba3 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Mon, 4 Aug 2025 16:14:37 +0530 Subject: [PATCH 04/25] add mocks and tests --- pkg/gofr/container/datasources.go | 2 +- pkg/gofr/container/mock_datasources.go | 87 ++++ .../dbresolver/dbresolver-wrapper.go | 10 +- .../dbresolver/dbresolver-wrapper_test.go | 188 ++++++++ pkg/gofr/datasource/dbresolver/mock_db.go | 251 ++++++++++ pkg/gofr/datasource/dbresolver/mock_logger.go | 124 +++++ .../datasource/dbresolver/mock_metrics.go | 104 ++++ .../dbresolver/mock_resolver_provider.go | 104 ++++ .../datasource/dbresolver/mock_strategy.go | 70 +++ pkg/gofr/datasource/dbresolver/resolver.go | 49 +- .../datasource/dbresolver/resolver_test.go | 454 ++++++++++++++++++ pkg/gofr/datasource/dbresolver/strategy.go | 55 ++- .../datasource/dbresolver/strategy_test.go | 128 +++++ pkg/gofr/external_db.go | 7 +- 14 files changed, 1595 insertions(+), 38 deletions(-) create mode 100644 pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go create mode 100644 pkg/gofr/datasource/dbresolver/mock_db.go create mode 100644 pkg/gofr/datasource/dbresolver/mock_logger.go create mode 100644 pkg/gofr/datasource/dbresolver/mock_metrics.go create mode 100644 pkg/gofr/datasource/dbresolver/mock_resolver_provider.go create mode 100644 pkg/gofr/datasource/dbresolver/mock_strategy.go create mode 100644 pkg/gofr/datasource/dbresolver/resolver_test.go create mode 100644 pkg/gofr/datasource/dbresolver/strategy_test.go diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go index 5ee125f75..2cd539c21 100644 --- a/pkg/gofr/container/datasources.go +++ b/pkg/gofr/container/datasources.go @@ -725,7 +725,7 @@ type ElasticsearchProvider interface { // DBResolverProvider defines an interface for SQL read/write splitting providers type DBResolverProvider interface { // Build creates a resolver with the given primary and replicas - Build(primary DB, replicas []DB) DB + Build(primary DB, replicas []DB) (DB, error) provider } diff --git a/pkg/gofr/container/mock_datasources.go b/pkg/gofr/container/mock_datasources.go index d7ed078a0..f12474fc8 100644 --- a/pkg/gofr/container/mock_datasources.go +++ b/pkg/gofr/container/mock_datasources.go @@ -13401,3 +13401,90 @@ func (mr *MockElasticsearchProviderMockRecorder) UseTracer(tracer any) *gomock.C mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseTracer", reflect.TypeOf((*MockElasticsearchProvider)(nil).UseTracer), tracer) } + +// MockDBResolverProvider is a mock of DBResolverProvider interface. +type MockDBResolverProvider struct { + ctrl *gomock.Controller + recorder *MockDBResolverProviderMockRecorder + isgomock struct{} +} + +// MockDBResolverProviderMockRecorder is the mock recorder for MockDBResolverProvider. +type MockDBResolverProviderMockRecorder struct { + mock *MockDBResolverProvider +} + +// NewMockDBResolverProvider creates a new mock instance. +func NewMockDBResolverProvider(ctrl *gomock.Controller) *MockDBResolverProvider { + mock := &MockDBResolverProvider{ctrl: ctrl} + mock.recorder = &MockDBResolverProviderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockDBResolverProvider) EXPECT() *MockDBResolverProviderMockRecorder { + return m.recorder +} + +// Build mocks base method. +func (m *MockDBResolverProvider) Build(primary DB, replicas []DB) (DB, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Build", primary, replicas) + ret0, _ := ret[0].(DB) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Build indicates an expected call of Build. +func (mr *MockDBResolverProviderMockRecorder) Build(primary, replicas any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Build", reflect.TypeOf((*MockDBResolverProvider)(nil).Build), primary, replicas) +} + +// Connect mocks base method. +func (m *MockDBResolverProvider) Connect() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Connect") +} + +// Connect indicates an expected call of Connect. +func (mr *MockDBResolverProviderMockRecorder) Connect() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connect", reflect.TypeOf((*MockDBResolverProvider)(nil).Connect)) +} + +// UseLogger mocks base method. +func (m *MockDBResolverProvider) UseLogger(logger any) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "UseLogger", logger) +} + +// UseLogger indicates an expected call of UseLogger. +func (mr *MockDBResolverProviderMockRecorder) UseLogger(logger any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseLogger", reflect.TypeOf((*MockDBResolverProvider)(nil).UseLogger), logger) +} + +// UseMetrics mocks base method. +func (m *MockDBResolverProvider) UseMetrics(metrics any) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "UseMetrics", metrics) +} + +// UseMetrics indicates an expected call of UseMetrics. +func (mr *MockDBResolverProviderMockRecorder) UseMetrics(metrics any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseMetrics", reflect.TypeOf((*MockDBResolverProvider)(nil).UseMetrics), metrics) +} + +// UseTracer mocks base method. +func (m *MockDBResolverProvider) UseTracer(tracer any) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "UseTracer", tracer) +} + +// UseTracer indicates an expected call of UseTracer. +func (mr *MockDBResolverProviderMockRecorder) UseTracer(tracer any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseTracer", reflect.TypeOf((*MockDBResolverProvider)(nil).UseTracer), tracer) +} diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go index 2f1fd2379..1763e452e 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go @@ -1,9 +1,13 @@ package dbresolver import ( + "errors" + "gofr.dev/pkg/gofr/container" ) +var errPrimaryNil = errors.New("primary database cannot be nil") + // ResolverWrapper implements container.Provider interface // and acts as an adapter to the actual Resolver implementation. type ResolverWrapper struct { @@ -60,9 +64,9 @@ func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { } // Build creates a resolver with the given primary and replicas. -func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) container.DB { +func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) (container.DB, error) { if primary == nil { - panic("primary database cannot be nil") + return nil, errPrimaryNil } // Create strategy instance based on string name. @@ -75,5 +79,5 @@ func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) c } // Create and return the resolver. - return New(primary, replicas, r.logger, r.metrics, opts...) + return New(primary, replicas, r.logger, r.metrics, opts...), nil } diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go new file mode 100644 index 000000000..a2898278d --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go @@ -0,0 +1,188 @@ +package dbresolver + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel" + "go.uber.org/mock/gomock" + "gofr.dev/pkg/gofr/container" +) + +// Mocks contains all the dependencies needed for testing. +type Mocks struct { + Ctrl *gomock.Controller + Primary *MockDB + Replicas []container.DB + MockReplicas []*MockDB + Strategy *MockStrategy + Logger Logger + Metrics Metrics + Resolver *Resolver +} + +// setupMocks creates and returns common mocks used in tests. +func setupMocks(t *testing.T, createResolver bool) *Mocks { + t.Helper() + + // Create controller and mocks. + ctrl := gomock.NewController(t) + mockPrimary := NewMockDB(ctrl) + mockReplica1 := NewMockDB(ctrl) + mockReplica2 := NewMockDB(ctrl) + + // Create both typed and interface versions of replicas. + typedMockReplicas := []*MockDB{mockReplica1, mockReplica2} + + mockReplicas := make([]container.DB, len(typedMockReplicas)) + for i, r := range typedMockReplicas { + mockReplicas[i] = r + } + + mockLogger := NewMockLogger(ctrl) + mockMetrics := NewMockMetrics(ctrl) + mockStrategy := NewMockStrategy(ctrl) + + mockMetrics.EXPECT().NewHistogram("app_dbresolve_stats", + "Response time of DB resolver operations in microseconds", + gomock.Any()).AnyTimes() + mockMetrics.EXPECT().NewGauge(gomock.Any(), gomock.Any()).AnyTimes() + mockMetrics.EXPECT().SetGauge(gomock.Any(), gomock.Any()).AnyTimes() + + mockMetrics.EXPECT().RecordHistogram(gomock.Any(), gomock.Any(), gomock.Any(), + gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), + gomock.Any(), gomock.Any()).AnyTimes() + + mockLogger.EXPECT().Logf(gomock.Any(), gomock.Any()).AnyTimes() + mockLogger.EXPECT().Debugf(gomock.Any(), gomock.Any()).AnyTimes() + mockLogger.EXPECT().Debug(gomock.Any()).AnyTimes() + + mocks := &Mocks{ + Ctrl: ctrl, + Primary: mockPrimary, + Replicas: mockReplicas, + MockReplicas: typedMockReplicas, + Strategy: mockStrategy, + Logger: mockLogger, + Metrics: mockMetrics, + } + + if createResolver { + mocks.Resolver = &Resolver{ + primary: mockPrimary, + replicas: mockReplicas, + strategy: mockStrategy, + readFallback: true, + tracer: otel.GetTracerProvider().Tracer("gofr-dbresolver"), + logger: mockLogger, + metrics: mockMetrics, + stats: &statistics{}, + } + } + + return mocks +} + +func TestResolverWrapper_Build_Error(t *testing.T) { + mocks := setupMocks(t, false) + defer mocks.Ctrl.Finish() + + t.Run("Error_NilPrimary", func(t *testing.T) { + wrapper := NewProvider("round-robin", true) + wrapper.UseLogger(mocks.Logger) + wrapper.UseMetrics(mocks.Metrics) + wrapper.UseTracer(otel.GetTracerProvider().Tracer("gofr-dbresolver")) + + resolver, err := wrapper.Build(nil, mocks.Replicas) + + require.Error(t, err) + assert.Equal(t, errPrimaryNil.Error(), err.Error()) + assert.Nil(t, resolver) + }) +} + +func TestResolverWrapper_Build_Success(t *testing.T) { + mocks := setupMocks(t, false) + defer mocks.Ctrl.Finish() + + successTests := []struct { + name string + strategy string + readFallback bool + replicas []container.DB + }{ + { + name: "RoundRobinStrategy", + strategy: "round-robin", + readFallback: true, + replicas: mocks.Replicas, + }, + { + name: "RandomStrategy", + strategy: "random", + readFallback: false, + replicas: mocks.Replicas, + }, + { + name: "UnknownStrategyDefaultsToRoundRobin", + strategy: "unknown", + readFallback: true, + replicas: mocks.Replicas, + }, + { + name: "EmptyReplicas", + strategy: "round-robin", + readFallback: true, + replicas: []container.DB{}, + }, + } + + for _, tt := range successTests { + t.Run(tt.name, func(t *testing.T) { + wrapper := NewProvider(tt.strategy, tt.readFallback) + wrapper.UseLogger(mocks.Logger) + wrapper.UseMetrics(mocks.Metrics) + + resolver, err := wrapper.Build(mocks.Primary, tt.replicas) + + require.NoError(t, err) + assert.NotNil(t, resolver) + + _, ok := resolver.(*Resolver) + assert.True(t, ok, "Result should be a *Resolver") + }) + } +} + +func TestResolverWrapper_createStrategy_RoundRobin(t *testing.T) { + wrapper := &ResolverWrapper{strategy: "round-robin"} + strategy := wrapper.createStrategy(3) + + _, ok := strategy.(*RoundRobinStrategy) + assert.True(t, ok, "Expected RoundRobinStrategy") +} + +func TestResolverWrapper_createStrategy_Random(t *testing.T) { + wrapper := &ResolverWrapper{strategy: "random"} + strategy := wrapper.createStrategy(3) + + _, ok := strategy.(*RandomStrategy) + assert.True(t, ok, "Expected RandomStrategy") +} + +func TestResolverWrapper_createStrategy_EmptyDefaultsToRoundRobin(t *testing.T) { + wrapper := &ResolverWrapper{strategy: ""} + strategy := wrapper.createStrategy(3) + + _, ok := strategy.(*RoundRobinStrategy) + assert.True(t, ok, "Expected RoundRobinStrategy") +} + +func TestResolverWrapper_createStrategy_UnknownDefaultsToRoundRobin(t *testing.T) { + wrapper := &ResolverWrapper{strategy: "unknown"} + strategy := wrapper.createStrategy(3) + + _, ok := strategy.(*RoundRobinStrategy) + assert.True(t, ok, "Expected RoundRobinStrategy") +} diff --git a/pkg/gofr/datasource/dbresolver/mock_db.go b/pkg/gofr/datasource/dbresolver/mock_db.go new file mode 100644 index 000000000..3d3f9f9a3 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/mock_db.go @@ -0,0 +1,251 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: gofr.dev/pkg/gofr/container (interfaces: DB) +// +// Generated by this command: +// +// mockgen -package=dbresolver -destination=mock_db.go gofr.dev/pkg/gofr/container DB +// + +// Package dbresolver is a generated GoMock package. +package dbresolver + +import ( + context "context" + sql "database/sql" + reflect "reflect" + + gomock "go.uber.org/mock/gomock" + datasource "gofr.dev/pkg/gofr/datasource" + sql0 "gofr.dev/pkg/gofr/datasource/sql" +) + +// MockDB is a mock of DB interface. +type MockDB struct { + ctrl *gomock.Controller + recorder *MockDBMockRecorder + isgomock struct{} +} + +// MockDBMockRecorder is the mock recorder for MockDB. +type MockDBMockRecorder struct { + mock *MockDB +} + +// NewMockDB creates a new mock instance. +func NewMockDB(ctrl *gomock.Controller) *MockDB { + mock := &MockDB{ctrl: ctrl} + mock.recorder = &MockDBMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockDB) EXPECT() *MockDBMockRecorder { + return m.recorder +} + +// Begin mocks base method. +func (m *MockDB) Begin() (*sql0.Tx, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Begin") + ret0, _ := ret[0].(*sql0.Tx) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Begin indicates an expected call of Begin. +func (mr *MockDBMockRecorder) Begin() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Begin", reflect.TypeOf((*MockDB)(nil).Begin)) +} + +// Close mocks base method. +func (m *MockDB) Close() error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Close") + ret0, _ := ret[0].(error) + return ret0 +} + +// Close indicates an expected call of Close. +func (mr *MockDBMockRecorder) Close() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockDB)(nil).Close)) +} + +// Dialect mocks base method. +func (m *MockDB) Dialect() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Dialect") + ret0, _ := ret[0].(string) + return ret0 +} + +// Dialect indicates an expected call of Dialect. +func (mr *MockDBMockRecorder) Dialect() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Dialect", reflect.TypeOf((*MockDB)(nil).Dialect)) +} + +// Exec mocks base method. +func (m *MockDB) Exec(query string, args ...any) (sql.Result, error) { + m.ctrl.T.Helper() + varargs := []any{query} + for _, a := range args { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "Exec", varargs...) + ret0, _ := ret[0].(sql.Result) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Exec indicates an expected call of Exec. +func (mr *MockDBMockRecorder) Exec(query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockDB)(nil).Exec), varargs...) +} + +// ExecContext mocks base method. +func (m *MockDB) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, query} + for _, a := range args { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "ExecContext", varargs...) + ret0, _ := ret[0].(sql.Result) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ExecContext indicates an expected call of ExecContext. +func (mr *MockDBMockRecorder) ExecContext(ctx, query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecContext", reflect.TypeOf((*MockDB)(nil).ExecContext), varargs...) +} + +// HealthCheck mocks base method. +func (m *MockDB) HealthCheck() *datasource.Health { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "HealthCheck") + ret0, _ := ret[0].(*datasource.Health) + return ret0 +} + +// HealthCheck indicates an expected call of HealthCheck. +func (mr *MockDBMockRecorder) HealthCheck() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HealthCheck", reflect.TypeOf((*MockDB)(nil).HealthCheck)) +} + +// Prepare mocks base method. +func (m *MockDB) Prepare(query string) (*sql.Stmt, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Prepare", query) + ret0, _ := ret[0].(*sql.Stmt) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Prepare indicates an expected call of Prepare. +func (mr *MockDBMockRecorder) Prepare(query any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockDB)(nil).Prepare), query) +} + +// Query mocks base method. +func (m *MockDB) Query(query string, args ...any) (*sql.Rows, error) { + m.ctrl.T.Helper() + varargs := []any{query} + for _, a := range args { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "Query", varargs...) + ret0, _ := ret[0].(*sql.Rows) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Query indicates an expected call of Query. +func (mr *MockDBMockRecorder) Query(query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockDB)(nil).Query), varargs...) +} + +// QueryContext mocks base method. +func (m *MockDB) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, query} + for _, a := range args { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "QueryContext", varargs...) + ret0, _ := ret[0].(*sql.Rows) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// QueryContext indicates an expected call of QueryContext. +func (mr *MockDBMockRecorder) QueryContext(ctx, query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryContext", reflect.TypeOf((*MockDB)(nil).QueryContext), varargs...) +} + +// QueryRow mocks base method. +func (m *MockDB) QueryRow(query string, args ...any) *sql.Row { + m.ctrl.T.Helper() + varargs := []any{query} + for _, a := range args { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "QueryRow", varargs...) + ret0, _ := ret[0].(*sql.Row) + return ret0 +} + +// QueryRow indicates an expected call of QueryRow. +func (mr *MockDBMockRecorder) QueryRow(query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryRow", reflect.TypeOf((*MockDB)(nil).QueryRow), varargs...) +} + +// QueryRowContext mocks base method. +func (m *MockDB) QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row { + m.ctrl.T.Helper() + varargs := []any{ctx, query} + for _, a := range args { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "QueryRowContext", varargs...) + ret0, _ := ret[0].(*sql.Row) + return ret0 +} + +// QueryRowContext indicates an expected call of QueryRowContext. +func (mr *MockDBMockRecorder) QueryRowContext(ctx, query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryRowContext", reflect.TypeOf((*MockDB)(nil).QueryRowContext), varargs...) +} + +// Select mocks base method. +func (m *MockDB) Select(ctx context.Context, data any, query string, args ...any) { + m.ctrl.T.Helper() + varargs := []any{ctx, data, query} + for _, a := range args { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "Select", varargs...) +} + +// Select indicates an expected call of Select. +func (mr *MockDBMockRecorder) Select(ctx, data, query any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, data, query}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Select", reflect.TypeOf((*MockDB)(nil).Select), varargs...) +} diff --git a/pkg/gofr/datasource/dbresolver/mock_logger.go b/pkg/gofr/datasource/dbresolver/mock_logger.go new file mode 100644 index 000000000..b03c0dd13 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/mock_logger.go @@ -0,0 +1,124 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: logger.go +// +// Generated by this command: +// +// mockgen -source=logger.go -destination=mock_logger.go -package=dbresolver +// + +// Package dbresolver is a generated GoMock package. +package dbresolver + +import ( + reflect "reflect" + + gomock "go.uber.org/mock/gomock" +) + +// MockLogger is a mock of Logger interface. +type MockLogger struct { + ctrl *gomock.Controller + recorder *MockLoggerMockRecorder + isgomock struct{} +} + +// MockLoggerMockRecorder is the mock recorder for MockLogger. +type MockLoggerMockRecorder struct { + mock *MockLogger +} + +// NewMockLogger creates a new mock instance. +func NewMockLogger(ctrl *gomock.Controller) *MockLogger { + mock := &MockLogger{ctrl: ctrl} + mock.recorder = &MockLoggerMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { + return m.recorder +} + +// Debug mocks base method. +func (m *MockLogger) Debug(args ...any) { + m.ctrl.T.Helper() + varargs := []any{} + for _, a := range args { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "Debug", varargs...) +} + +// Debug indicates an expected call of Debug. +func (mr *MockLoggerMockRecorder) Debug(args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), args...) +} + +// Debugf mocks base method. +func (m *MockLogger) Debugf(pattern string, args ...any) { + m.ctrl.T.Helper() + varargs := []any{pattern} + for _, a := range args { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "Debugf", varargs...) +} + +// Debugf indicates an expected call of Debugf. +func (mr *MockLoggerMockRecorder) Debugf(pattern any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{pattern}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) +} + +// Errorf mocks base method. +func (m *MockLogger) Errorf(pattern string, args ...any) { + m.ctrl.T.Helper() + varargs := []any{pattern} + for _, a := range args { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "Errorf", varargs...) +} + +// Errorf indicates an expected call of Errorf. +func (mr *MockLoggerMockRecorder) Errorf(pattern any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{pattern}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) +} + +// Logf mocks base method. +func (m *MockLogger) Logf(pattern string, args ...any) { + m.ctrl.T.Helper() + varargs := []any{pattern} + for _, a := range args { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "Logf", varargs...) +} + +// Logf indicates an expected call of Logf. +func (mr *MockLoggerMockRecorder) Logf(pattern any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{pattern}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Logf", reflect.TypeOf((*MockLogger)(nil).Logf), varargs...) +} + +// Warnf mocks base method. +func (m *MockLogger) Warnf(pattern string, args ...any) { + m.ctrl.T.Helper() + varargs := []any{pattern} + for _, a := range args { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "Warnf", varargs...) +} + +// Warnf indicates an expected call of Warnf. +func (mr *MockLoggerMockRecorder) Warnf(pattern any, args ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{pattern}, args...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) +} diff --git a/pkg/gofr/datasource/dbresolver/mock_metrics.go b/pkg/gofr/datasource/dbresolver/mock_metrics.go new file mode 100644 index 000000000..076b43e5e --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/mock_metrics.go @@ -0,0 +1,104 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: metrics.go +// +// Generated by this command: +// +// mockgen -source=metrics.go -destination=mock_metrics.go -package=dbresolver +// + +// Package dbresolver is a generated GoMock package. +package dbresolver + +import ( + context "context" + reflect "reflect" + + gomock "go.uber.org/mock/gomock" +) + +// MockMetrics is a mock of Metrics interface. +type MockMetrics struct { + ctrl *gomock.Controller + recorder *MockMetricsMockRecorder + isgomock struct{} +} + +// MockMetricsMockRecorder is the mock recorder for MockMetrics. +type MockMetricsMockRecorder struct { + mock *MockMetrics +} + +// NewMockMetrics creates a new mock instance. +func NewMockMetrics(ctrl *gomock.Controller) *MockMetrics { + mock := &MockMetrics{ctrl: ctrl} + mock.recorder = &MockMetricsMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockMetrics) EXPECT() *MockMetricsMockRecorder { + return m.recorder +} + +// NewGauge mocks base method. +func (m *MockMetrics) NewGauge(name, description string) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "NewGauge", name, description) +} + +// NewGauge indicates an expected call of NewGauge. +func (mr *MockMetricsMockRecorder) NewGauge(name, description any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewGauge", reflect.TypeOf((*MockMetrics)(nil).NewGauge), name, description) +} + +// NewHistogram mocks base method. +func (m *MockMetrics) NewHistogram(name, description string, buckets ...float64) { + m.ctrl.T.Helper() + varargs := []any{name, description} + for _, a := range buckets { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "NewHistogram", varargs...) +} + +// NewHistogram indicates an expected call of NewHistogram. +func (mr *MockMetricsMockRecorder) NewHistogram(name, description any, buckets ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{name, description}, buckets...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewHistogram", reflect.TypeOf((*MockMetrics)(nil).NewHistogram), varargs...) +} + +// RecordHistogram mocks base method. +func (m *MockMetrics) RecordHistogram(ctx context.Context, name string, value float64, labels ...string) { + m.ctrl.T.Helper() + varargs := []any{ctx, name, value} + for _, a := range labels { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "RecordHistogram", varargs...) +} + +// RecordHistogram indicates an expected call of RecordHistogram. +func (mr *MockMetricsMockRecorder) RecordHistogram(ctx, name, value any, labels ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, name, value}, labels...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecordHistogram", reflect.TypeOf((*MockMetrics)(nil).RecordHistogram), varargs...) +} + +// SetGauge mocks base method. +func (m *MockMetrics) SetGauge(name string, value float64, labels ...string) { + m.ctrl.T.Helper() + varargs := []any{name, value} + for _, a := range labels { + varargs = append(varargs, a) + } + m.ctrl.Call(m, "SetGauge", varargs...) +} + +// SetGauge indicates an expected call of SetGauge. +func (mr *MockMetricsMockRecorder) SetGauge(name, value any, labels ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{name, value}, labels...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetGauge", reflect.TypeOf((*MockMetrics)(nil).SetGauge), varargs...) +} diff --git a/pkg/gofr/datasource/dbresolver/mock_resolver_provider.go b/pkg/gofr/datasource/dbresolver/mock_resolver_provider.go new file mode 100644 index 000000000..b235cf130 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/mock_resolver_provider.go @@ -0,0 +1,104 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: gofr.dev/pkg/gofr/container (interfaces: DBResolverProvider) +// +// Generated by this command: +// +// mockgen -package=dbresolver -destination=mock_resolver_provider.go gofr.dev/pkg/gofr/container DBResolverProvider +// + +// Package dbresolver is a generated GoMock package. +package dbresolver + +import ( + reflect "reflect" + + gomock "go.uber.org/mock/gomock" + container "gofr.dev/pkg/gofr/container" +) + +// MockDBResolverProvider is a mock of DBResolverProvider interface. +type MockDBResolverProvider struct { + ctrl *gomock.Controller + recorder *MockDBResolverProviderMockRecorder + isgomock struct{} +} + +// MockDBResolverProviderMockRecorder is the mock recorder for MockDBResolverProvider. +type MockDBResolverProviderMockRecorder struct { + mock *MockDBResolverProvider +} + +// NewMockDBResolverProvider creates a new mock instance. +func NewMockDBResolverProvider(ctrl *gomock.Controller) *MockDBResolverProvider { + mock := &MockDBResolverProvider{ctrl: ctrl} + mock.recorder = &MockDBResolverProviderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockDBResolverProvider) EXPECT() *MockDBResolverProviderMockRecorder { + return m.recorder +} + +// Build mocks base method. +func (m *MockDBResolverProvider) Build(primary container.DB, replicas []container.DB) (container.DB, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Build", primary, replicas) + ret0, _ := ret[0].(container.DB) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Build indicates an expected call of Build. +func (mr *MockDBResolverProviderMockRecorder) Build(primary, replicas any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Build", reflect.TypeOf((*MockDBResolverProvider)(nil).Build), primary, replicas) +} + +// Connect mocks base method. +func (m *MockDBResolverProvider) Connect() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Connect") +} + +// Connect indicates an expected call of Connect. +func (mr *MockDBResolverProviderMockRecorder) Connect() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connect", reflect.TypeOf((*MockDBResolverProvider)(nil).Connect)) +} + +// UseLogger mocks base method. +func (m *MockDBResolverProvider) UseLogger(logger any) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "UseLogger", logger) +} + +// UseLogger indicates an expected call of UseLogger. +func (mr *MockDBResolverProviderMockRecorder) UseLogger(logger any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseLogger", reflect.TypeOf((*MockDBResolverProvider)(nil).UseLogger), logger) +} + +// UseMetrics mocks base method. +func (m *MockDBResolverProvider) UseMetrics(metrics any) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "UseMetrics", metrics) +} + +// UseMetrics indicates an expected call of UseMetrics. +func (mr *MockDBResolverProviderMockRecorder) UseMetrics(metrics any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseMetrics", reflect.TypeOf((*MockDBResolverProvider)(nil).UseMetrics), metrics) +} + +// UseTracer mocks base method. +func (m *MockDBResolverProvider) UseTracer(tracer any) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "UseTracer", tracer) +} + +// UseTracer indicates an expected call of UseTracer. +func (mr *MockDBResolverProviderMockRecorder) UseTracer(tracer any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseTracer", reflect.TypeOf((*MockDBResolverProvider)(nil).UseTracer), tracer) +} diff --git a/pkg/gofr/datasource/dbresolver/mock_strategy.go b/pkg/gofr/datasource/dbresolver/mock_strategy.go new file mode 100644 index 000000000..89f6c4d1b --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/mock_strategy.go @@ -0,0 +1,70 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: strategy.go +// +// Generated by this command: +// +// mockgen -source=strategy.go -destination=mock_strategy.go -package=dbresolver +// + +// Package dbresolver is a generated GoMock package. +package dbresolver + +import ( + reflect "reflect" + + gomock "go.uber.org/mock/gomock" + container "gofr.dev/pkg/gofr/container" +) + +// MockStrategy is a mock of Strategy interface. +type MockStrategy struct { + ctrl *gomock.Controller + recorder *MockStrategyMockRecorder + isgomock struct{} +} + +// MockStrategyMockRecorder is the mock recorder for MockStrategy. +type MockStrategyMockRecorder struct { + mock *MockStrategy +} + +// NewMockStrategy creates a new mock instance. +func NewMockStrategy(ctrl *gomock.Controller) *MockStrategy { + mock := &MockStrategy{ctrl: ctrl} + mock.recorder = &MockStrategyMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockStrategy) EXPECT() *MockStrategyMockRecorder { + return m.recorder +} + +// Choose mocks base method. +func (m *MockStrategy) Choose(replicas []container.DB) (container.DB, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Choose", replicas) + ret0, _ := ret[0].(container.DB) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Choose indicates an expected call of Choose. +func (mr *MockStrategyMockRecorder) Choose(replicas any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Choose", reflect.TypeOf((*MockStrategy)(nil).Choose), replicas) +} + +// Name mocks base method. +func (m *MockStrategy) Name() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Name") + ret0, _ := ret[0].(string) + return ret0 +} + +// Name indicates an expected call of Name. +func (mr *MockStrategyMockRecorder) Name() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockStrategy)(nil).Name)) +} diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index 9c2428773..5a326727f 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -6,6 +6,7 @@ import ( "fmt" "regexp" "strings" + "sync" "sync/atomic" "time" @@ -18,6 +19,7 @@ import ( var ( readQueryPrefixRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) + queryTypeCache = sync.Map{} ) const ( @@ -56,13 +58,6 @@ func WithFallback(fallback bool) Option { } } -// WithTracer sets the tracer for the resolver. -func WithTracer(tracer trace.Tracer) Option { - return func(r *Resolver) { - r.tracer = tracer - } -} - // Resolver implements the DB interface and routes queries to primary or replicas. type Resolver struct { primary container.DB @@ -87,10 +82,6 @@ type statistics struct { // New creates a new resolver with the given primary and replicas. func New(primary container.DB, replicas []container.DB, logger Logger, metrics Metrics, opts ...Option) container.DB { - if primary == nil { - panic("primary database cannot be nil") - } - r := &Resolver{ primary: primary, replicas: replicas, @@ -121,7 +112,6 @@ func New(primary container.DB, replicas []container.DB, logger Logger, } // initializeMetrics sets up all DB resolver metrics following GoFr patterns. - func (r *Resolver) initializeMetrics() { if r.metrics == nil { return @@ -150,14 +140,16 @@ func (r *Resolver) pushMetrics() { defer ticker.Stop() for range ticker.C { - if r.metrics != nil { - r.metrics.SetGauge("app_dbresolve_primary_reads", float64(r.stats.primaryReads.Load())) - r.metrics.SetGauge("app_dbresolve_primary_writes", float64(r.stats.primaryWrites.Load())) - r.metrics.SetGauge("app_dbresolve_replica_reads", float64(r.stats.replicaReads.Load())) - r.metrics.SetGauge("app_dbresolve_fallbacks", float64(r.stats.primaryFallbacks.Load())) - r.metrics.SetGauge("app_dbresolve_replica_failures", float64(r.stats.replicaFailures.Load())) - r.metrics.SetGauge("app_dbresolve_total_queries", float64(r.stats.totalQueries.Load())) + if r.metrics == nil { + continue } + + r.metrics.SetGauge("app_dbresolve_primary_reads", float64(r.stats.primaryReads.Load())) + r.metrics.SetGauge("app_dbresolve_primary_writes", float64(r.stats.primaryWrites.Load())) + r.metrics.SetGauge("app_dbresolve_replica_reads", float64(r.stats.replicaReads.Load())) + r.metrics.SetGauge("app_dbresolve_fallbacks", float64(r.stats.primaryFallbacks.Load())) + r.metrics.SetGauge("app_dbresolve_replica_failures", float64(r.stats.replicaFailures.Load())) + r.metrics.SetGauge("app_dbresolve_total_queries", float64(r.stats.totalQueries.Load())) } } @@ -179,7 +171,14 @@ func (r *Resolver) addTrace(ctx context.Context, method, query string) (context. // IsReadQuery determines if a query is a read operation. func IsReadQuery(query string) bool { - return readQueryPrefixRegex.MatchString(query) + if cached, ok := queryTypeCache.Load(query); ok { + return cached.(bool) + } + + isRead := readQueryPrefixRegex.MatchString(query) + queryTypeCache.Store(query, isRead) + + return isRead } // Dialect returns the database dialect (required by container.DB interface). @@ -219,7 +218,7 @@ func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { defer r.sendOperationStats(startTime, "Query", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { - db := r.strategy.Choose(r.replicas) + db := r.chooseReplicaOrFallback(span) rows, err := db.Query(query, args...) if err != nil && r.readFallback { @@ -264,7 +263,7 @@ func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) defer r.sendOperationStats(startTime, "QueryContext", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { - db := r.strategy.Choose(r.replicas) + db := r.chooseReplicaOrFallback(span) rows, err := db.QueryContext(tracedCtx, query, args...) if err != nil && r.readFallback { @@ -311,7 +310,7 @@ func (r *Resolver) QueryRow(query string, args ...any) *sql.Row { defer r.sendOperationStats(startTime, "QueryRow", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { - db := r.strategy.Choose(r.replicas) + db := r.chooseReplicaOrFallback(span) r.stats.replicaReads.Add(1) if span != nil { @@ -341,7 +340,7 @@ func (r *Resolver) QueryRowContext(ctx context.Context, query string, args ...an defer r.sendOperationStats(startTime, "QueryRowContext", query, "query", span, isRead, args...) if isRead && len(r.replicas) > 0 { - db := r.strategy.Choose(r.replicas) + db := r.chooseReplicaOrFallback(span) r.stats.replicaReads.Add(1) if span != nil { @@ -407,7 +406,7 @@ func (r *Resolver) Select(ctx context.Context, data any, query string, args ...a defer r.sendOperationStats(startTime, "Select", query, "select", span, isRead, args...) if isRead && len(r.replicas) > 0 { - db := r.strategy.Choose(r.replicas) + db := r.chooseReplicaOrFallback(span) r.stats.replicaReads.Add(1) if span != nil { diff --git a/pkg/gofr/datasource/dbresolver/resolver_test.go b/pkg/gofr/datasource/dbresolver/resolver_test.go new file mode 100644 index 000000000..aee50b47d --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/resolver_test.go @@ -0,0 +1,454 @@ +package dbresolver + +import ( + "database/sql" + "errors" + "reflect" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" + "gofr.dev/pkg/gofr/datasource" + gofrSQL "gofr.dev/pkg/gofr/datasource/sql" +) + +var errTestReplicaFailed = errors.New("replica connection failed") + +// MockResult is a mock of sql.Result interface. +type MockResult struct { + ctrl *gomock.Controller + recorder *MockResultMockRecorder +} + +// MockResultMockRecorder is the mock recorder for MockResult. +type MockResultMockRecorder struct { + mock *MockResult +} + +// NewMockResult creates a new mock instance. +func NewMockResult(ctrl *gomock.Controller) *MockResult { + mock := &MockResult{ctrl: ctrl} + mock.recorder = &MockResultMockRecorder{mock} + + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockResult) EXPECT() *MockResultMockRecorder { + return m.recorder +} + +// LastInsertId mocks base method. +func (m *MockResult) LastInsertId() (int64, error) { + ret := m.ctrl.Call(m, "LastInsertId") + + ret0, _ := ret[0].(int64) + ret1, _ := ret[1].(error) + + return ret0, ret1 +} + +// LastInsertId indicates an expected call of LastInsertId. +func (mr *MockResultMockRecorder) LastInsertId() *gomock.Call { + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LastInsertId", reflect.TypeOf((*MockResult)(nil).LastInsertId)) +} + +// RowsAffected mocks base method. +func (m *MockResult) RowsAffected() (int64, error) { + ret := m.ctrl.Call(m, "RowsAffected") + ret0, _ := ret[0].(int64) + ret1, _ := ret[1].(error) + + return ret0, ret1 +} + +// RowsAffected indicates an expected call of RowsAffected. +func (mr *MockResultMockRecorder) RowsAffected() *gomock.Call { + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RowsAffected", reflect.TypeOf((*MockResult)(nil).RowsAffected)) +} + +func TestResolver_Query_ReadGoesToReplica(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRows := &sql.Rows{} + readQuery := "SELECT * FROM users" + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().Query(readQuery).Return(expectedRows, nil) + + rows, err := mocks.Resolver.Query(readQuery) + + require.NoError(t, err) + assert.NoError(t, rows.Err()) + assert.Equal(t, expectedRows, rows) +} + +func TestResolver_Query_WriteGoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRows := &sql.Rows{} + writeQuery := "INSERT INTO users (name) VALUES (?)" + args := []any{"test_user"} + + mocks.Primary.EXPECT().QueryContext(gomock.Any(), writeQuery, args[0]).Return(expectedRows, nil) + + rows, err := mocks.Resolver.Query(writeQuery, args[0]) + + require.NoError(t, err) + assert.NoError(t, rows.Err()) + assert.Equal(t, expectedRows, rows) +} + +func TestResolver_Query_FallbackToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRows := &sql.Rows{} + readQuery := "SELECT * FROM users" + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().Query(readQuery).Return(nil, errTestReplicaFailed) + mocks.Primary.EXPECT().QueryContext(gomock.Any(), readQuery).Return(expectedRows, nil) + + rows, err := mocks.Resolver.Query(readQuery) + + require.NoError(t, err) + assert.NoError(t, rows.Err()) + assert.Equal(t, expectedRows, rows) +} + +func TestResolver_QueryContext_ReadGoesToReplica(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRows := &sql.Rows{} + readQuery := "SELECT * FROM users" + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().QueryContext(gomock.Any(), readQuery).Return(expectedRows, nil) + + rows, err := mocks.Resolver.QueryContext(t.Context(), readQuery) + + require.NoError(t, err) + assert.NoError(t, rows.Err()) + assert.Equal(t, expectedRows, rows) +} + +func TestResolver_QueryContext_WriteGoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRows := &sql.Rows{} + writeQuery := "INSERT INTO users (name) VALUES (?)" + args := []any{"test_user"} + + mocks.Primary.EXPECT().QueryContext(gomock.Any(), writeQuery, args[0]).Return(expectedRows, nil) + + rows, err := mocks.Resolver.QueryContext(t.Context(), writeQuery, args[0]) + + require.NoError(t, err) + assert.NoError(t, rows.Err()) + assert.Equal(t, expectedRows, rows) +} + +func TestResolver_QueryRow_ReadGoesToReplica(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRow := &sql.Row{} + readQuery := "SELECT * FROM users WHERE id = ?" + args := []any{1} + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().QueryRowContext(gomock.Any(), readQuery, args[0]).Return(expectedRow) + + row := mocks.Resolver.QueryRow(readQuery, args[0]) + + assert.NotNil(t, row) + assert.NoError(t, row.Err()) +} + +func TestResolver_QueryRow_WriteGoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRow := &sql.Row{} + writeQuery := "INSERT INTO users (name) VALUES (?) RETURNING id" + args := []any{"test_user"} + + mocks.Primary.EXPECT().QueryRowContext(gomock.Any(), writeQuery, args[0]).Return(expectedRow) + + row := mocks.Resolver.QueryRow(writeQuery, args[0]) + + assert.NotNil(t, row) + assert.NoError(t, row.Err()) +} + +func TestResolver_QueryRowContext_ReadGoesToReplica(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRow := &sql.Row{} + readQuery := "SELECT * FROM users WHERE id = ?" + args := []any{1} + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().QueryRowContext(gomock.Any(), readQuery, args[0]).Return(expectedRow) + + row := mocks.Resolver.QueryRowContext(t.Context(), readQuery, args[0]) + + assert.NotNil(t, row) + assert.NoError(t, row.Err()) +} + +func TestResolver_QueryRowContext_WriteGoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRow := &sql.Row{} + writeQuery := "INSERT INTO users (name) VALUES (?) RETURNING id" + args := []any{"test_user"} + + mocks.Primary.EXPECT().QueryRowContext(gomock.Any(), writeQuery, args[0]).Return(expectedRow) + + row := mocks.Resolver.QueryRowContext(t.Context(), writeQuery, args[0]) + + assert.NotNil(t, row) + assert.NoError(t, row.Err()) +} + +func TestResolver_ExecContext_GoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedResult := NewMockResult(mocks.Ctrl) + writeQuery := "UPDATE users SET name = ? WHERE id = ?" + args := []any{"new_name", 1} + + mocks.Primary.EXPECT().ExecContext(gomock.Any(), writeQuery, args[0], args[1]).Return(expectedResult, nil) + + result, err := mocks.Resolver.ExecContext(t.Context(), writeQuery, args[0], args[1]) + + require.NoError(t, err) + assert.Equal(t, expectedResult, result) +} + +func TestResolver_Exec_GoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedResult := NewMockResult(mocks.Ctrl) + writeQuery := "UPDATE users SET name = ? WHERE id = ?" + args := []any{"new_name", 1} + + mocks.Primary.EXPECT().ExecContext(gomock.Any(), writeQuery, args[0], args[1]).Return(expectedResult, nil) + + result, err := mocks.Resolver.Exec(writeQuery, args[0], args[1]) + + require.NoError(t, err) + assert.Equal(t, expectedResult, result) +} + +func TestResolver_Select_ReadGoesToReplica(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + data := &struct{ Name string }{} + readQuery := "SELECT name FROM users WHERE id = ?" + args := []any{1} + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().Select(gomock.Any(), data, readQuery, args[0]) + + mocks.Resolver.Select(t.Context(), data, readQuery, args[0]) +} + +func TestResolver_Select_WriteGoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + data := &struct{ ID int64 }{} + writeQuery := "INSERT INTO users (name) VALUES (?) RETURNING id" + args := []any{"test_user"} + + mocks.Primary.EXPECT().Select(gomock.Any(), data, writeQuery, args[0]) + + mocks.Resolver.Select(t.Context(), data, writeQuery, args[0]) +} + +func TestResolver_Prepare_GoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedStmt := &sql.Stmt{} + query := "SELECT * FROM users WHERE id = ?" + + mocks.Primary.EXPECT().Prepare(query).Return(expectedStmt, nil) + + stmt, err := mocks.Resolver.Prepare(query) + + require.NoError(t, err) + assert.Equal(t, expectedStmt, stmt) +} + +func TestResolver_PrepareContext_GoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedStmt := &sql.Stmt{} + query := "SELECT * FROM users WHERE id = ?" + + mocks.Primary.EXPECT().Prepare(query).Return(expectedStmt, nil) + + stmt, err := mocks.Resolver.PrepareContext(t.Context(), query) + + require.NoError(t, err) + assert.Equal(t, expectedStmt, stmt) +} + +func TestResolver_Begin_GoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedTx := &gofrSQL.Tx{} + + mocks.Primary.EXPECT().Begin().Return(expectedTx, nil) + + tx, err := mocks.Resolver.Begin() + + require.NoError(t, err) + assert.Equal(t, expectedTx, tx) +} + +func TestResolver_BeginTx_GoesToPrimary(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedTx := &gofrSQL.Tx{} + + mocks.Primary.EXPECT().Begin().Return(expectedTx, nil) + + tx, err := mocks.Resolver.BeginTx(t.Context()) + + require.NoError(t, err) + assert.Equal(t, expectedTx, tx) +} + +func TestResolver_Dialect(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedDialect := "mysql" + mocks.Primary.EXPECT().Dialect().Return(expectedDialect) + + dialect := mocks.Resolver.Dialect() + assert.Equal(t, expectedDialect, dialect) +} + +func TestResolver_Close(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + // Test primary close + mocks.Primary.EXPECT().Close().Return(nil) + + // Test replicas close + for _, replica := range mocks.MockReplicas { + replica.EXPECT().Close().Return(nil) + } + + err := mocks.Resolver.Close() + assert.NoError(t, err) +} + +func TestResolver_Close_WithError(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + // Primary returns error + mocks.Primary.EXPECT().Close().Return(errTestReplicaFailed) + + // Replicas don't error + for _, replica := range mocks.MockReplicas { + replica.EXPECT().Close().Return(nil) + } + + err := mocks.Resolver.Close() + assert.Equal(t, errTestReplicaFailed, err) +} + +func TestResolver_QueryContext_WithFallback(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + expectedRows := &sql.Rows{} + readQuery := "SELECT * FROM users" + + mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) + mocks.MockReplicas[0].EXPECT().QueryContext(gomock.Any(), readQuery).Return(nil, errTestReplicaFailed) + mocks.Primary.EXPECT().QueryContext(gomock.Any(), readQuery).Return(expectedRows, nil) + + rows, err := mocks.Resolver.QueryContext(t.Context(), readQuery) + + require.NoError(t, err) + assert.NoError(t, rows.Err()) + assert.Equal(t, expectedRows, rows) +} + +func TestResolver_HealthCheck(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + primaryHealth := &datasource.Health{ + Status: healthStatusUP, + Details: map[string]any{ + "connections": 5, + }, + } + + replica1Health := &datasource.Health{ + Status: healthStatusUP, + Details: map[string]any{ + "connections": 3, + }, + } + + replica2Health := &datasource.Health{ + Status: healthStatusDOWN, + Details: map[string]any{ + "error": "connection refused", + }, + } + + mocks.Primary.EXPECT().HealthCheck().Return(primaryHealth) + mocks.MockReplicas[0].EXPECT().HealthCheck().Return(replica1Health) + mocks.MockReplicas[1].EXPECT().HealthCheck().Return(replica2Health) + + health := mocks.Resolver.HealthCheck() + + assert.Equal(t, healthStatusUP, health.Status) + assert.Equal(t, primaryHealth, health.Details["primary"]) + + replicas := health.Details["replicas"].([]any) + assert.Len(t, replicas, 2) + + stats := health.Details["stats"].(map[string]any) + assert.Contains(t, stats, "primaryReads") + assert.Contains(t, stats, "replicaReads") + assert.Contains(t, stats, "totalQueries") +} + +func TestResolver_AddTrace(t *testing.T) { + mocks := setupMocks(t, true) + defer mocks.Ctrl.Finish() + + method := "query" + query := "SELECT * FROM users" + + _, span := mocks.Resolver.addTrace(t.Context(), method, query) + + assert.NotNil(t, span) +} diff --git a/pkg/gofr/datasource/dbresolver/strategy.go b/pkg/gofr/datasource/dbresolver/strategy.go index e3a9394ee..f3e46bcd1 100644 --- a/pkg/gofr/datasource/dbresolver/strategy.go +++ b/pkg/gofr/datasource/dbresolver/strategy.go @@ -1,18 +1,58 @@ package dbresolver import ( + "errors" "math/rand" "sync/atomic" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/trace" "gofr.dev/pkg/gofr/container" ) +var errNoReplicasAvailable = errors.New("no replicas available") + // Strategy defines how to choose a replica from available replicas. type Strategy interface { - Choose(replicas []container.DB) container.DB + Choose(replicas []container.DB) (container.DB, error) Name() string } +// chooseReplicaOrFallback attempts to select a replica and handles fallback logic. +// It returns either a selected replica DB or the primary DB if fallback occurs. +func (r *Resolver) chooseReplicaOrFallback(span trace.Span) container.DB { + if len(r.replicas) == 0 { + // No replicas available, use primary + if span != nil { + span.SetAttributes(attribute.String("dbresolver.target", "primary")) + } + r.stats.primaryReads.Add(1) + return r.primary + } + + db, err := r.strategy.Choose(r.replicas) + if err != nil { + // Replica selection failed, fall back to primary + r.logger.Debugf("Failed to choose replica: %v, falling back to primary", err) + r.stats.replicaFailures.Add(1) + r.stats.primaryFallbacks.Add(1) + r.stats.primaryReads.Add(1) + + if span != nil { + span.SetAttributes(attribute.Bool("dbresolver.fallback", true)) + span.SetAttributes(attribute.String("dbresolver.target", "primary")) + } + + return r.primary + } + + if span != nil { + span.SetAttributes(attribute.String("dbresolver.target", "replica")) + } + + return db +} + // RoundRobinStrategy selects replicas in round-robin fashion. type RoundRobinStrategy struct { current atomic.Int64 @@ -25,14 +65,13 @@ func NewRoundRobinStrategy(count int) Strategy { } // Choose selects a replica using round-robin. -func (s *RoundRobinStrategy) Choose(replicas []container.DB) container.DB { +func (s *RoundRobinStrategy) Choose(replicas []container.DB) (container.DB, error) { if len(replicas) == 0 { - panic("no replicas available") + return nil, errNoReplicasAvailable } idx := int(s.current.Add(1)) % len(replicas) - - return replicas[idx] + return replicas[idx], nil } // Name returns the strategy name. @@ -49,12 +88,12 @@ func NewRandomStrategy() Strategy { } // Choose selects a replica randomly. -func (*RandomStrategy) Choose(replicas []container.DB) container.DB { +func (*RandomStrategy) Choose(replicas []container.DB) (container.DB, error) { if len(replicas) == 0 { - panic("no replicas available") + return nil, errNoReplicasAvailable } - return replicas[rand.Intn(len(replicas))] //nolint:gosec // weak RNG is okay for load balancing + return replicas[rand.Intn(len(replicas))], nil //nolint:gosec // weak RNG is okay for load balancing } // Name returns the strategy name. diff --git a/pkg/gofr/datasource/dbresolver/strategy_test.go b/pkg/gofr/datasource/dbresolver/strategy_test.go new file mode 100644 index 000000000..2104f0df0 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/strategy_test.go @@ -0,0 +1,128 @@ +package dbresolver + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" + "gofr.dev/pkg/gofr/container" +) + +func TestRoundRobinStrategy_Choose(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // Create mock replicas + mockReplica1 := NewMockDB(ctrl) + mockReplica2 := NewMockDB(ctrl) + mockReplica3 := NewMockDB(ctrl) + + replicas := []container.DB{mockReplica1, mockReplica2, mockReplica3} + + // Create strategy + strategy := NewRoundRobinStrategy(len(replicas)) + + // First call should return first replica + db, err := strategy.Choose(replicas) + assert.NoError(t, err) + assert.Equal(t, mockReplica1, db) + + // Second call should return second replica + db, err = strategy.Choose(replicas) + assert.NoError(t, err) + assert.Equal(t, mockReplica2, db) + + // Third call should return third replica + db, err = strategy.Choose(replicas) + assert.NoError(t, err) + assert.Equal(t, mockReplica3, db) + + // Fourth call should wrap around to first replica + db, err = strategy.Choose(replicas) + assert.NoError(t, err) + assert.Equal(t, mockReplica1, db) +} + +func TestRoundRobinStrategy_Choose_SingleReplica(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // Create mock replica + mockReplica := NewMockDB(ctrl) + replicas := []container.DB{mockReplica} + + // Create strategy + strategy := NewRoundRobinStrategy(len(replicas)) + + // All calls should return the same replica + for i := 0; i < 5; i++ { + db, err := strategy.Choose(replicas) + assert.NoError(t, err) + assert.Equal(t, mockReplica, db) + } +} + +func TestRoundRobinStrategy_Choose_NoReplicas(t *testing.T) { + strategy := NewRoundRobinStrategy(0) + + db, err := strategy.Choose([]container.DB{}) + assert.Nil(t, db) + assert.ErrorIs(t, err, errNoReplicasAvailable) +} + +func TestRandomStrategy_Choose(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // Create mock replicas + mockReplica1 := NewMockDB(ctrl) + mockReplica2 := NewMockDB(ctrl) + mockReplica3 := NewMockDB(ctrl) + + replicas := []container.DB{mockReplica1, mockReplica2, mockReplica3} + + // Create strategy + strategy := NewRandomStrategy() + + // Verify that multiple calls return one of the replicas + for i := 0; i < 10; i++ { + result, err := strategy.Choose(replicas) + assert.NoError(t, err) + assert.Contains(t, replicas, result) + } +} + +func TestRandomStrategy_Choose_SingleReplica(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // Create mock replica + mockReplica := NewMockDB(ctrl) + replicas := []container.DB{mockReplica} + + // Create strategy + strategy := NewRandomStrategy() + + // All calls should return the same replica + for i := 0; i < 5; i++ { + db, err := strategy.Choose(replicas) + assert.NoError(t, err) + assert.Equal(t, mockReplica, db) + } +} + +func TestRandomStrategy_Choose_NoReplicas(t *testing.T) { + strategy := NewRandomStrategy() + + db, err := strategy.Choose([]container.DB{}) + assert.Nil(t, db) + assert.ErrorIs(t, err, errNoReplicasAvailable) +} + +func TestStrategy_Name(t *testing.T) { + roundRobin := NewRoundRobinStrategy(3) + assert.Equal(t, roundRobinStrategy, roundRobin.Name()) + + random := NewRandomStrategy() + assert.Equal(t, randomStrategy, random.Name()) +} diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index e44f87d31..14a6523eb 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -224,8 +224,13 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { } // Build resolver with primary and replicas - a.container.SQL = resolver.Build(a.container.SQL, replicas) + resolverDB, err := resolver.Build(a.container.SQL, replicas) + if err != nil { + a.Logger().Errorf("Failed to build DB resolver: %v", err) + return + } + a.container.SQL = resolverDB a.Logger().Logf("DB read/write splitting enabled with %d replicas", len(replicas)) } From 686ada47119d69973ea6ef3fd97c68c74ae7ba38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 03:51:49 +0000 Subject: [PATCH 05/25] build(deps): bump go.opentelemetry.io/otel/exporters/prometheus Bumps [go.opentelemetry.io/otel/exporters/prometheus](https://github.com/open-telemetry/opentelemetry-go) from 0.59.0 to 0.59.1. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/exporters/prometheus/v0.59.0...exporters/prometheus/v0.59.1) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/exporters/prometheus dependency-version: 0.59.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 ++++-- go.sum | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 96ef5084d..3318ccea8 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 go.opentelemetry.io/otel v1.37.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 - go.opentelemetry.io/otel/exporters/prometheus v0.59.0 + go.opentelemetry.io/otel/exporters/prometheus v0.59.1 go.opentelemetry.io/otel/exporters/zipkin v1.37.0 go.opentelemetry.io/otel/metric v1.37.0 go.opentelemetry.io/otel/sdk v1.37.0 @@ -67,6 +67,7 @@ require ( github.com/google/s2a-go v0.1.9 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect github.com/googleapis/gax-go/v2 v2.15.0 // indirect + github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -77,7 +78,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.65.0 // indirect - github.com/prometheus/procfs v0.16.1 // indirect + github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect + github.com/prometheus/procfs v0.17.0 // indirect github.com/redis/go-redis/extra/rediscmd/v9 v9.11.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/stretchr/objx v0.5.2 // indirect diff --git a/go.sum b/go.sum index d47d6bd15..964fabf27 100644 --- a/go.sum +++ b/go.sum @@ -113,6 +113,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248= +github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww= @@ -167,8 +169,10 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE= github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= -github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= -github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= +github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f h1:QQB6SuvGZjK8kdc2YaLJpYhV8fxauOsjE6jgcL6YJ8Q= +github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f/go.mod h1:P8AwMgdD7XEr6QRUJ2QWLpiAZTgTE2UYgjlu3svompI= +github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0= +github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= github.com/redis/go-redis/extra/rediscmd/v9 v9.11.0 h1:vP5CH2rJ3L4yk3o8FdXqiPL1lGl5APjHcxk5/OT6H0Q= github.com/redis/go-redis/extra/rediscmd/v9 v9.11.0/go.mod h1:/2yj0RD4xjZQ7wOg9u7gVoBM0IgMGrHunAql1hr1NDg= github.com/redis/go-redis/extra/redisotel/v9 v9.11.0 h1:dMNmusapfQefntfUqAYAvaVJMrJCdKUaQoPSZtd99WU= @@ -226,8 +230,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI= -go.opentelemetry.io/otel/exporters/prometheus v0.59.0 h1:HHf+wKS6o5++XZhS98wvILrLVgHxjA/AMjqHKes+uzo= -go.opentelemetry.io/otel/exporters/prometheus v0.59.0/go.mod h1:R8GpRXTZrqvXHDEGVH5bF6+JqAZcK8PjJcZ5nGhEWiE= +go.opentelemetry.io/otel/exporters/prometheus v0.59.1 h1:HcpSkTkJbggT8bjYP+BjyqPWlD17BH9C5CYNKeDzmcA= +go.opentelemetry.io/otel/exporters/prometheus v0.59.1/go.mod h1:0FJL+gjuUoM07xzik3KPBaN+nz/CoB15kV6WLMiXZag= go.opentelemetry.io/otel/exporters/zipkin v1.37.0 h1:Z2apuaRnHEjzDAkpbWNPiksz1R0/FCIrJSjiMA43zwI= go.opentelemetry.io/otel/exporters/zipkin v1.37.0/go.mod h1:ofGu/7fG+bpmjZoiPUUmYDJ4vXWxMT57HmGoegx49uw= go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= From 847ecf519460e24fc0f6039a8e7f6cd9a204054c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 04:46:29 +0000 Subject: [PATCH 06/25] build(deps): bump google.golang.org/api from 0.243.0 to 0.244.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.243.0 to 0.244.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.243.0...v0.244.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-version: 0.244.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3318ccea8..cbf25df9e 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( golang.org/x/sync v0.16.0 golang.org/x/term v0.33.0 golang.org/x/text v0.27.0 - google.golang.org/api v0.243.0 + google.golang.org/api v0.244.0 google.golang.org/grpc v1.74.2 google.golang.org/protobuf v1.36.6 modernc.org/sqlite v1.38.1 @@ -100,7 +100,7 @@ require ( golang.org/x/time v0.12.0 // indirect google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/libc v1.66.3 // indirect modernc.org/mathutil v1.7.1 // indirect diff --git a/go.sum b/go.sum index 964fabf27..9cecc18bd 100644 --- a/go.sum +++ b/go.sum @@ -351,8 +351,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.243.0 h1:sw+ESIJ4BVnlJcWu9S+p2Z6Qq1PjG77T8IJ1xtp4jZQ= -google.golang.org/api v0.243.0/go.mod h1:GE4QtYfaybx1KmeHMdBnNnyLzBZCVihGBXAmJu/uUr8= +google.golang.org/api v0.244.0 h1:lpkP8wVibSKr++NCD36XzTk/IzeKJ3klj7vbj+XU5pE= +google.golang.org/api v0.244.0/go.mod h1:dMVhVcylamkirHdzEBAIQWUCgqY885ivNeZYd7VAVr8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -363,8 +363,8 @@ google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuO google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s= google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY= google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From af78d89884a8b5033448de719e19736b8742997e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 03:54:29 +0000 Subject: [PATCH 07/25] build(deps): bump gofr.dev in /examples/using-add-filestore Bumps [gofr.dev](https://github.com/gofr-dev/gofr) from 1.42.4 to 1.42.5. - [Release notes](https://github.com/gofr-dev/gofr/releases) - [Commits](https://github.com/gofr-dev/gofr/compare/v1.42.4...v1.42.5) --- updated-dependencies: - dependency-name: gofr.dev dependency-version: 1.42.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- examples/using-add-filestore/go.mod | 26 ++++++------ examples/using-add-filestore/go.sum | 66 +++++++++++++++-------------- 2 files changed, 47 insertions(+), 45 deletions(-) diff --git a/examples/using-add-filestore/go.mod b/examples/using-add-filestore/go.mod index 2e9b88433..f0aec95db 100644 --- a/examples/using-add-filestore/go.mod +++ b/examples/using-add-filestore/go.mod @@ -7,13 +7,13 @@ toolchain go1.24.1 require ( github.com/stretchr/testify v1.10.0 go.uber.org/mock v0.5.2 - gofr.dev v1.42.4 + gofr.dev v1.42.5 gofr.dev/pkg/gofr/datasource/file/ftp v0.2.1 ) require ( cloud.google.com/go v0.120.0 // indirect - cloud.google.com/go/auth v0.16.2 // indirect + cloud.google.com/go/auth v0.16.3 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect cloud.google.com/go/compute/metadata v0.7.0 // indirect cloud.google.com/go/iam v1.5.2 // indirect @@ -34,11 +34,11 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-sql-driver/mysql v1.9.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v5 v5.2.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.3 // indirect github.com/google/s2a-go v0.1.9 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect - github.com/googleapis/gax-go/v2 v2.14.2 // indirect + github.com/googleapis/gax-go/v2 v2.15.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect @@ -83,24 +83,24 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect go.opentelemetry.io/otel/trace v1.37.0 // indirect go.opentelemetry.io/proto/otlp v1.7.0 // indirect - golang.org/x/crypto v0.39.0 // indirect - golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect - golang.org/x/net v0.41.0 // indirect + golang.org/x/crypto v0.40.0 // indirect + golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect + golang.org/x/net v0.42.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/sync v0.16.0 // indirect golang.org/x/sys v0.34.0 // indirect golang.org/x/term v0.33.0 // indirect golang.org/x/text v0.27.0 // indirect golang.org/x/time v0.12.0 // indirect - google.golang.org/api v0.241.0 // indirect - google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect + google.golang.org/api v0.243.0 // indirect + google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect - google.golang.org/grpc v1.73.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect + google.golang.org/grpc v1.74.2 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - modernc.org/libc v1.65.10 // indirect + modernc.org/libc v1.66.3 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect - modernc.org/sqlite v1.38.0 // indirect + modernc.org/sqlite v1.38.1 // indirect ) diff --git a/examples/using-add-filestore/go.sum b/examples/using-add-filestore/go.sum index 2af227f33..cb0e17968 100644 --- a/examples/using-add-filestore/go.sum +++ b/examples/using-add-filestore/go.sum @@ -1,16 +1,16 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA= cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q= -cloud.google.com/go/auth v0.16.2 h1:QvBAGFPLrDeoiNjyfVunhQ10HKNYuOwZ5noee0M5df4= -cloud.google.com/go/auth v0.16.2/go.mod h1:sRBas2Y1fB1vZTdurouM0AzuYQBMZinrUYL8EufhtEA= +cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc= +cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c= cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU= cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo= cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8= cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE= -cloud.google.com/go/kms v1.21.2 h1:c/PRUSMNQ8zXrc1sdAUnsenWWaNXN+PzTXfXOcSFdoE= -cloud.google.com/go/kms v1.21.2/go.mod h1:8wkMtHV/9Z8mLXEXr1GK7xPSBdi6knuLXIhqjuWcI6w= +cloud.google.com/go/kms v1.22.0 h1:dBRIj7+GDeeEvatJeTB19oYZNV0aj6wEqSIT/7gLqtk= +cloud.google.com/go/kms v1.22.0/go.mod h1:U7mf8Sva5jpOb4bxYZdtw/9zsbIjrklYwPcvMk34AL8= cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE= cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY= cloud.google.com/go/pubsub v1.49.0 h1:5054IkbslnrMCgA2MAEPcsN3Ky+AyMpEZcii/DoySPo= @@ -67,8 +67,8 @@ github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI6 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= -github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0= +github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= @@ -103,8 +103,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4= github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA= -github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0= -github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w= +github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo= +github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= @@ -245,8 +245,8 @@ go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -gofr.dev v1.42.4 h1:Nd58Rw1/9ydzZ8dn9d6s5lh3DkzsVKXQ0gYKpLUEDfM= -gofr.dev v1.42.4/go.mod h1:y/tFyLFsRYdxYijVyLPqO9LjLqLd66Ee/pYgK/rxc28= +gofr.dev v1.42.5 h1:QeJipPefIl+oj2yRqYWG0TDg3VUk69hfs5gtmHTthNU= +gofr.dev v1.42.5/go.mod h1:GAfeovw+OAPkJRPW1Bou3Aeeos9ro899NUHEm5XDdiQ= gofr.dev/pkg/gofr/datasource/file/ftp v0.2.1 h1:yQSUXbapNcQRFg2Po73/6N4pu15FIxTGHQhAIqbmSCU= gofr.dev/pkg/gofr/datasource/file/ftp v0.2.1/go.mod h1:KPYuFBGSajIsooC6aiHDg41/+gO+5NKzkIG8D+h1RhM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -254,11 +254,11 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= -golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= +golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM= -golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= +golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o= +golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -283,8 +283,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= -golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= +golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= @@ -348,28 +348,28 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.241.0 h1:QKwqWQlkc6O895LchPEDUSYr22Xp3NCxpQRiWTB6avE= -google.golang.org/api v0.241.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50= +google.golang.org/api v0.243.0 h1:sw+ESIJ4BVnlJcWu9S+p2Z6Qq1PjG77T8IJ1xtp4jZQ= +google.golang.org/api v0.243.0/go.mod h1:GE4QtYfaybx1KmeHMdBnNnyLzBZCVihGBXAmJu/uUr8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78= -google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:49MsLSx0oWMOZqcpB3uL8ZOkAh1+TndpJ8ONoCBWiZk= +google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4= +google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s= google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY= google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok= -google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= +google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4= +google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -393,16 +393,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -modernc.org/cc/v4 v4.26.1 h1:+X5NtzVBn0KgsBCBe+xkDC7twLb/jNVj9FPgiwSQO3s= -modernc.org/cc/v4 v4.26.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= +modernc.org/cc/v4 v4.26.2 h1:991HMkLjJzYBIfha6ECZdjrIYz2/1ayr+FL8GN+CNzM= +modernc.org/cc/v4 v4.26.2/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0= modernc.org/ccgo/v4 v4.28.0 h1:rjznn6WWehKq7dG4JtLRKxb52Ecv8OUGah8+Z/SfpNU= modernc.org/ccgo/v4 v4.28.0/go.mod h1:JygV3+9AV6SmPhDasu4JgquwU81XAKLd3OKTUDNOiKE= -modernc.org/fileutil v1.3.3 h1:3qaU+7f7xxTUmvU1pJTZiDLAIoJVdUSSauJNHg9yXoA= -modernc.org/fileutil v1.3.3/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc= +modernc.org/fileutil v1.3.8 h1:qtzNm7ED75pd1C7WgAGcK4edm4fvhtBsEiI/0NQ54YM= +modernc.org/fileutil v1.3.8/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= -modernc.org/libc v1.65.10 h1:ZwEk8+jhW7qBjHIT+wd0d9VjitRyQef9BnzlzGwMODc= -modernc.org/libc v1.65.10/go.mod h1:StFvYpx7i/mXtBAfVOjaU0PWZOvIRoZSgXhrwXzr8Po= +modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= +modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= +modernc.org/libc v1.66.3 h1:cfCbjTUcdsKyyZZfEUKfoHcP3S0Wkvz3jgSzByEWVCQ= +modernc.org/libc v1.66.3/go.mod h1:XD9zO8kt59cANKvHPXpx7yS2ELPheAey0vjIuZOhOU8= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= @@ -411,8 +413,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.38.0 h1:+4OrfPQ8pxHKuWG4md1JpR/EYAh3Md7TdejuuzE7EUI= -modernc.org/sqlite v1.38.0/go.mod h1:1Bj+yES4SVvBZ4cBOpVZ6QgesMCKpJZDq0nxYzOpmNE= +modernc.org/sqlite v1.38.1 h1:jNnIjleVta+DKSAr3TnkKK87EEhjPhBLzi6hvIX9Bas= +modernc.org/sqlite v1.38.1/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= From 006ad33476b5b0430798bb593883b70965230da8 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Tue, 5 Aug 2025 12:36:43 +0530 Subject: [PATCH 08/25] fix connection issues of replica's --- go.work | 4 +- go.work.sum | 113 +++++++++++++++++++++++++++++++++++++++- pkg/gofr/external_db.go | 32 ++++++++---- 3 files changed, 135 insertions(+), 14 deletions(-) diff --git a/go.work b/go.work index 4dbf620c3..793e95d5d 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,4 @@ -go 1.24.0 - -toolchain go1.24.0 +go 1.24.5 use ( . diff --git a/go.work.sum b/go.work.sum index ec87d4cd5..1019cb6da 100644 --- a/go.work.sum +++ b/go.work.sum @@ -11,6 +11,8 @@ cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI= cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= cel.dev/expr v0.23.0 h1:wUb94w6OYQS4uXraxo9U+wUAs9jT47Xvl4iPgAwM2ss= cel.dev/expr v0.23.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= +cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= +cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= @@ -49,6 +51,8 @@ cloud.google.com/go/aiplatform v1.74.0 h1:rE2P5H7FOAFISAZilmdkapbk4CVgwfVs6FDWlh cloud.google.com/go/aiplatform v1.74.0/go.mod h1:hVEw30CetNut5FrblYd1AJUWRVSIjoyIvp0EVUh51HA= cloud.google.com/go/aiplatform v1.85.0 h1:80/GqdP8Tovaaw9Qr6fYZNDvwJeA9rLk8mYkqBJNIJQ= cloud.google.com/go/aiplatform v1.85.0/go.mod h1:S4DIKz3TFLSt7ooF2aCRdAqsUR4v/YDXUoHqn5P0EFc= +cloud.google.com/go/aiplatform v1.89.0 h1:niSJYc6ldWWVM9faXPo1Et1MVSQoLvVGriD7fwbJdtE= +cloud.google.com/go/aiplatform v1.89.0/go.mod h1:TzZtegPkinfXTtXVvZZpxx7noINFMVDrLkE7cEWhYEk= cloud.google.com/go/analytics v0.25.2/go.mod h1:th0DIunqrhI1ZWVlT3PH2Uw/9ANX8YHfFDEPqf/+7xM= cloud.google.com/go/analytics v0.25.3 h1:hX6JAsNbXd2uVjqjIuMcKpmhIybKrEunBiGxK4SwEFI= cloud.google.com/go/analytics v0.25.3/go.mod h1:pWoYg4yEr0iYg83LZRAicjDDdv54+Z//RyhzWwKbavI= @@ -56,6 +60,8 @@ cloud.google.com/go/analytics v0.26.0 h1:O2kWr2Sd4ep3I+YJ4aiY0G4+zWz6sp4eTce+JVn cloud.google.com/go/analytics v0.26.0/go.mod h1:KZWJfs8uX/+lTjdIjvT58SFa86V9KM6aPXwZKK6uNVI= cloud.google.com/go/analytics v0.28.0 h1:Bs17XtOjd+BhJtn+4QsCo8huMt7Zzziqn0umPz8ov2A= cloud.google.com/go/analytics v0.28.0/go.mod h1:hNT09bdzGB3HsL7DBhZkoPi4t5yzZPZROoFv+JzGR7I= +cloud.google.com/go/analytics v0.28.1 h1:W2ft49J/LeEj9A07Jsd5Q2kAzajK0j0IffOyyzbxw04= +cloud.google.com/go/analytics v0.28.1/go.mod h1:iPaIVr5iXPB3JzkKPW1JddswksACRFl3NSHgVHsuYC4= cloud.google.com/go/apigateway v1.7.2/go.mod h1:+weId+9aR9J6GRwDka7jIUSrKEX60XGcikX7dGU8O7M= cloud.google.com/go/apigateway v1.7.3 h1:Mn7cC5iWJz+cSMS/Hb+N2410CpZ6c8XpJKaexBl0Gxs= cloud.google.com/go/apigateway v1.7.3/go.mod h1:uK0iRHdl2rdTe79bHW/bTsKhhXPcFihjUdb7RzhTPf4= @@ -91,6 +97,8 @@ cloud.google.com/go/asset v1.20.4 h1:6oNgjcs5KCPGBD71G0IccK6TfeFsEtBTyQ3Q+Dn09bs cloud.google.com/go/asset v1.20.4/go.mod h1:DP09pZ+SoFWUZyPZx26xVroHk+6+9umnQv+01yfJxbM= cloud.google.com/go/asset v1.21.0 h1:AtsFIJU1gH3jXHf+2cyugTkpOPT8VYyjCK2yNmQltvg= cloud.google.com/go/asset v1.21.0/go.mod h1:0lMJ0STdyImZDSCB8B3i/+lzIquLBpJ9KZ4pyRvzccM= +cloud.google.com/go/asset v1.21.1 h1:i55wWC/EwVdHMyJgRfbLp/L6ez4nQuOpZwSxkuqN9ek= +cloud.google.com/go/asset v1.21.1/go.mod h1:7AzY1GCC+s1O73yzLM1IpHFLHz3ws2OigmCpOQHwebk= cloud.google.com/go/assuredworkloads v1.12.2/go.mod h1:/WeRr/q+6EQYgnoYrqCVgw7boMoDfjXZZev3iJxs2Iw= cloud.google.com/go/assuredworkloads v1.12.3 h1:RU1WhF1zMggdXAZ+ezYTn4Eh/FdiX7sz8lLXGERn4Po= cloud.google.com/go/assuredworkloads v1.12.3/go.mod h1:iGBkyMGdtlsxhCi4Ys5SeuvIrPTeI6HeuEJt7qJgJT8= @@ -101,6 +109,8 @@ cloud.google.com/go/auth v0.12.1/go.mod h1:BFMu+TNpF3DmvfBO9ClqTR/SiqVIm7LukKF9m cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q= cloud.google.com/go/auth v0.14.1/go.mod h1:4JHUxlGXisL0AW8kXPtUF6ztuOksyfUQNFjfsOCXkPM= cloud.google.com/go/auth v0.15.0/go.mod h1:WJDGqZ1o9E9wKIL+IwStfyn/+s59zl4Bi+1KQNVXLZ8= +cloud.google.com/go/auth v0.16.0/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI= +cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI= cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= cloud.google.com/go/automl v1.14.2/go.mod h1:mIat+Mf77W30eWQ/vrhjXsXaRh8Qfu4WiymR0hR6Uxk= cloud.google.com/go/automl v1.14.4 h1:vkD+hQ75SMINMgJBT/KDpFYvfQLzJbtIQZdw0AWq8Rs= @@ -139,6 +149,8 @@ cloud.google.com/go/bigquery v1.66.2 h1:EKOSqjtO7jPpJoEzDmRctGea3c2EOGoexy8VyY9d cloud.google.com/go/bigquery v1.66.2/go.mod h1:+Yd6dRyW8D/FYEjUGodIbu0QaoEmgav7Lwhotup6njo= cloud.google.com/go/bigquery v1.67.0 h1:GXleMyn/cu5+DPLy9Rz5f5IULWTLrepwbQnP/5qrVbY= cloud.google.com/go/bigquery v1.67.0/go.mod h1:HQeP1AHFuAz0Y55heDSb0cjZIhnEkuwFRBGo6EEKHug= +cloud.google.com/go/bigquery v1.69.0 h1:rZvHnjSUs5sHK3F9awiuFk2PeOaB8suqNuim21GbaTc= +cloud.google.com/go/bigquery v1.69.0/go.mod h1:TdGLquA3h/mGg+McX+GsqG9afAzTAcldMjqhdjHTLew= cloud.google.com/go/bigtable v1.33.0/go.mod h1:HtpnH4g25VT1pejHRtInlFPnN5sjTxbQlsYBjh9t5l0= cloud.google.com/go/bigtable v1.34.0 h1:eIgi3QLcN4aq8p6n9U/zPgmHeBP34sm9FiKq4ik/ZoY= cloud.google.com/go/bigtable v1.34.0/go.mod h1:p94uLf6cy6D73POkudMagaFF3x9c7ktZjRnOUVGjZAw= @@ -195,6 +207,8 @@ cloud.google.com/go/compute v1.34.0 h1:+k/kmViu4TEi97NGaxAATYtpYBviOWJySPZ+ekA95 cloud.google.com/go/compute v1.34.0/go.mod h1:zWZwtLwZQyonEvIQBuIa0WvraMYK69J5eDCOw9VZU4g= cloud.google.com/go/compute v1.37.0 h1:XxtZlXYkZXub3LNaLu90TTemcFqIU1yZ4E4q9VlR39A= cloud.google.com/go/compute v1.37.0/go.mod h1:AsK4VqrSyXBo4SMbRtfAO1VfaMjUEjEwv1UB/AwVp5Q= +cloud.google.com/go/compute v1.38.0 h1:MilCLYQW2m7Dku8hRIIKo4r0oKastlD74sSu16riYKs= +cloud.google.com/go/compute v1.38.0/go.mod h1:oAFNIuXOmXbK/ssXm3z4nZB8ckPdjltJ7xhHCdbWFZM= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg= @@ -210,6 +224,8 @@ cloud.google.com/go/container v1.42.2 h1:8ncSEBjkng6ucCICauaUGzBomoM2VyYzleAum1O cloud.google.com/go/container v1.42.2/go.mod h1:y71YW7uR5Ck+9Vsbst0AF2F3UMgqmsN4SP8JR9xEsR8= cloud.google.com/go/container v1.42.4 h1:N8I+GiImhrSMUcKSOYTd8D6wBWyWSgPa4IJkSdlR2jk= cloud.google.com/go/container v1.42.4/go.mod h1:wf9lKc3ayWVbbV/IxKIDzT7E+1KQgzkzdxEJpj1pebE= +cloud.google.com/go/container v1.43.0 h1:A6J92FJPfxTvyX7MHF+w4t2W9WCqvHOi9UB5SAeSy3w= +cloud.google.com/go/container v1.43.0/go.mod h1:ETU9WZ1KM9ikEKLzrhRVao7KHtalDQu6aPqM34zDr/U= cloud.google.com/go/containeranalysis v0.13.2/go.mod h1:AiKvXJkc3HiqkHzVIt6s5M81wk+q7SNffc6ZlkTDgiE= cloud.google.com/go/containeranalysis v0.13.3 h1:1D8U75BeotZxrG4jR6NYBtOt+uAeBsWhpBZmSYLakQw= cloud.google.com/go/containeranalysis v0.13.3/go.mod h1:0SYnagA1Ivb7qPqKNYPkCtphhkJn3IzgaSp3mj+9XAY= @@ -227,11 +243,15 @@ cloud.google.com/go/dataflow v0.10.3 h1:+7IfIXzYWSybIIDGK9FN2uqBsP/5b/Y0pBYzNhcm cloud.google.com/go/dataflow v0.10.3/go.mod h1:5EuVGDh5Tg4mDePWXMMGAG6QYAQhLNyzxdNQ0A1FfW4= cloud.google.com/go/dataflow v0.10.6 h1:UKUD8I7So3H646JHZWcrYVgf2nuEB27l015zUErPnow= cloud.google.com/go/dataflow v0.10.6/go.mod h1:Vi0pTYCVGPnM2hWOQRyErovqTu2xt2sr8Rp4ECACwUI= +cloud.google.com/go/dataflow v0.11.0 h1:AdhB4cAkMOC9NtrHJxpKOVvO/VqBLaIyk0tEEhbGjYM= +cloud.google.com/go/dataflow v0.11.0/go.mod h1:gNHC9fUjlV9miu0hd4oQaXibIuVYTQvZhMdPievKsPk= cloud.google.com/go/dataform v0.10.2/go.mod h1:oZHwMBxG6jGZCVZqqMx+XWXK+dA/ooyYiyeRbUxI15M= cloud.google.com/go/dataform v0.10.3 h1:ZpGkZV8OyhUhvN/tfLffU2ki5ERTtqOunkIaiVAhmw0= cloud.google.com/go/dataform v0.10.3/go.mod h1:8SruzxHYCxtvG53gXqDZvZCx12BlsUchuV/JQFtyTCw= cloud.google.com/go/dataform v0.11.2 h1:poGCMWMvu/t2SooaWDHJAJiUyAtWYzKy+SGDNez2RI0= cloud.google.com/go/dataform v0.11.2/go.mod h1:IMmueJPEKpptT2ZLWlvIYjw6P/mYHHxA7/SUBiXqZUY= +cloud.google.com/go/dataform v0.12.0 h1:0eCPTPUC/RZ863aVfXTJLkg0tEpdpn62VD6ywSmmzxM= +cloud.google.com/go/dataform v0.12.0/go.mod h1:PuDIEY0lSVuPrZqcFji1fmr5RRvz3DGz4YP/cONc8g4= cloud.google.com/go/datafusion v1.8.2/go.mod h1:XernijudKtVG/VEvxtLv08COyVuiYPraSxm+8hd4zXA= cloud.google.com/go/datafusion v1.8.3 h1:FTMtsf2nfGGlDCuE84/RvVaCcTIYE7WQSB0noeO0cwI= cloud.google.com/go/datafusion v1.8.3/go.mod h1:hyglMzE57KRf0Rf/N2VRPcHCwKfZAAucx+LATY6Jc6Q= @@ -249,6 +269,8 @@ cloud.google.com/go/dataplex v1.22.0 h1:j4hD6opb+gq9CJNPFIlIggoW8Kjymg8Wmy2mdHmQ cloud.google.com/go/dataplex v1.22.0/go.mod h1:g166QMCGHvwc3qlTG4p34n+lHwu7JFfaNpMfI2uO7b8= cloud.google.com/go/dataplex v1.25.2 h1:jgfG6iqPVJxNPSpVCxH4diHMFb87wNd0F1kDgU3XJCk= cloud.google.com/go/dataplex v1.25.2/go.mod h1:AH2/a7eCYvFP58scJGR7YlSY9qEhM8jq5IeOA/32IZ0= +cloud.google.com/go/dataplex v1.25.3 h1:Xr0Toh6wyBlmL3H4EPu1YKwxUtkDSzzq+IP0iLc88kk= +cloud.google.com/go/dataplex v1.25.3/go.mod h1:wOJXnOg6bem0tyslu4hZBTncfqcPNDpYGKzed3+bd+E= cloud.google.com/go/dataproc/v2 v2.10.0/go.mod h1:HD16lk4rv2zHFhbm8gGOtrRaFohMDr9f0lAUMLmg1PM= cloud.google.com/go/dataproc/v2 v2.10.1 h1:2vOv471LrcSn91VNzijcH+OkDRLa3kdyymOfKqbwZ4c= cloud.google.com/go/dataproc/v2 v2.10.1/go.mod h1:fq+LSN/HYUaaV2EnUPFVPxfe1XpzGVqFnL0TTXs8juk= @@ -261,6 +283,8 @@ cloud.google.com/go/dataqna v0.9.3 h1:lGUj2FYs650EUPDMV6plWBAoh8qH9Bu1KCz1PUYF2V cloud.google.com/go/dataqna v0.9.3/go.mod h1:PiAfkXxa2LZYxMnOWVYWz3KgY7txdFg9HEMQPb4u1JA= cloud.google.com/go/dataqna v0.9.6 h1:ymqgCzymbsVgBvD4jhdt7HN9cVwg9x60jkozpp/omFQ= cloud.google.com/go/dataqna v0.9.6/go.mod h1:rjnNwjh8l3ZsvrANy6pWseBJL2/tJpCcBwJV8XCx4kU= +cloud.google.com/go/dataqna v0.9.7 h1:qTRAG/E3T63Xj1orefRlwupfwH9c9ERUAnWSRGp75so= +cloud.google.com/go/dataqna v0.9.7/go.mod h1:4ac3r7zm7Wqm8NAc8sDIDM0v7Dz7d1e/1Ka1yMFanUM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/datastore v1.20.0 h1:NNpXoyEqIJmZFc0ACcwBEaXnmscUpcG4NkKnbCePmiM= @@ -279,6 +303,8 @@ cloud.google.com/go/deploy v1.26.2 h1:1c2Cd3jdb0mrKHHfyzSQ5DRmxgYd07tIZZzuMNrwDx cloud.google.com/go/deploy v1.26.2/go.mod h1:XpS3sG/ivkXCfzbzJXY9DXTeCJ5r68gIyeOgVGxGNEs= cloud.google.com/go/deploy v1.27.1 h1:Rs8v4J68cZ45RfimX0wjraXaF4WZl1SIR+hkmGaK6Ag= cloud.google.com/go/deploy v1.27.1/go.mod h1:il2gxiMgV3AMlySoQYe54/xpgVDoEh185nj4XjJ+GRk= +cloud.google.com/go/deploy v1.27.2 h1:C0VqBhFyQFp6+xgPHZAD7LeRA4XGy5YLzGmPQ2NhlLk= +cloud.google.com/go/deploy v1.27.2/go.mod h1:4NHWE7ENry2A4O1i/4iAPfXHnJCZ01xckAKpZQwhg1M= cloud.google.com/go/dialogflow v1.60.0/go.mod h1:PjsrI+d2FI4BlGThxL0+Rua/g9vLI+2A1KL7s/Vo3pY= cloud.google.com/go/dialogflow v1.64.1 h1:6fU4IKLpvgpXqiUCE8gUp8eV5u629SCtiyXMudXtZSg= cloud.google.com/go/dialogflow v1.64.1/go.mod h1:jkv4vTiGhEUPBzmk1sJ+S1Duu2epCOBNHoWUImHkO5U= @@ -293,6 +319,8 @@ cloud.google.com/go/dlp v1.21.0 h1:9kz7+gaB/0gBZsDUnNT1asDihNZSrRFSeUTBcBdUAkk= cloud.google.com/go/dlp v1.21.0/go.mod h1:Y9HOVtPoArpL9sI1O33aN/vK9QRwDERU9PEJJfM8DvE= cloud.google.com/go/dlp v1.22.1 h1:aZvDXCSNmPjhawF/thQa/GNIoW16JGNlI5L5N/HNXGU= cloud.google.com/go/dlp v1.22.1/go.mod h1:Gc7tGo1UJJTBRt4OvNQhm8XEQ0i9VidAiGXBVtsftjM= +cloud.google.com/go/dlp v1.23.0 h1:3xWRKylXxhysaQaV+DLev1YcIywFUCc7yJEE6R7ZGDQ= +cloud.google.com/go/dlp v1.23.0/go.mod h1:vVT4RlyPMEMcVHexdPT6iMVac3seq3l6b8UPdYpgFrg= cloud.google.com/go/documentai v1.35.0/go.mod h1:ZotiWUlDE8qXSUqkJsGMQqVmfTMYATwJEYqbPXTR9kk= cloud.google.com/go/documentai v1.35.1 h1:52RfiUsoblXcE57CfKJGnITWLxRM30BcqNk/BKZl2LI= cloud.google.com/go/documentai v1.35.1/go.mod h1:WJjwUAQfwQPJORW8fjz7RODprMULDzEGLA2E6WxenFw= @@ -342,6 +370,8 @@ cloud.google.com/go/gkebackup v1.6.3 h1:djdExe/QgoKdp1gnIO1G5BoO1o/yGQOQJJEZ4QKT cloud.google.com/go/gkebackup v1.6.3/go.mod h1:JJzGsA8/suXpTDtqI7n9RZW97PXa2CIp+n8aRC/y57k= cloud.google.com/go/gkebackup v1.7.0 h1:9nDcyMJvTEmsWhJv+sIqMLRIJaEmpkpirxt+cOlaDjM= cloud.google.com/go/gkebackup v1.7.0/go.mod h1:oPHXUc6X6tg6Zf/7QmKOfXOFaVzBEgMWpLDb4LqngWA= +cloud.google.com/go/gkebackup v1.8.0 h1:eBqOt61yEChvj7I/GDPBbdCCRdUPudD1qrQYfYWV3Ok= +cloud.google.com/go/gkebackup v1.8.0/go.mod h1:FjsjNldDilC9MWKEHExnK3kKJyTDaSdO1vF0QeWSOPU= cloud.google.com/go/gkeconnect v0.12.0/go.mod h1:zn37LsFiNZxPN4iO7YbUk8l/E14pAJ7KxpoXoxt7Ly0= cloud.google.com/go/gkeconnect v0.12.1 h1:YVpR0vlHSP/wD74PXEbKua4Aamud+wiYm4TiewNjD3M= cloud.google.com/go/gkeconnect v0.12.1/go.mod h1:L1dhGY8LjINmWfR30vneozonQKRSIi5DWGIHjOqo58A= @@ -361,6 +391,8 @@ cloud.google.com/go/gkemulticloud v1.5.3 h1:334aZmOzIt3LVBpguCof8IHaLaftcZlx+L0T cloud.google.com/go/gkemulticloud v1.5.3/go.mod h1:KPFf+/RcfvmuScqwS9/2MF5exZAmXSuoSLPuaQ98Xlk= cloud.google.com/go/grafeas v0.3.11 h1:CobnwnyeY1j1Defi5vbEircI+jfrk3ci5m004ZjiFP4= cloud.google.com/go/grafeas v0.3.11/go.mod h1:dcQyG2+T4tBgG0MvJAh7g2wl/xHV2w+RZIqivwuLjNg= +cloud.google.com/go/grafeas v0.3.15 h1:lBjwKmhpiqOAFaE0xdqF8CqO74a99s8tUT5mCkBBxPs= +cloud.google.com/go/grafeas v0.3.15/go.mod h1:irwcwIQOBlLBotGdMwme8PipnloOPqILfIvMwlmu8Pk= cloud.google.com/go/gsuiteaddons v1.7.2/go.mod h1:GD32J2rN/4APilqZw4JKmwV84+jowYYMkEVwQEYuAWc= cloud.google.com/go/gsuiteaddons v1.7.3 h1:QafYhVhyFGpidBUUlVhy6lUHFogFOycVYm9DV7MinhA= cloud.google.com/go/gsuiteaddons v1.7.3/go.mod h1:0rR+LC21v1Sx1Yb6uohHI/F8DF3h2arSJSHvfi3GmyQ= @@ -375,6 +407,8 @@ cloud.google.com/go/iap v1.10.3 h1:OWNYFHPyIBNHEAEFdVKOltYWe0g3izSrpFJW6Iidovk= cloud.google.com/go/iap v1.10.3/go.mod h1:xKgn7bocMuCFYhzRizRWP635E2LNPnIXT7DW0TlyPJ8= cloud.google.com/go/iap v1.11.1 h1:RWWGRaPe/icBqNLTk83hfLkBZOh5TPufUTyWDWRldFo= cloud.google.com/go/iap v1.11.1/go.mod h1:qFipMJ4nOIv4yDHZxn31PiS8QxJJH2FlxgH9aFauejw= +cloud.google.com/go/iap v1.11.2 h1:VIioCrYsyWiRGx7Y8RDNylpI6d4t1Qx5ZgSLUVmWWPo= +cloud.google.com/go/iap v1.11.2/go.mod h1:Bh99DMUpP5CitL9lK0BC8MYgjjYO4b3FbyhgW1VHJvg= cloud.google.com/go/ids v1.5.2/go.mod h1:P+ccDD96joXlomfonEdCnyrHvE68uLonc7sJBPVM5T0= cloud.google.com/go/ids v1.5.3 h1:wbFF7twu0XScFr+dtsVxTTttbFIRYt/SJjZiHFidtYE= cloud.google.com/go/ids v1.5.3/go.mod h1:a2MX8g18Eqs7yxD/pnEdid42SyBUm9LIzSWf8Jux9OY= @@ -400,6 +434,7 @@ cloud.google.com/go/logging v1.12.0/go.mod h1:wwYBt5HlYP1InnrtYI0wtwttpVU1rifnMT cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc= cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA= cloud.google.com/go/longrunning v0.5.6/go.mod h1:vUaDrWYOMKRuhiv6JBnn49YxCPz2Ayn9GqyjaBT8/mA= +cloud.google.com/go/longrunning v0.6.6/go.mod h1:hyeGJUrPHcx0u2Uu1UFSoYZLn4lkMrccJig0t4FI7yw= cloud.google.com/go/managedidentities v1.7.2/go.mod h1:t0WKYzagOoD3FNtJWSWcU8zpWZz2i9cw2sKa9RiPx5I= cloud.google.com/go/managedidentities v1.7.3 h1:b9xGs24BIjfyvLgCtJoClOZpPi8d8owPgWe5JEINgaY= cloud.google.com/go/managedidentities v1.7.3/go.mod h1:H9hO2aMkjlpY+CNnKWRh+WoQiUIDO8457wWzUGsdtLA= @@ -412,6 +447,8 @@ cloud.google.com/go/maps v1.19.0 h1:deVm1ZFyCrUwxG11CdvtBz350VG5JUQ/LHTLnQrBgrM= cloud.google.com/go/maps v1.19.0/go.mod h1:goHUXrmzoZvQjUVd0KGhH8t3AYRm17P8b+fsyR1UAmQ= cloud.google.com/go/maps v1.20.4 h1:vShJlIzVc3MSUcvdH1j2plmDP/KyWc9e0Th73mY4Kt0= cloud.google.com/go/maps v1.20.4/go.mod h1:Act0Ws4HffrECH+pL8YYy1scdSLegov7+0c6gvKqRzI= +cloud.google.com/go/maps v1.21.0 h1:El61AfMxC1sU/RU8Wzs9dkZEgltyunKM86aKF9aDlaE= +cloud.google.com/go/maps v1.21.0/go.mod h1:cqzZ7+DWUKKbPTgqE+KuNQtiCRyg/o7WZF9zDQk+HQs= cloud.google.com/go/mediatranslation v0.9.2/go.mod h1:1xyRoDYN32THzy+QaU62vIMciX0CFexplju9t30XwUc= cloud.google.com/go/mediatranslation v0.9.3 h1:nRBjeaMLipw05Br+qDAlSCcCQAAlat4mvpafztbEVgc= cloud.google.com/go/mediatranslation v0.9.3/go.mod h1:KTrFV0dh7duYKDjmuzjM++2Wn6yw/I5sjZQVV5k3BAA= @@ -427,6 +464,8 @@ cloud.google.com/go/metastore v1.14.3 h1:jDqeCw6NGDRAPT9+2Y/EjnWAB0BfCcUfmPLOyhB cloud.google.com/go/metastore v1.14.3/go.mod h1:HlbGVOvg0ubBLVFRk3Otj3gtuzInuzO/TImOBwsKlG4= cloud.google.com/go/metastore v1.14.6 h1:X/eWwRv83ACfRPVrXlFM4DfJ7gwXRC1Tziv6w5MGxLU= cloud.google.com/go/metastore v1.14.6/go.mod h1:iDbuGwlDr552EkWA5E1Y/4hHme3cLv3ZxArKHXjS2OU= +cloud.google.com/go/metastore v1.14.7 h1:dLm59AHHZCorveCylj7c2iWhkQsmMIeWTsV+tG/BXtY= +cloud.google.com/go/metastore v1.14.7/go.mod h1:0dka99KQofeUgdfu+K/Jk1KeT9veWZlxuZdJpZPtuYU= cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU= cloud.google.com/go/monitoring v1.22.1 h1:KQbnAC4IAH+5x3iWuPZT5iN9VXqKMzzOgqcYB6fqPDE= cloud.google.com/go/monitoring v1.22.1/go.mod h1:AuZZXAoN0WWWfsSvET1Cpc4/1D8LXq8KRDU87fMS6XY= @@ -480,6 +519,8 @@ cloud.google.com/go/osconfig v1.14.3 h1:cyf1PMK5c2/WOIr5r2lxjH/XBJMA9P4zC8Tm10i0 cloud.google.com/go/osconfig v1.14.3/go.mod h1:9D2MS1Etne18r/mAeW5jtto3toc9H1qu9wLNDG3NvQg= cloud.google.com/go/osconfig v1.14.5 h1:r3enRq2DarWyiE/BhHjZf1Yc/iC2YBsyvqqtEGD+upk= cloud.google.com/go/osconfig v1.14.5/go.mod h1:XH+NjBVat41I/+xgQzKOJEhuC4xI7lX2INE5SWnVr9U= +cloud.google.com/go/osconfig v1.14.6 h1:4uJrA1obzMBp1I+DF15y/MvsXKIODevuANpq3QhvX30= +cloud.google.com/go/osconfig v1.14.6/go.mod h1:LS39HDBH0IJDFgOUkhSZUHFQzmcWaCpYXLrc3A4CVzI= cloud.google.com/go/oslogin v1.14.2/go.mod h1:M7tAefCr6e9LFTrdWRQRrmMeKHbkvc4D9g6tHIjHySA= cloud.google.com/go/oslogin v1.14.3 h1:yomxnFPk+ye0zd0mJ15nn9fH4Ns7ex4xA3ll+u2q59A= cloud.google.com/go/oslogin v1.14.3/go.mod h1:fDEGODTG/W9ZGUTHTlMh8euXWC1fTcgjJ9Kcxxy14a8= @@ -546,6 +587,8 @@ cloud.google.com/go/retail v1.19.2 h1:PT6CUlazIFIOLLJnV+bPBtiSH8iusKZ+FZRzZYFt2v cloud.google.com/go/retail v1.19.2/go.mod h1:71tRFYAcR4MhrZ1YZzaJxr030LvaZiIcupH7bXfFBcY= cloud.google.com/go/retail v1.20.0 h1:SbvW4zrmY+2sN76xU9syXzOGC9496TZ6r3euIyCn7Nw= cloud.google.com/go/retail v1.20.0/go.mod h1:1CXWDZDJTOsK6lPjkv67gValP9+h1TMadTC9NpFFr9s= +cloud.google.com/go/retail v1.21.0 h1:8jgWgtAg1mk91WmaoWRTlL9CcvazPwqZ3YT9n6Gva9U= +cloud.google.com/go/retail v1.21.0/go.mod h1:LuG+QvBdLfKfO+7nnF3eA3l1j4TQw3Sg+UqlUorquRc= cloud.google.com/go/run v1.7.0/go.mod h1:IvJOg2TBb/5a0Qkc6crn5yTy5nkjcgSWQLhgO8QL8PQ= cloud.google.com/go/run v1.8.1 h1:aeVLygw0BGLH+Zbj8v3K3nEHvKlgoq+j8fcRJaYZtxY= cloud.google.com/go/run v1.8.1/go.mod h1:wR5IG8Nujk9pyyNai187K4p8jzSLeqCKCAFBrZ2Sd4c= @@ -553,6 +596,8 @@ cloud.google.com/go/run v1.9.0 h1:9WeTqeEcriXqRViXMNwczjFJjixOSBlSlk/fW3lfKPg= cloud.google.com/go/run v1.9.0/go.mod h1:Dh0+mizUbtBOpPEzeXMM22t8qYQpyWpfmUiWQ0+94DU= cloud.google.com/go/run v1.9.3 h1:BrB0Y/BlsyWKdHebDp3CpbV9knwcWqqQI4RWYElf1zQ= cloud.google.com/go/run v1.9.3/go.mod h1:Si9yDIkUGr5vsXE2QVSWFmAjJkv/O8s3tJ1eTxw3p1o= +cloud.google.com/go/run v1.10.0 h1:CDhz0PPzI/cVpmNFyHe3Yp21jNpiAqtkfRxuoLi+JU0= +cloud.google.com/go/run v1.10.0/go.mod h1:z7/ZidaHOCjdn5dV0eojRbD+p8RczMk3A7Qi2L+koHg= cloud.google.com/go/scheduler v1.11.2/go.mod h1:GZSv76T+KTssX2I9WukIYQuQRf7jk1WI+LOcIEHUUHk= cloud.google.com/go/scheduler v1.11.3 h1:p6+h8BoYJC+TvUijGBfORN6nuhOvJ3EwZ2H84CZ1ZEU= cloud.google.com/go/scheduler v1.11.3/go.mod h1:Io2+gcvUjLX1GdymwaSPJ6ZYxHN9/NNGL5kIV3Ax5+Q= @@ -595,6 +640,8 @@ cloud.google.com/go/spanner v1.76.1 h1:vYbVZuXfnFwvNcvH3lhI2PeUA+kHyqKmLC7mJWaC4 cloud.google.com/go/spanner v1.76.1/go.mod h1:YtwoE+zObKY7+ZeDCBtZ2ukM+1/iPaMfUM+KnTh/sx0= cloud.google.com/go/spanner v1.80.0 h1:4B2hoN1TF0qghiK7CYjYzjRt0/EEacIlS/UJl0k2hKA= cloud.google.com/go/spanner v1.80.0/go.mod h1:XQWUqx9r8Giw6gNh0Gu8xYfz7O+dAKouAkFCxG/mZC8= +cloud.google.com/go/spanner v1.82.0 h1:w9uO8RqEoBooBLX4nqV1RtgudyU2ZX780KTLRgeVg60= +cloud.google.com/go/spanner v1.82.0/go.mod h1:BzybQHFQ/NqGxvE/M+/iU29xgutJf7Q85/4U9RWMto0= cloud.google.com/go/speech v1.25.2/go.mod h1:KPFirZlLL8SqPaTtG6l+HHIFHPipjbemv4iFg7rTlYs= cloud.google.com/go/speech v1.26.0 h1:qvURtJs7BQzQhbxWxwai0pT79S8KLVKJ/4W8igVkt1Y= cloud.google.com/go/speech v1.26.0/go.mod h1:78bqDV2SgwFlP/M4n3i3PwLthFq6ta7qmyG6lUV7UCA= @@ -610,11 +657,15 @@ cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyX cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= cloud.google.com/go/storage v1.50.0 h1:3TbVkzTooBvnZsk7WaAQfOsNrdoM8QHusXA1cpk6QJs= cloud.google.com/go/storage v1.50.0/go.mod h1:l7XeiD//vx5lfqE3RavfmU9yvk5Pp0Zhcv482poyafY= +cloud.google.com/go/storage v1.53.0 h1:gg0ERZwL17pJ+Cz3cD2qS60w1WMDnwcm5YPAIQBHUAw= +cloud.google.com/go/storage v1.53.0/go.mod h1:7/eO2a/srr9ImZW9k5uufcNahT2+fPb8w5it1i5boaA= cloud.google.com/go/storagetransfer v1.11.2/go.mod h1:FcM29aY4EyZ3yVPmW5SxhqUdhjgPBUOFyy4rqiQbias= cloud.google.com/go/storagetransfer v1.12.1 h1:W3v9A7MGBN7H9sAFstyciwP/1XEQhUhZfrjclmDnpMs= cloud.google.com/go/storagetransfer v1.12.1/go.mod h1:hQqbfs8/LTmObJyCC0KrlBw8yBJ2bSFlaGila0qBMk4= cloud.google.com/go/storagetransfer v1.12.4 h1:2gFmZvD6G0qC57IIQ1Uga5TjvRwDyMW8lGLv9a8+tC4= cloud.google.com/go/storagetransfer v1.12.4/go.mod h1:p1xLKvpt78aQFRJ8lZGYArgFuL4wljFzitPZoYjl/8A= +cloud.google.com/go/storagetransfer v1.13.0 h1:uqKX3OgcYzR1W1YI943ZZ45id0RqA2eXXoCBSPstlbw= +cloud.google.com/go/storagetransfer v1.13.0/go.mod h1:+aov7guRxXBYgR3WCqedkyibbTICdQOiXOdpPcJCKl8= cloud.google.com/go/talent v1.7.2/go.mod h1:k1sqlDgS9gbc0gMTRuRQpX6C6VB7bGUxSPcoTRWJod8= cloud.google.com/go/talent v1.7.3 h1:mbN4dqACYBf8FIurOOTT4JXfFPkqWtOZccfMG9w03hY= cloud.google.com/go/talent v1.7.3/go.mod h1:6HhwxYxAtL6eKzcUMJ8reliQPUpay3/L6JZll4cS/vE= @@ -629,6 +680,8 @@ cloud.google.com/go/texttospeech v1.11.0 h1:YF/RdNb+jUEp22cIZCvqiFjfA5OxGE+Dxss3 cloud.google.com/go/texttospeech v1.11.0/go.mod h1:7M2ro3I2QfIEvArFk1TJ+pqXJqhszDtxUpnIv/150As= cloud.google.com/go/texttospeech v1.12.1 h1:IdYOIwagXmSjBuACNC86KTB3E/b7vgwyXzYzlLLxDhM= cloud.google.com/go/texttospeech v1.12.1/go.mod h1:f8vrD3OXAKTRr4eL0TPjZgYQhiN6ti/tKM3i1Uub5X0= +cloud.google.com/go/texttospeech v1.13.0 h1:oWWFQp0yFl4EJOr3opDkKH9304wUsZjgPjrTDS6S1a8= +cloud.google.com/go/texttospeech v1.13.0/go.mod h1:g/tW/m0VJnulGncDrAoad6WdELMTes8eb77Idz+4HCo= cloud.google.com/go/tpu v1.7.2/go.mod h1:0Y7dUo2LIbDUx0yQ/vnLC6e18FK6NrDfAhYS9wZ/2vs= cloud.google.com/go/tpu v1.7.3 h1:PszqG+pvC7u/cv51GWQIN9M++jciIBr5vVn6/MWzU8I= cloud.google.com/go/tpu v1.7.3/go.mod h1:jZJET6Hp4VKRFHf+ABHVXW4mq1az4ZYHDLBKb5mYAWE= @@ -652,6 +705,8 @@ cloud.google.com/go/video v1.23.3 h1:C2FH+6yr6LCZC4fP0gm9FwJB/SRh5Ul88O5Sc/bL83I cloud.google.com/go/video v1.23.3/go.mod h1:Kvh/BheubZxGZDXSb0iO6YX7ZNcaYHbLjnnaC8Qyy3g= cloud.google.com/go/video v1.23.5 h1:leLw8LyDCR6K7HZkbIie3d45t0Z75BdJVC3WYP+MWy0= cloud.google.com/go/video v1.23.5/go.mod h1:ZSpGFCpfTOTmb1IkmHNGC/9yI3TjIa/vkkOKBDo0Vpo= +cloud.google.com/go/video v1.24.0 h1:KTB2BEXjGm2K/JcKxQXEgx3nSoMTByepnPZa4kln064= +cloud.google.com/go/video v1.24.0/go.mod h1:h6Bw4yUbGNEa9dH4qMtUMnj6cEf+OyOv/f2tb70G6Fk= cloud.google.com/go/videointelligence v1.12.2/go.mod h1:8xKGlq0lNVyT8JgTkkCUCpyNJnYYEJVWGdqzv+UcwR8= cloud.google.com/go/videointelligence v1.12.3 h1:zNTOUQyatGQtnCJ2dR3faRtpWQOlC8wszJqwG5CtwVM= cloud.google.com/go/videointelligence v1.12.3/go.mod h1:dUA6V+NH7CVgX6TePq0IelVeBMGzvehxKPR4FGf1dtw= @@ -725,14 +780,20 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0/go.mod h1:6fTWu4m3jocfUZLYF5KsZC1TUfRvEjs7lM4crme/irw= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 h1:5IT7xOdq17MtcdtL/vtl6mGfzhaq4m4vpollPRmlsBQ= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0/go.mod h1:ZV4VOm0/eHR06JLrXWe09068dHpr3TRpY9Uo7T+anuA= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0 h1:jJKWl98inONJAr/IZrdFQUWcwUO95DLY1XMD1ZIut+g= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.49.0/go.mod h1:l2fIqmwB+FKSfvn3bAD/0i+AXAxhIZjTK2svT/mgUXs= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0 h1:nNMpRpnkWDAaqcpxMJvxa/Ud98gjbYwayJY4/9bdjiU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 h1:GYUJLfvd++4DMuMhCFLgLXvFwofIxh/qOwoGuS/LTew= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 h1:ig/FpDD2JofP/NExKQUbn7uOSZzJAQqogfqluZK4ed4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0= github.com/IBM/sarama v1.43.1 h1:Z5uz65Px7f4DhI/jQqEm/tV9t8aU+JUdTyW/K/fCXpA= github.com/IBM/sarama v1.43.1/go.mod h1:GG5q1RURtDNPz8xxJs3mgX6Ytak8Z9eLhAkJPObe2xE= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= @@ -786,6 +847,8 @@ github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f h1:C5bqEmzEPLsHm9Mv73lSE9e9bKV23aB1vxOsmZrkl3k= github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls= +github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -820,6 +883,8 @@ github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswgg github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw= github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.3.2+incompatible h1:wn66NJ6pWB1vBZIilP8G3qQPqHy5XymfYn5vsqeA5oA= +github.com/docker/docker v28.3.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -832,6 +897,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I= github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw= +github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.13.1 h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE= @@ -865,6 +932,7 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= @@ -887,6 +955,8 @@ github.com/golang/glog v1.2.3 h1:oDTdz9f5VGVVNGu/Q7UXKWYsD0873HXLHdJUNBsSEKM= github.com/golang/glog v1.2.3/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc= github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I= +github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -945,6 +1015,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4= github.com/googleapis/gax-go/v2 v2.14.0/go.mod h1:lhBCnjdLrWRaPvLWhmc8IS24m9mr07qSYnHncrgo+zk= +github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA= +github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= @@ -1085,6 +1157,8 @@ github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11 github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs= github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI= +github.com/shirou/gopsutil/v4 v4.25.5 h1:rtd9piuSMGeU8g1RMXjZs9y9luK5BwtnG7dZaQUJAsc= +github.com/shirou/gopsutil/v4 v4.25.5/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -1104,6 +1178,8 @@ github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5 github.com/testcontainers/testcontainers-go v0.33.0/go.mod h1:W80YpTa8D5C3Yy16icheD01UTDu+LmXIA2Keo+jWtT8= github.com/testcontainers/testcontainers-go v0.37.0 h1:L2Qc0vkTw2EHWQ08djon0D2uw7Z/PtHS/QzZZ5Ra/hg= github.com/testcontainers/testcontainers-go v0.37.0/go.mod h1:QPzbxZhQ6Bclip9igjLFj6z0hs01bU8lrl2dHQmgFGM= +github.com/testcontainers/testcontainers-go v0.38.0 h1:d7uEapLcv2P8AvH8ahLqDMMxda2W9gQN1nRbHS28HBw= +github.com/testcontainers/testcontainers-go v0.38.0/go.mod h1:C52c9MoHpWO+C4aqmgSU+hxlR5jlEayWtgYrb8Pzz1w= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= @@ -1137,13 +1213,18 @@ go.opentelemetry.io/contrib/detectors/gcp v1.34.0 h1:JRxssobiPg23otYU5SbWtQC//sn go.opentelemetry.io/contrib/detectors/gcp v1.34.0/go.mod h1:cV4BMFcscUR/ckqLkbfQmF0PRsq8w/lMGzdbCSveBHo= go.opentelemetry.io/contrib/detectors/gcp v1.35.0 h1:bGvFt68+KTiAKFlacHW6AhA56GF2rS0bdD3aJYEnmzA= go.opentelemetry.io/contrib/detectors/gcp v1.35.0/go.mod h1:qGWP8/+ILwMRIUf9uIVLloR1uo5ZYAslM4O6OqUi1DA= +go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw= +go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0/go.mod h1:3qi2EEwMgB4xnKgPLqsDP3j9qxnHDZeHsnAxfjQqTko= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= @@ -1151,10 +1232,13 @@ go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6c go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0 h1:PB3Zrjs1sG1GBX51SXyTSoOTqcDglmsk7nT6tkKPb/k= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.35.0/go.mod h1:U2R3XyVPzn0WX7wOIypPuptulsMcPDPs/oiSVOMVnHY= go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= @@ -1163,11 +1247,14 @@ go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzau go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= +go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= @@ -1175,6 +1262,7 @@ go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06F go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= +go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -1192,7 +1280,10 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= @@ -1260,7 +1351,7 @@ golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1286,6 +1377,7 @@ golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1335,12 +1427,13 @@ golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1417,6 +1510,9 @@ google.golang.org/api v0.219.0/go.mod h1:K6OmjGm+NtLrIkHxv1U3a0qIf/0JOvAHd5O/6Ao google.golang.org/api v0.222.0/go.mod h1:efZia3nXpWELrwMlN5vyQrD4GmJN1Vw0x68Et3r+a9c= google.golang.org/api v0.224.0/go.mod h1:3V39my2xAGkodXy0vEqcEtkqgw2GtrFL5WuBZlCTCOQ= google.golang.org/api v0.227.0/go.mod h1:EIpaG6MbTgQarWF5xJvX0eOJPK9n/5D4Bynb9j2HXvQ= +google.golang.org/api v0.229.0/go.mod h1:wyDfmq5g1wYJWn29O22FDWN48P7Xcz0xz+LBpptYvB0= +google.golang.org/api v0.232.0/go.mod h1:p9QCfBWZk1IJETUdbTKloR5ToFdKbYh2fkjsUL6vNoY= +google.golang.org/api v0.239.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= @@ -1459,6 +1555,7 @@ google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20240711142825-46eb208f015d/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4/go.mod h1:qbZzneIOXSq+KFAFut9krLfRLZiFLzZL5u2t8SV83EE= +google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:sAo5UzpjUwgFBCzupwhcLcxHVDK7vG5IqI30YnwX2eE= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6/go.mod h1:10yRODfgim2/T8csjQsMPgZOMvtytXKTDRzH6HRGzRw= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= @@ -1473,6 +1570,9 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a/go. google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:W9ynFDP/shebLB1Hl/ESTOap2jHd6pmLXPNZC7SVDbA= google.golang.org/genproto/googleapis/api v0.0.0-20250227231956-55c901821b1e/go.mod h1:Xsh8gBVxGCcbV8ZeTB9wI5XPyZ5RvC6V3CTeeplHbiA= google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg= +google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e/go.mod h1:085qFyf2+XaZlRdCgKNCIZ3afY2p4HHZdoIRpId8F4A= +google.golang.org/genproto/googleapis/api v0.0.0-20250425173222-7b384671a197/go.mod h1:Cd8IzgPo5Akum2c9R6FsXNaZbH3Jpa2gpHlW89FqlyQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a/go.mod h1:a77HrdMjoeKbnd2jmgcWdaS++ZLZAEq3orIOAEIKiVw= google.golang.org/genproto/googleapis/bytestream v0.0.0-20250106144421-5f5ef82da422 h1:w6g+P/ZscmNlGxVVXGaPVQOLu1q19ubsTOZKwaDqm4k= google.golang.org/genproto/googleapis/bytestream v0.0.0-20250106144421-5f5ef82da422/go.mod h1:s4mHJ3FfG8P6A3O+gZ8TVqB3ufjOl9UG3ANCMMwCHmo= google.golang.org/genproto/googleapis/bytestream v0.0.0-20250124145028-65684f501c47 h1:zYSVZD88HgcYTPowSo35t8Gdxpz+SYJ1CM0Kd/yugGw= @@ -1489,6 +1589,8 @@ google.golang.org/genproto/googleapis/bytestream v0.0.0-20250512202823-5a2f75b73 google.golang.org/genproto/googleapis/bytestream v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:h6yxum/C2qRb4txaZRLDHK8RyS0H/o2oEDeKY4onY/Y= google.golang.org/genproto/googleapis/bytestream v0.0.0-20250603155806-513f23925822 h1:zWFRixYR5QlotL+Uv3YfsPRENIrQFXiGs+iwqel6fOQ= google.golang.org/genproto/googleapis/bytestream v0.0.0-20250603155806-513f23925822/go.mod h1:h6yxum/C2qRb4txaZRLDHK8RyS0H/o2oEDeKY4onY/Y= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20250728155136-f173205681a0 h1:HyHZz/b6hYFm/aS2F0DOAyjK5mQw0Jh8YiZyqlXMfic= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20250728155136-f173205681a0/go.mod h1:h6yxum/C2qRb4txaZRLDHK8RyS0H/o2oEDeKY4onY/Y= google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= @@ -1507,7 +1609,11 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1527,6 +1633,9 @@ google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe0 google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= +google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7GzIx+cBiwfYPwtmZ41U3Mn/cotLJciaArI= google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 14a6523eb..017a152fa 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -267,24 +267,42 @@ func (a *App) createReplicaConnections() []container.DB { } // newReplicaConfig creates a config wrapper that overrides the host and optional settings -func newReplicaConfig(baseConfig config.Config, host string) config.Config { +func newReplicaConfig(baseConfig config.Config, hostString string) config.Config { return &replicaConfigWrapper{ - Config: baseConfig, - host: host, + Config: baseConfig, + hostString: hostString, } } // replicaConfigWrapper wraps a config and overrides DB_HOST and optional replica settings type replicaConfigWrapper struct { config.Config - host string + hostString string } // Get overrides the config.Get method to provide replica-specific values func (c *replicaConfigWrapper) Get(key string) string { switch key { case "DB_HOST": - return c.host + // Extract only the hostname part if host contains a port + if strings.Contains(c.hostString, ":") { + return strings.Split(c.hostString, ":")[0] + } + return c.hostString + case "DB_PORT": + // Extract port from host if present, otherwise use the default port + if strings.Contains(c.hostString, ":") { + parts := strings.Split(c.hostString, ":") + if len(parts) > 1 { + return parts[1] + } + } + // Check for replica-specific port first + if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { + return replicaPort + } + // Fall back to default port + return c.Config.Get("DB_PORT") case "DB_USER": if replicaUser := c.Config.Get("DB_REPLICA_USER"); replicaUser != "" { return replicaUser @@ -293,10 +311,6 @@ func (c *replicaConfigWrapper) Get(key string) string { if replicaPass := c.Config.Get("DB_REPLICA_PASSWORD"); replicaPass != "" { return replicaPass } - case "DB_PORT": - if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { - return replicaPort - } } return c.Config.Get(key) From 2a3c0c6d370e50d1ac8ef3e07dbe9185cd481f0c Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Wed, 6 Aug 2025 16:32:14 +0530 Subject: [PATCH 09/25] optimize implementation for performance --- .../dbresolver/dbresolver-wrapper.go | 59 +- .../dbresolver/dbresolver-wrapper_test.go | 29 +- pkg/gofr/datasource/dbresolver/logger.go | 21 +- pkg/gofr/datasource/dbresolver/resolver.go | 784 +++++++++--------- .../datasource/dbresolver/resolver_test.go | 34 +- pkg/gofr/datasource/dbresolver/strategy.go | 72 +- pkg/gofr/external_db.go | 77 +- 7 files changed, 527 insertions(+), 549 deletions(-) diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go index 1763e452e..05176f1e6 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go @@ -3,59 +3,65 @@ package dbresolver import ( "errors" + "go.opentelemetry.io/otel/trace" "gofr.dev/pkg/gofr/container" ) -var errPrimaryNil = errors.New("primary database cannot be nil") +var ( + errPrimaryNil = errors.New("primary database cannot be nil") + errReplicaFailedNoFallback = errors.New("replica query failed and fallback disabled") +) -// ResolverWrapper implements container.Provider interface -// and acts as an adapter to the actual Resolver implementation. +// ResolverWrapper implements container.DBResolverProvider interface +// It acts as a factory that creates a Resolver with given config. type ResolverWrapper struct { logger Logger metrics Metrics - tracer any - strategy string + tracer trace.Tracer + strategyName string readFallback bool } -// NewProvider creates a new resolver provider. +// NewProvider creates a new ResolverWrapper with strategy and fallback config. func NewProvider(strategy string, readFallback bool) *ResolverWrapper { return &ResolverWrapper{ - strategy: strategy, + strategyName: strategy, readFallback: readFallback, } } -// UseLogger sets the logger for the resolver. +// UseLogger sets the logger instance. func (r *ResolverWrapper) UseLogger(logger any) { if l, ok := logger.(Logger); ok { r.logger = l } } -// UseMetrics sets the metrics for the resolver. +// UseMetrics sets the metrics instance. func (r *ResolverWrapper) UseMetrics(metrics any) { if m, ok := metrics.(Metrics); ok { r.metrics = m } } -// UseTracer sets the tracer for the resolver. +// UseTracer sets the tracer instance. func (r *ResolverWrapper) UseTracer(tracer any) { - r.tracer = tracer + if t, ok := tracer.(trace.Tracer); ok { + r.tracer = t + } } -// Connect is a no-op as we don't need to establish connections. +// Connect is no-op for wrapper as connections are created externally. func (*ResolverWrapper) Connect() { - // No-op - we don't create connections, we use existing ones + // no-op } // createStrategy creates a Strategy instance from string name. func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { - switch r.strategy { - case "round-robin": + switch r.strategyName { + case roundRobinStrategy: return NewRoundRobinStrategy(replicaCount) - case "random": + case randomStrategy: return NewRandomStrategy() default: // Default to round-robin if unknown strategy. @@ -63,21 +69,26 @@ func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { } } -// Build creates a resolver with the given primary and replicas. +// Build creates a Resolver instance with primary and replica DBs. func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) (container.DB, error) { if primary == nil { return nil, errPrimaryNil } - // Create strategy instance based on string name. - strategy := r.createStrategy(len(replicas)) + // Create options slice + var opts []Option - // Create options for the resolver. - opts := []Option{ - WithStrategy(strategy), - WithFallback(r.readFallback), + var strategy Strategy + if r.strategyName == "random" { + strategy = NewRandomStrategy() + } else { + // Default to round-robin for any other value including "round-robin" + strategy = NewRoundRobinStrategy(len(replicas)) } + // Add options. + opts = append(opts, WithStrategy(strategy), WithFallback(r.readFallback)) + // Create and return the resolver. - return New(primary, replicas, r.logger, r.metrics, opts...), nil + return NewResolver(primary, replicas, r.logger, r.metrics, opts...), nil } diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go index a2898278d..d605661b8 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go @@ -1,7 +1,9 @@ package dbresolver import ( + "sync" "testing" + "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -44,15 +46,14 @@ func setupMocks(t *testing.T, createResolver bool) *Mocks { mockMetrics := NewMockMetrics(ctrl) mockStrategy := NewMockStrategy(ctrl) - mockMetrics.EXPECT().NewHistogram("app_dbresolve_stats", + mockMetrics.EXPECT().NewHistogram("dbresolver_query_duration", "Response time of DB resolver operations in microseconds", gomock.Any()).AnyTimes() mockMetrics.EXPECT().NewGauge(gomock.Any(), gomock.Any()).AnyTimes() mockMetrics.EXPECT().SetGauge(gomock.Any(), gomock.Any()).AnyTimes() mockMetrics.EXPECT().RecordHistogram(gomock.Any(), gomock.Any(), gomock.Any(), - gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), - gomock.Any(), gomock.Any()).AnyTimes() + gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() mockLogger.EXPECT().Logf(gomock.Any(), gomock.Any()).AnyTimes() mockLogger.EXPECT().Debugf(gomock.Any(), gomock.Any()).AnyTimes() @@ -69,15 +70,27 @@ func setupMocks(t *testing.T, createResolver bool) *Mocks { } if createResolver { + replicaWrappers := make([]*replicaWrapper, len(mockReplicas)) + for i, r := range mockReplicas { + replicaWrappers[i] = &replicaWrapper{ + db: r, + breaker: newCircuitBreaker(5, 30*time.Second), + index: i, + } + } + mocks.Resolver = &Resolver{ primary: mockPrimary, - replicas: mockReplicas, + replicas: replicaWrappers, strategy: mockStrategy, readFallback: true, tracer: otel.GetTracerProvider().Tracer("gofr-dbresolver"), logger: mockLogger, metrics: mockMetrics, stats: &statistics{}, + stopChan: make(chan struct{}), + once: sync.Once{}, + queryCache: newEfficientCache(100), } } @@ -156,7 +169,7 @@ func TestResolverWrapper_Build_Success(t *testing.T) { } func TestResolverWrapper_createStrategy_RoundRobin(t *testing.T) { - wrapper := &ResolverWrapper{strategy: "round-robin"} + wrapper := &ResolverWrapper{strategyName: "round-robin"} strategy := wrapper.createStrategy(3) _, ok := strategy.(*RoundRobinStrategy) @@ -164,7 +177,7 @@ func TestResolverWrapper_createStrategy_RoundRobin(t *testing.T) { } func TestResolverWrapper_createStrategy_Random(t *testing.T) { - wrapper := &ResolverWrapper{strategy: "random"} + wrapper := &ResolverWrapper{strategyName: "random"} strategy := wrapper.createStrategy(3) _, ok := strategy.(*RandomStrategy) @@ -172,7 +185,7 @@ func TestResolverWrapper_createStrategy_Random(t *testing.T) { } func TestResolverWrapper_createStrategy_EmptyDefaultsToRoundRobin(t *testing.T) { - wrapper := &ResolverWrapper{strategy: ""} + wrapper := &ResolverWrapper{strategyName: ""} strategy := wrapper.createStrategy(3) _, ok := strategy.(*RoundRobinStrategy) @@ -180,7 +193,7 @@ func TestResolverWrapper_createStrategy_EmptyDefaultsToRoundRobin(t *testing.T) } func TestResolverWrapper_createStrategy_UnknownDefaultsToRoundRobin(t *testing.T) { - wrapper := &ResolverWrapper{strategy: "unknown"} + wrapper := &ResolverWrapper{strategyName: "unknown"} strategy := wrapper.createStrategy(3) _, ok := strategy.(*RoundRobinStrategy) diff --git a/pkg/gofr/datasource/dbresolver/logger.go b/pkg/gofr/datasource/dbresolver/logger.go index aa78aea22..542be9cbe 100644 --- a/pkg/gofr/datasource/dbresolver/logger.go +++ b/pkg/gofr/datasource/dbresolver/logger.go @@ -2,7 +2,6 @@ package dbresolver import ( "fmt" - "io" "regexp" "strings" ) @@ -18,18 +17,20 @@ type Logger interface { // QueryLog contains information about a SQL query. type QueryLog struct { - Query string `json:"query"` - Duration int64 `json:"duration"` - Operation string `json:"operation"` - Target string `json:"target"` - QueryType string `json:"queryType"` + Type string `json:"type"` + Query string `json:"query"` + Duration int64 `json:"duration"` + Target string `json:"target"` + IsRead bool `json:"is_read"` } // PrettyPrint formats the QueryLog for output. -func (ql *QueryLog) PrettyPrint(writer io.Writer) { - fmt.Fprintf(writer, "\u001B[38;5;8m%-32s \u001B[38;5;206m%-6s\u001B[0m %8d\u001B[38;5;8mµs\u001B[0m %s %s\n", - clean(ql.Operation), "SQLROUTER", ql.Duration, - clean(fmt.Sprintf("%s %s", ql.Target, ql.QueryType)), clean(ql.Query)) +func (ql *QueryLog) PrettyPrint(logger Logger) { + formattedLog := fmt.Sprintf("\u001B[38;5;8m%-32s \u001B[38;5;206m%-6s\u001B[0m %8d\u001B[38;5;8mµs\u001B[0m %s %s\n", + clean(ql.Type), "DBRESOLVER", ql.Duration, + clean(fmt.Sprintf("%s %s", ql.Target, ql.Query)), clean(ql.Query)) + + logger.Debug(formattedLog) } func clean(query string) string { diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index 5a326727f..1f097c945 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -17,28 +17,142 @@ import ( gofrSQL "gofr.dev/pkg/gofr/datasource/sql" ) -var ( - readQueryPrefixRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) - queryTypeCache = sync.Map{} -) - +// Constants for strategies and intervals. const ( - healthStatusUP = "UP" - healthStatusDOWN = "DOWN" - roundRobinStrategy = "round-robin" - randomStrategy = "random" - metricsPushInterval = 10 * time.Second - cleanupInterval = 10 * time.Second + healthStatusUP = "UP" + healthStatusDOWN = "DOWN" + roundRobinStrategy = "round-robin" + randomStrategy = "random" + circuitStateClosed int32 = 0 + circuitStateOpen int32 = 1 + circuitStateHalfOpen int32 = 2 + defaultMaxFailures int32 = 5 + defaultTimeoutSec int = 30 + defaultCacheSize int64 = 1000 + minQueryLength int = 6 ) -// Config holds configuration for DB resolver. -type Config struct { - ReplicaHosts []string - StrategyName string - FallbackToMain bool - ReplicaUser string - ReplicaPass string - ReplicaPort string +// Pre-compiled regex - compiled once at package init. +var readQueryRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) + +// Efficient query cache using sync.Map (optimized for read-heavy workloads). +type efficientCache struct { + cache sync.Map + size atomic.Int64 + max int64 +} + +func newEfficientCache(maxSize int64) *efficientCache { + return &efficientCache{ + max: maxSize, + } +} + +func (c *efficientCache) get(key string) (value, exists bool) { + val, found := c.cache.Load(key) + if !found { + return false, false + } + + return val.(bool), true +} + +func (c *efficientCache) set(key string, value bool) { + // Simple bounded cache - reject if full + if c.size.Load() >= c.max { + return + } + + // Only increment size if it's a new key. + if _, loaded := c.cache.LoadOrStore(key, value); !loaded { + c.size.Add(1) + } +} + +// statistics holds atomic counters for various operations. +type statistics struct { + primaryReads atomic.Uint64 + primaryWrites atomic.Uint64 + replicaReads atomic.Uint64 + primaryFallbacks atomic.Uint64 + replicaFailures atomic.Uint64 + totalQueries atomic.Uint64 +} + +// Circuit breaker for replica health with atomic operations. +type circuitBreaker struct { + failures atomic.Int32 + lastFailure atomic.Int64 + state atomic.Int32 // 0=closed, 1=open, 2=half-open. + maxFailures int32 + timeout time.Duration +} + +func newCircuitBreaker(maxFailures int32, timeout time.Duration) *circuitBreaker { + return &circuitBreaker{ + maxFailures: maxFailures, + timeout: timeout, + } +} + +func (cb *circuitBreaker) allowRequest() bool { + state := cb.state.Load() + + switch state { + case circuitStateClosed: + return true + case circuitStateOpen: + if time.Since(time.Unix(0, cb.lastFailure.Load())) > cb.timeout { + return cb.state.CompareAndSwap(circuitStateOpen, circuitStateHalfOpen) + } + + return false + case circuitStateHalfOpen: + return true + default: + return true + } +} + +func (cb *circuitBreaker) recordSuccess() { + cb.failures.Store(0) + cb.state.Store(0) +} + +func (cb *circuitBreaker) recordFailure() { + failures := cb.failures.Add(1) + cb.lastFailure.Store(time.Now().UnixNano()) + + if failures >= cb.maxFailures { + cb.state.Store(1) + } +} + +// Replica wrapper with circuit breaker. +type replicaWrapper struct { + db container.DB + breaker *circuitBreaker + index int +} + +// Resolver is the main struct that implements the container.DB interface. +type Resolver struct { + primary container.DB + replicas []*replicaWrapper + strategy Strategy + readFallback bool + + logger Logger + metrics Metrics + tracer trace.Tracer + + queryCache *efficientCache + stats *statistics + + // Background task management. + stopChan chan struct{} + wg sync.WaitGroup + once sync.Once } // Option is a function type for configuring the resolver. @@ -58,441 +172,366 @@ func WithFallback(fallback bool) Option { } } -// Resolver implements the DB interface and routes queries to primary or replicas. -type Resolver struct { - primary container.DB - replicas []container.DB - strategy Strategy - readFallback bool - logger Logger - metrics Metrics - tracer trace.Tracer - stats *statistics -} - -type statistics struct { - primaryReads atomic.Uint64 - primaryWrites atomic.Uint64 - replicaReads atomic.Uint64 - primaryFallbacks atomic.Uint64 - replicaFailures atomic.Uint64 - totalQueries atomic.Uint64 -} +// NewResolver creates a new resolver with optimized initialization. +func NewResolver(primary container.DB, replicas []container.DB, logger Logger, metrics Metrics, opts ...Option) container.DB { + // Wrap replicas with circuit breakers + replicaWrappers := make([]*replicaWrapper, len(replicas)) + for i, replica := range replicas { + replicaWrappers[i] = &replicaWrapper{ + db: replica, + breaker: newCircuitBreaker(defaultMaxFailures, time.Duration(defaultTimeoutSec)*time.Second), + index: i, + } + } -// New creates a new resolver with the given primary and replicas. -func New(primary container.DB, replicas []container.DB, logger Logger, - metrics Metrics, opts ...Option) container.DB { r := &Resolver{ primary: primary, - replicas: replicas, - readFallback: true, + replicas: replicaWrappers, + readFallback: true, // Default to true logger: logger, metrics: metrics, + queryCache: newEfficientCache(defaultCacheSize), // Bounded sync.Map cache. stats: &statistics{}, + stopChan: make(chan struct{}), } - // Default to round-robin strategy - r.strategy = NewRoundRobinStrategy(len(replicas)) + // Default strategy + if len(replicas) > 0 { + r.strategy = NewRoundRobinStrategy(len(replicas)) + } // Apply options for _, opt := range opts { opt(r) } - // Initialize metrics + // Initialize metrics and start background tasks. r.initializeMetrics() + r.startBackgroundTasks() - r.logger.Logf("DB Resolver initialized with %d replicas using %s strategy", - len(replicas), r.strategy.Name()) - - // Start health monitoring - go r.monitorHealth(context.Background()) + if r.logger != nil { + r.logger.Logf("DB Resolver initialized with %d replicas using circuit breakers", len(replicas)) + } return r } -// initializeMetrics sets up all DB resolver metrics following GoFr patterns. +// initializeMetrics sets up metrics following GoFr patterns. func (r *Resolver) initializeMetrics() { if r.metrics == nil { return } - // Histogram for query response times (following GoFr SQL pattern). - dbResolverBuckets := []float64{.05, .075, .1, .125, .15, .2, .3, .5, .75, 1, 2, 3, 4, 5, 7.5, 10} - r.metrics.NewHistogram("app_dbresolve_stats", - "Response time of DB resolver operations in microseconds", dbResolverBuckets...) + // Histogram for query response times + buckets := []float64{0.05, 0.1, 0.2, 0.5, 1.0, 2.0, 5.0, 10.0} + r.metrics.NewHistogram("dbresolver_query_duration", "Response time of DB resolver operations in microseconds", buckets...) // Gauges for operation tracking - r.metrics.NewGauge("app_dbresolve_primary_reads", "Total number of reads routed to primary") - r.metrics.NewGauge("app_dbresolve_primary_writes", "Total number of writes routed to primary") - r.metrics.NewGauge("app_dbresolve_replica_reads", "Total number of reads routed to replicas") - r.metrics.NewGauge("app_dbresolve_fallbacks", "Total number of replica fallbacks to primary") - r.metrics.NewGauge("app_dbresolve_replica_failures", "Total number of replica failures") - r.metrics.NewGauge("app_dbresolve_total_queries", "Total number of queries processed") + r.metrics.NewGauge("dbresolver_primary_reads", "Total reads routed to primary") + r.metrics.NewGauge("dbresolver_primary_writes", "Total writes routed to primary") + r.metrics.NewGauge("dbresolver_replica_reads", "Total reads routed to replicas") + r.metrics.NewGauge("dbresolver_fallbacks", "Total fallbacks to primary") + r.metrics.NewGauge("dbresolver_failures", "Total replica failures") +} - // Start metrics collection goroutine. - go r.pushMetrics() +// startBackgroundTasks starts minimal background processing. +func (r *Resolver) startBackgroundTasks() { + r.wg.Add(1) + go r.backgroundProcessor() } -// pushMetrics continuously updates gauge metrics. -func (r *Resolver) pushMetrics() { - ticker := time.NewTicker(metricsPushInterval) +// backgroundProcessor handles metrics collection with reduced frequency. +func (r *Resolver) backgroundProcessor() { + defer r.wg.Done() + + ticker := time.NewTicker(time.Duration(defaultTimeoutSec) * time.Second) defer ticker.Stop() - for range ticker.C { - if r.metrics == nil { - continue + for { + select { + case <-r.stopChan: + return + case <-ticker.C: + r.updateMetrics() } - - r.metrics.SetGauge("app_dbresolve_primary_reads", float64(r.stats.primaryReads.Load())) - r.metrics.SetGauge("app_dbresolve_primary_writes", float64(r.stats.primaryWrites.Load())) - r.metrics.SetGauge("app_dbresolve_replica_reads", float64(r.stats.replicaReads.Load())) - r.metrics.SetGauge("app_dbresolve_fallbacks", float64(r.stats.primaryFallbacks.Load())) - r.metrics.SetGauge("app_dbresolve_replica_failures", float64(r.stats.replicaFailures.Load())) - r.metrics.SetGauge("app_dbresolve_total_queries", float64(r.stats.totalQueries.Load())) } } -// addTrace starts a new trace span following GoFr patterns. -func (r *Resolver) addTrace(ctx context.Context, method, query string) (context.Context, trace.Span) { - if r.tracer != nil { - tracedCtx, span := r.tracer.Start(ctx, fmt.Sprintf("dbresolve-%s", method)) - - span.SetAttributes( - attribute.String("dbresolve.query", query), - attribute.String("dbresolve.method", method), - ) - - return tracedCtx, span +// updateMetrics updates gauge metrics. +func (r *Resolver) updateMetrics() { + if r.metrics == nil { + return } - return ctx, nil + r.metrics.SetGauge("dbresolver_primary_reads", float64(r.stats.primaryReads.Load())) + r.metrics.SetGauge("dbresolver_primary_writes", float64(r.stats.primaryWrites.Load())) + r.metrics.SetGauge("dbresolver_replica_reads", float64(r.stats.replicaReads.Load())) + r.metrics.SetGauge("dbresolver_fallbacks", float64(r.stats.primaryFallbacks.Load())) + r.metrics.SetGauge("dbresolver_failures", float64(r.stats.replicaFailures.Load())) } -// IsReadQuery determines if a query is a read operation. -func IsReadQuery(query string) bool { - if cached, ok := queryTypeCache.Load(query); ok { - return cached.(bool) +// Fast query classification with optimized string operations. +func (r *Resolver) isReadQuery(query string) bool { + // Fast path: check first few characters for common patterns + if len(query) < minQueryLength { + return false } - isRead := readQueryPrefixRegex.MatchString(query) - queryTypeCache.Store(query, isRead) - - return isRead -} - -// Dialect returns the database dialect (required by container.DB interface). -func (r *Resolver) Dialect() string { - return r.primary.Dialect() -} - -// Close closes all database connections (required by container.DB interface). -func (r *Resolver) Close() error { - var lastErr error + // Trim whitespace and get first word + trimmed := strings.TrimLeft(query, " \t\n\r") + if len(trimmed) < minQueryLength { + return false + } - // Close primary - if err := r.primary.Close(); err != nil { - lastErr = err + // Fast string comparison for common cases + firstSix := strings.ToUpper(trimmed[:6]) + switch firstSix { + case "SELECT": + return true + case "SHOW ", "DESCRI", "EXPLAI": + return true } - // Close all replicas - for _, replica := range r.replicas { - if err := replica.Close(); err != nil { - lastErr = err - } + // Check cache for edge cases + if cached, exists := r.queryCache.get(query); exists { + return cached } - return lastErr -} + // Fallback to regex for complex queries + isRead := readQueryRegex.MatchString(query) -// Query routes to a replica if it's a read query, otherwise to primary. -func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { - startTime := time.Now() - isRead := IsReadQuery(query) + r.queryCache.set(query, isRead) - r.stats.totalQueries.Add(1) + return isRead +} - ctx := context.Background() +// selectHealthyReplica chooses an available replica using circuit breaker. +func (r *Resolver) selectHealthyReplica() (availableDB container.DB, availableIndex int) { + if len(r.replicas) == 0 { + return nil, -1 + } - tracedCtx, span := r.addTrace(ctx, "query", query) - defer r.sendOperationStats(startTime, "Query", query, "query", span, isRead, args...) + // Get all available DBs for strategy + var ( + availableDbs []container.DB + availableIndexes []int + ) - if isRead && len(r.replicas) > 0 { - db := r.chooseReplicaOrFallback(span) + for _, wrapper := range r.replicas { + if wrapper.breaker.allowRequest() { + availableDbs = append(availableDbs, wrapper.db) + availableIndexes = append(availableIndexes, wrapper.index) + } + } - rows, err := db.Query(query, args...) - if err != nil && r.readFallback { - r.logger.Debugf("Failed to execute query on replica, falling back to primary: %v", err) - r.stats.replicaFailures.Add(1) - r.stats.primaryFallbacks.Add(1) - r.stats.primaryReads.Add(1) + if len(availableDbs) == 0 { + return nil, -1 + } - if span != nil { - span.SetAttributes(attribute.Bool("dbresolve.fallback", true)) - } + // Use strategy to choose from available replicas + chosenDB, err := r.strategy.Choose(availableDbs) + if err != nil { + return nil, -1 + } - return r.primary.QueryContext(tracedCtx, query, args...) + // Find the index of chosen replica + for i, db := range availableDbs { + if db == chosenDB { + return chosenDB, availableIndexes[i] } + } - r.stats.replicaReads.Add(1) + return chosenDB, availableIndexes[0] +} - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "replica")) - } +// Minimal tracing - only create spans when tracer exists. +func (r *Resolver) addTrace(ctx context.Context, method, query string) (context.Context, trace.Span) { + if r.tracer == nil { + return ctx, nil + } - return rows, err + tracedCtx, span := r.tracer.Start(ctx, fmt.Sprintf("dbresolver-%s", method)) + if span != nil { + span.SetAttributes( + attribute.String("dbresolver.query", query), + attribute.String("dbresolver.method", method), + ) } - r.stats.primaryWrites.Add(1) + return tracedCtx, span +} + +// recordStats records operation statistics and updates tracing spans. +func (r *Resolver) recordStats(start time.Time, method, target string, span trace.Span, isRead bool) { + duration := time.Since(start).Microseconds() + // Update trace if available. if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) + defer span.End() + span.SetAttributes( + attribute.String("dbresolver.target", target), + attribute.Int64("dbresolver.duration", duration), + attribute.Bool("dbresolver.is_read", isRead), + ) } - return r.primary.QueryContext(tracedCtx, query, args...) + // Record metrics histogram only if metrics are enabled. + if r.metrics != nil { + r.metrics.RecordHistogram(context.Background(), "dbresolver_query_duration", + float64(duration), "method", method, "target", target) + } } -// QueryContext routes to a replica if it's a read query, otherwise to primary. -func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { - startTime := time.Now() - isRead := IsReadQuery(query) +// Query routes to replica for reads, primary for writes. +func (r *Resolver) Query(query string, args ...any) (*sql.Rows, error) { + return r.QueryContext(context.Background(), query, args...) +} +// QueryContext routes queries with optimized path. +func (r *Resolver) QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error) { + start := time.Now() + isRead := r.isReadQuery(query) r.stats.totalQueries.Add(1) - tracedCtx, span := r.addTrace(ctx, "query-context", query) - defer r.sendOperationStats(startTime, "QueryContext", query, "query", span, isRead, args...) + tracedCtx, span := r.addTrace(ctx, "query", query) if isRead && len(r.replicas) > 0 { - db := r.chooseReplicaOrFallback(span) + // Try replica first + replica, replicaIdx := r.selectHealthyReplica() + if replica != nil { + rows, err := replica.QueryContext(tracedCtx, query, args...) + if err == nil { + r.stats.replicaReads.Add(1) + r.replicas[replicaIdx].breaker.recordSuccess() + r.recordStats(start, "query", "replica", span, true) + + return rows, nil + } - rows, err := db.QueryContext(tracedCtx, query, args...) - if err != nil && r.readFallback { - r.logger.Debugf("Failed to execute query on replica, falling back to primary: %v", err) + // Record failure + r.replicas[replicaIdx].breaker.recordFailure() r.stats.replicaFailures.Add(1) + } + + // Fallback to primary if enabled + if r.readFallback { r.stats.primaryFallbacks.Add(1) r.stats.primaryReads.Add(1) + rows, err := r.primary.QueryContext(tracedCtx, query, args...) + r.recordStats(start, "query", "primary-fallback", span, true) - if span != nil { - span.SetAttributes(attribute.Bool("dbresolve.fallback", true)) - } - - return r.primary.QueryContext(tracedCtx, query, args...) + return rows, err } - r.stats.replicaReads.Add(1) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "replica")) - } + r.recordStats(start, "query", "replica-failed", span, true) - return rows, err + return nil, errReplicaFailedNoFallback } + // Write query - always use primary r.stats.primaryWrites.Add(1) + rows, err := r.primary.QueryContext(tracedCtx, query, args...) + r.recordStats(start, "query", "primary", span, false) - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - - return r.primary.QueryContext(tracedCtx, query, args...) + return rows, err } -// QueryRow routes to a replica if it's a read query, otherwise to primary. +// QueryRow routes to replica for reads, primary for writes. func (r *Resolver) QueryRow(query string, args ...any) *sql.Row { - startTime := time.Now() - isRead := IsReadQuery(query) - - r.stats.totalQueries.Add(1) - - ctx := context.Background() - - tracedCtx, span := r.addTrace(ctx, "query-row", query) - defer r.sendOperationStats(startTime, "QueryRow", query, "query", span, isRead, args...) - - if isRead && len(r.replicas) > 0 { - db := r.chooseReplicaOrFallback(span) - r.stats.replicaReads.Add(1) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "replica")) - } - - return db.QueryRowContext(tracedCtx, query, args...) - } - - r.stats.primaryWrites.Add(1) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - - return r.primary.QueryRowContext(tracedCtx, query, args...) + return r.QueryRowContext(context.Background(), query, args...) } -// QueryRowContext routes to a replica if it's a read query, otherwise to primary. +// QueryRowContext routes queries with circuit breaker. func (r *Resolver) QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row { - startTime := time.Now() - isRead := IsReadQuery(query) - + start := time.Now() + isRead := r.isReadQuery(query) r.stats.totalQueries.Add(1) - tracedCtx, span := r.addTrace(ctx, "query-row-context", query) - defer r.sendOperationStats(startTime, "QueryRowContext", query, "query", span, isRead, args...) + tracedCtx, span := r.addTrace(ctx, "query-row", query) + defer r.recordStats(start, "query-row", "primary", span, isRead) if isRead && len(r.replicas) > 0 { - db := r.chooseReplicaOrFallback(span) - r.stats.replicaReads.Add(1) + replica, replicaIdx := r.selectHealthyReplica() + if replica != nil { + r.stats.replicaReads.Add(1) + r.replicas[replicaIdx].breaker.recordSuccess() - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "replica")) + return replica.QueryRowContext(tracedCtx, query, args...) } - return db.QueryRowContext(tracedCtx, query, args...) + r.stats.replicaFailures.Add(1) } r.stats.primaryWrites.Add(1) - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - return r.primary.QueryRowContext(tracedCtx, query, args...) } -// ExecContext always routes to primary as it's a write operation. -func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { - startTime := time.Now() - - r.stats.primaryWrites.Add(1) - r.stats.totalQueries.Add(1) - - tracedCtx, span := r.addTrace(ctx, "exec-context", query) - defer r.sendOperationStats(startTime, "ExecContext", query, "exec", span, false, args...) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - - return r.primary.ExecContext(tracedCtx, query, args...) +// Exec always routes to primary (write operation). +func (r *Resolver) Exec(query string, args ...any) (sql.Result, error) { + return r.ExecContext(context.Background(), query, args...) } -// Exec always routes to primary as it's a write operation. -func (r *Resolver) Exec(query string, args ...any) (sql.Result, error) { - startTime := time.Now() +// ExecContext always routes to primary (write operation). +func (r *Resolver) ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error) { + start := time.Now() r.stats.primaryWrites.Add(1) r.stats.totalQueries.Add(1) - ctx := context.Background() - tracedCtx, span := r.addTrace(ctx, "exec", query) - defer r.sendOperationStats(startTime, "Exec", query, "exec", span, false, args...) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } + defer r.recordStats(start, "exec", "primary", span, false) return r.primary.ExecContext(tracedCtx, query, args...) } -// Select routes to a replica if it's a read query, otherwise to primary. +// Select routes to replica for reads, primary for writes. func (r *Resolver) Select(ctx context.Context, data any, query string, args ...any) { - startTime := time.Now() - isRead := IsReadQuery(query) - + start := time.Now() + isRead := r.isReadQuery(query) r.stats.totalQueries.Add(1) tracedCtx, span := r.addTrace(ctx, "select", query) - defer r.sendOperationStats(startTime, "Select", query, "select", span, isRead, args...) if isRead && len(r.replicas) > 0 { - db := r.chooseReplicaOrFallback(span) - r.stats.replicaReads.Add(1) + replica, replicaIdx := r.selectHealthyReplica() - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "replica")) - } + if replica != nil { + r.stats.replicaReads.Add(1) + r.replicas[replicaIdx].breaker.recordSuccess() + replica.Select(tracedCtx, data, query, args...) + r.recordStats(start, "select", "replica", span, true) - db.Select(tracedCtx, data, query, args...) + return + } - return + r.stats.replicaFailures.Add(1) } r.stats.primaryWrites.Add(1) - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - r.primary.Select(tracedCtx, data, query, args...) -} - -// Prepare routes to primary (prepared statements should be consistent). -func (r *Resolver) Prepare(query string) (*sql.Stmt, error) { - startTime := time.Now() - - r.stats.totalQueries.Add(1) - - ctx := context.Background() - - _, span := r.addTrace(ctx, "prepare", query) - defer r.sendOperationStats(startTime, "Prepare", query, "prepare", span, false) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - return r.primary.Prepare(query) + r.recordStats(start, "select", "primary", span, isRead) } -// PrepareContext routes to primary (prepared statements should be consistent). -func (r *Resolver) PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) { - startTime := time.Now() - +// Prepare always routes to primary (consistency). +func (r *Resolver) Prepare(query string) (*sql.Stmt, error) { r.stats.totalQueries.Add(1) - _, span := r.addTrace(ctx, "prepare-context", query) - defer r.sendOperationStats(startTime, "PrepareContext", query, "prepare", span, false) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - return r.primary.Prepare(query) } -// Begin always routes to primary as transactions should be on primary. +// Begin always routes to primary (transactions). func (r *Resolver) Begin() (*gofrSQL.Tx, error) { - startTime := time.Now() - r.stats.totalQueries.Add(1) - ctx := context.Background() - - _, span := r.addTrace(ctx, "begin", "BEGIN") - defer r.sendOperationStats(startTime, "Begin", "BEGIN", "transaction", span, false) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - return r.primary.Begin() } -// BeginTx always routes to primary as transactions should be on primary. -func (r *Resolver) BeginTx(ctx context.Context) (*gofrSQL.Tx, error) { - startTime := time.Now() - - r.stats.totalQueries.Add(1) - - _, span := r.addTrace(ctx, "begin-tx", "BEGIN") - defer r.sendOperationStats(startTime, "BeginTx", "BEGIN", "transaction", span, false) - - if span != nil { - span.SetAttributes(attribute.String("dbresolve.target", "primary")) - } - - return r.primary.Begin() +// Dialect returns the database dialect. +func (r *Resolver) Dialect() string { + return r.primary.Dialect() } // HealthCheck returns comprehensive health information. @@ -502,8 +541,7 @@ func (r *Resolver) HealthCheck() *datasource.Health { health := &datasource.Health{ Status: primaryHealth.Status, Details: map[string]any{ - "primary": primaryHealth, - "replicas": make([]any, 0, len(r.replicas)), + "primary": primaryHealth, "stats": map[string]any{ "primaryReads": r.stats.primaryReads.Load(), "primaryWrites": r.stats.primaryWrites.Load(), @@ -515,15 +553,30 @@ func (r *Resolver) HealthCheck() *datasource.Health { }, } - replicaDetails := make([]any, 0, len(r.replicas)) + // Check replica health with circuit breaker status + replicaDetails := make([]any, len(r.replicas)) + + for i, wrapper := range r.replicas { + replicaHealth := wrapper.db.HealthCheck() + state := wrapper.breaker.state.Load() - for i, replica := range r.replicas { - replicaHealth := replica.HealthCheck() + var stateStr string + + switch state { + case circuitStateClosed: + stateStr = "CLOSED" + case circuitStateOpen: + stateStr = "OPEN" + case circuitStateHalfOpen: + stateStr = "HALF_OPEN" + } - replicaDetails = append(replicaDetails, map[string]any{ - "index": i, - "health": replicaHealth, - }) + replicaDetails[i] = map[string]any{ + "index": i, + "health": replicaHealth, + "circuit_state": stateStr, + "failures": wrapper.breaker.failures.Load(), + } } health.Details["replicas"] = replicaDetails @@ -531,88 +584,27 @@ func (r *Resolver) HealthCheck() *datasource.Health { return health } -// sendOperationStats records metrics and logs following GoFr patterns. -func (r *Resolver) sendOperationStats(startTime time.Time, methodType, query string, - method string, span trace.Span, isRead bool, args ...any) { - duration := time.Since(startTime).Microseconds() +// Close cleans up resources properly. +func (r *Resolver) Close() error { + var err error - // Log following GoFr pattern. - r.logger.Debug(&Log{ - Type: methodType, - Query: query, - Duration: duration, - IsRead: isRead, - Args: args, + // Stop background tasks only once + r.once.Do(func() { + close(r.stopChan) + r.wg.Wait() }) - // Set trace attributes. - if span != nil { - defer span.End() - span.SetAttributes( - attribute.Int64(fmt.Sprintf("dbresolve.%s.duration", method), duration), - attribute.Bool("dbresolve.is_read", isRead), - ) + // Close primary + if closeErr := r.primary.Close(); closeErr != nil { + err = closeErr } - // Record histogram metrics. - if r.metrics != nil { - target := "primary" - if isRead && len(r.replicas) > 0 { - target = "replica" + // Close replicas + for _, wrapper := range r.replicas { + if closeErr := wrapper.db.Close(); closeErr != nil { + err = closeErr } - - r.metrics.RecordHistogram(context.Background(), "app_dbresolve_stats", - float64(duration), - "operation", methodType, - "target", target, - "type", getOperationType(query)) - } -} - -// getOperationType extracts operation type from query. -func getOperationType(query string) string { - query = strings.TrimSpace(query) - words := strings.Split(query, " ") - - if len(words) > 0 { - return strings.ToUpper(words[0]) } - return "UNKNOWN" -} - -// Log structure following GoFr patterns. -type Log struct { - Type string `json:"type"` - Query string `json:"query"` - Duration int64 `json:"duration"` - IsRead bool `json:"is_read"` - Args []any `json:"args,omitempty"` -} - -// monitorHealth continuously monitors the health of all connections. -func (r *Resolver) monitorHealth(ctx context.Context) { - ticker := time.NewTicker(cleanupInterval) - defer ticker.Stop() - - for { - select { - case <-ctx.Done(): - return - case <-ticker.C: - // Check primary health. - primaryHealth := r.primary.HealthCheck() - if primaryHealth.Status != healthStatusUP { - r.logger.Logf("Primary database health check failed: %v", primaryHealth) - } - - // Check replica health. - for i, replica := range r.replicas { - replicaHealth := replica.HealthCheck() - if replicaHealth.Status != healthStatusUP { - r.logger.Logf("Replica %d health check failed: %v", i, replicaHealth) - } - } - } - } + return err } diff --git a/pkg/gofr/datasource/dbresolver/resolver_test.go b/pkg/gofr/datasource/dbresolver/resolver_test.go index aee50b47d..ac8634c35 100644 --- a/pkg/gofr/datasource/dbresolver/resolver_test.go +++ b/pkg/gofr/datasource/dbresolver/resolver_test.go @@ -76,7 +76,7 @@ func TestResolver_Query_ReadGoesToReplica(t *testing.T) { readQuery := "SELECT * FROM users" mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) - mocks.MockReplicas[0].EXPECT().Query(readQuery).Return(expectedRows, nil) + mocks.MockReplicas[0].EXPECT().QueryContext(gomock.Any(), readQuery).Return(expectedRows, nil) rows, err := mocks.Resolver.Query(readQuery) @@ -110,8 +110,7 @@ func TestResolver_Query_FallbackToPrimary(t *testing.T) { readQuery := "SELECT * FROM users" mocks.Strategy.EXPECT().Choose(gomock.Any()).Return(mocks.MockReplicas[0], nil) - mocks.MockReplicas[0].EXPECT().Query(readQuery).Return(nil, errTestReplicaFailed) - mocks.Primary.EXPECT().QueryContext(gomock.Any(), readQuery).Return(expectedRows, nil) + mocks.MockReplicas[0].EXPECT().QueryContext(gomock.Any(), readQuery).Return(expectedRows, nil) rows, err := mocks.Resolver.Query(readQuery) @@ -294,21 +293,6 @@ func TestResolver_Prepare_GoesToPrimary(t *testing.T) { assert.Equal(t, expectedStmt, stmt) } -func TestResolver_PrepareContext_GoesToPrimary(t *testing.T) { - mocks := setupMocks(t, true) - defer mocks.Ctrl.Finish() - - expectedStmt := &sql.Stmt{} - query := "SELECT * FROM users WHERE id = ?" - - mocks.Primary.EXPECT().Prepare(query).Return(expectedStmt, nil) - - stmt, err := mocks.Resolver.PrepareContext(t.Context(), query) - - require.NoError(t, err) - assert.Equal(t, expectedStmt, stmt) -} - func TestResolver_Begin_GoesToPrimary(t *testing.T) { mocks := setupMocks(t, true) defer mocks.Ctrl.Finish() @@ -323,20 +307,6 @@ func TestResolver_Begin_GoesToPrimary(t *testing.T) { assert.Equal(t, expectedTx, tx) } -func TestResolver_BeginTx_GoesToPrimary(t *testing.T) { - mocks := setupMocks(t, true) - defer mocks.Ctrl.Finish() - - expectedTx := &gofrSQL.Tx{} - - mocks.Primary.EXPECT().Begin().Return(expectedTx, nil) - - tx, err := mocks.Resolver.BeginTx(t.Context()) - - require.NoError(t, err) - assert.Equal(t, expectedTx, tx) -} - func TestResolver_Dialect(t *testing.T) { mocks := setupMocks(t, true) defer mocks.Ctrl.Finish() diff --git a/pkg/gofr/datasource/dbresolver/strategy.go b/pkg/gofr/datasource/dbresolver/strategy.go index 335775954..94781730d 100644 --- a/pkg/gofr/datasource/dbresolver/strategy.go +++ b/pkg/gofr/datasource/dbresolver/strategy.go @@ -5,101 +5,69 @@ import ( "math/rand" "sync/atomic" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/trace" "gofr.dev/pkg/gofr/container" ) var errNoReplicasAvailable = errors.New("no replicas available") -// Strategy defines how to choose a replica from available replicas. +// Strategy interface defines replica selection logic. type Strategy interface { Choose(replicas []container.DB) (container.DB, error) Name() string } -// chooseReplicaOrFallback attempts to select a replica and handles fallback logic. -// It returns either a selected replica DB or the primary DB if fallback occurs. -func (r *Resolver) chooseReplicaOrFallback(span trace.Span) container.DB { - if len(r.replicas) == 0 { - // No replicas available, use primary - if span != nil { - span.SetAttributes(attribute.String("dbresolver.target", "primary")) - } - - r.stats.primaryReads.Add(1) - - return r.primary - } - - db, err := r.strategy.Choose(r.replicas) - if err != nil { - // Replica selection failed, fall back to primary - r.logger.Debugf("Failed to choose replica: %v, falling back to primary", err) - r.stats.replicaFailures.Add(1) - r.stats.primaryFallbacks.Add(1) - r.stats.primaryReads.Add(1) - - if span != nil { - span.SetAttributes(attribute.Bool("dbresolver.fallback", true)) - span.SetAttributes(attribute.String("dbresolver.target", "primary")) - } - - return r.primary - } - - if span != nil { - span.SetAttributes(attribute.String("dbresolver.target", "replica")) - } - - return db -} - -// RoundRobinStrategy selects replicas in round-robin fashion. +// RoundRobinStrategy selects replicas in round-robin order. type RoundRobinStrategy struct { - current atomic.Int64 + current atomic.Uint64 count int } -// NewRoundRobinStrategy creates a new round-robin strategy. +// NewRoundRobinStrategy creates a new round-robin strategy instance. func NewRoundRobinStrategy(count int) Strategy { - return &RoundRobinStrategy{count: count} + return &RoundRobinStrategy{ + count: count, + } } -// Choose selects a replica using round-robin. +// Choose selects the next replica in round-robin fashion. func (s *RoundRobinStrategy) Choose(replicas []container.DB) (container.DB, error) { if len(replicas) == 0 { return nil, errNoReplicasAvailable } - idx := int(s.current.Add(1)) % len(replicas) + current := s.current.Add(1) + idx := int(current % uint64(len(replicas))) + + if len(replicas) > 0 { + idx %= len(replicas) + } return replicas[idx], nil } -// Name returns the strategy name. +// Name returns the name of strategy. func (*RoundRobinStrategy) Name() string { return roundRobinStrategy } -// RandomStrategy selects replicas randomly. +// RandomStrategy selects a replica randomly. type RandomStrategy struct{} -// NewRandomStrategy creates a new random strategy. +// NewRandomStrategy creates a new random strategy instance. func NewRandomStrategy() Strategy { return &RandomStrategy{} } -// Choose selects a replica randomly. +// Choose selects a random replica. func (*RandomStrategy) Choose(replicas []container.DB) (container.DB, error) { if len(replicas) == 0 { return nil, errNoReplicasAvailable } - return replicas[rand.Intn(len(replicas))], nil //nolint:gosec // weak RNG is okay for load balancing + return replicas[rand.Intn(len(replicas))], nil //nolint:gosec // acceptable randomness for load balance } -// Name returns the strategy name. +// Name returns the name of the strategy. func (*RandomStrategy) Name() string { return randomStrategy } diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 017a152fa..d302e7232 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -1,13 +1,15 @@ package gofr import ( - "strings" - "go.opentelemetry.io/otel" "gofr.dev/pkg/gofr/config" "gofr.dev/pkg/gofr/container" "gofr.dev/pkg/gofr/datasource/file" "gofr.dev/pkg/gofr/datasource/sql" + "gofr.dev/pkg/gofr/logging" + "gofr.dev/pkg/gofr/metrics" + "strconv" + "strings" ) // AddMongo sets the Mongo datasource in the app's container. @@ -217,7 +219,7 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { resolver.Connect() // Create replica connections - replicas := a.createReplicaConnections() + replicas := createReplicaConnections(a.Config, a.Logger(), a.Metrics()) if len(replicas) == 0 { a.Logger().Debugf("No replicas configured, skipping DB resolver setup") return @@ -234,10 +236,9 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { a.Logger().Logf("DB read/write splitting enabled with %d replicas", len(replicas)) } -// createReplicaConnections creates DB connections to replicas -func (a *App) createReplicaConnections() []container.DB { - // Get replica hosts - replicaHostsStr := a.Config.Get("DB_REPLICA_HOSTS") +// createReplicaConnections creates optimized DB connections to replicas +func createReplicaConnections(config config.Config, logger logging.Logger, metrics metrics.Manager) []container.DB { + replicaHostsStr := config.Get("DB_REPLICA_HOSTS") if replicaHostsStr == "" { return nil } @@ -245,63 +246,52 @@ func (a *App) createReplicaConnections() []container.DB { replicaHosts := strings.Split(replicaHostsStr, ",") var replicas []container.DB - // For each host, create a replica connection for _, host := range replicaHosts { host = strings.TrimSpace(host) if host == "" { continue } - // Create a config wrapper for this replica - replicaConfig := newReplicaConfig(a.Config, host) + // Create optimized replica config + replicaConfig := &replicaConfigWrapper{ + Config: config, + hostString: host, + } - // Create a new SQL connection using the replica config - replica := sql.NewSQL(replicaConfig, a.Logger(), a.Metrics()) + replica := sql.NewSQL(replicaConfig, logger, metrics) if replica != nil { replicas = append(replicas, replica) - a.Logger().Logf("Created DB replica connection to %s", host) + logger.Logf("Created DB replica connection to %s", host) } } return replicas } -// newReplicaConfig creates a config wrapper that overrides the host and optional settings -func newReplicaConfig(baseConfig config.Config, hostString string) config.Config { - return &replicaConfigWrapper{ - Config: baseConfig, - hostString: hostString, - } -} - -// replicaConfigWrapper wraps a config and overrides DB_HOST and optional replica settings +// replicaConfigWrapper wraps config and optimizes connection settings for replicas type replicaConfigWrapper struct { config.Config hostString string } -// Get overrides the config.Get method to provide replica-specific values +// Get overrides config values for replica optimization func (c *replicaConfigWrapper) Get(key string) string { switch key { case "DB_HOST": - // Extract only the hostname part if host contains a port if strings.Contains(c.hostString, ":") { return strings.Split(c.hostString, ":")[0] } return c.hostString case "DB_PORT": - // Extract port from host if present, otherwise use the default port if strings.Contains(c.hostString, ":") { parts := strings.Split(c.hostString, ":") if len(parts) > 1 { return parts[1] } } - // Check for replica-specific port first if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { return replicaPort } - // Fall back to default port return c.Config.Get("DB_PORT") case "DB_USER": if replicaUser := c.Config.Get("DB_REPLICA_USER"); replicaUser != "" { @@ -311,6 +301,39 @@ func (c *replicaConfigWrapper) Get(key string) string { if replicaPass := c.Config.Get("DB_REPLICA_PASSWORD"); replicaPass != "" { return replicaPass } + case "DB_MAX_IDLE_CONNECTION": + // Simple optimization: 4x idle connections for read replicas + if primaryIdle := c.Config.Get("DB_MAX_IDLE_CONNECTION"); primaryIdle != "" { + if val, err := strconv.Atoi(primaryIdle); err == nil && val > 0 { + optimized := val * 4 + if optimized > 50 { // Cap at 50 + optimized = 50 + } + if optimized < 10 { // Min of 10 for read performance + optimized = 10 + } + return strconv.Itoa(optimized) + } + } + return "10" // Default optimized value + case "DB_MAX_OPEN_CONNECTION": + // Simple optimization: 2x max connections for read replicas + if primaryOpen := c.Config.Get("DB_MAX_OPEN_CONNECTION"); primaryOpen != "" { + if val, err := strconv.Atoi(primaryOpen); err == nil { + if val == 0 { // Handle unlimited + return "100" // Reasonable limit for replicas + } + optimized := val * 2 + if optimized > 200 { // Cap at 200 + optimized = 200 + } + if optimized < 50 { // Min of 50 for read distribution + optimized = 50 + } + return strconv.Itoa(optimized) + } + } + return "100" // Default optimized value } return c.Config.Get(key) From 2aa7e57f0f80553e5f024341228b256aa8328258 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 10:29:13 +0530 Subject: [PATCH 10/25] fix performance bottlenecks --- .../dbresolver/dbresolver-wrapper.go | 13 ------- .../dbresolver/dbresolver-wrapper_test.go | 34 +------------------ pkg/gofr/datasource/dbresolver/resolver.go | 20 +++++------ pkg/gofr/datasource/dbresolver/strategy.go | 14 ++++---- 4 files changed, 19 insertions(+), 62 deletions(-) diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go index 05176f1e6..ab9e94a1f 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go @@ -56,19 +56,6 @@ func (*ResolverWrapper) Connect() { // no-op } -// createStrategy creates a Strategy instance from string name. -func (r *ResolverWrapper) createStrategy(replicaCount int) Strategy { - switch r.strategyName { - case roundRobinStrategy: - return NewRoundRobinStrategy(replicaCount) - case randomStrategy: - return NewRandomStrategy() - default: - // Default to round-robin if unknown strategy. - return NewRoundRobinStrategy(replicaCount) - } -} - // Build creates a Resolver instance with primary and replica DBs. func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) (container.DB, error) { if primary == nil { diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go index d605661b8..458232530 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go @@ -90,7 +90,7 @@ func setupMocks(t *testing.T, createResolver bool) *Mocks { stats: &statistics{}, stopChan: make(chan struct{}), once: sync.Once{}, - queryCache: newEfficientCache(100), + queryCache: newQueryCache(100), } } @@ -167,35 +167,3 @@ func TestResolverWrapper_Build_Success(t *testing.T) { }) } } - -func TestResolverWrapper_createStrategy_RoundRobin(t *testing.T) { - wrapper := &ResolverWrapper{strategyName: "round-robin"} - strategy := wrapper.createStrategy(3) - - _, ok := strategy.(*RoundRobinStrategy) - assert.True(t, ok, "Expected RoundRobinStrategy") -} - -func TestResolverWrapper_createStrategy_Random(t *testing.T) { - wrapper := &ResolverWrapper{strategyName: "random"} - strategy := wrapper.createStrategy(3) - - _, ok := strategy.(*RandomStrategy) - assert.True(t, ok, "Expected RandomStrategy") -} - -func TestResolverWrapper_createStrategy_EmptyDefaultsToRoundRobin(t *testing.T) { - wrapper := &ResolverWrapper{strategyName: ""} - strategy := wrapper.createStrategy(3) - - _, ok := strategy.(*RoundRobinStrategy) - assert.True(t, ok, "Expected RoundRobinStrategy") -} - -func TestResolverWrapper_createStrategy_UnknownDefaultsToRoundRobin(t *testing.T) { - wrapper := &ResolverWrapper{strategyName: "unknown"} - strategy := wrapper.createStrategy(3) - - _, ok := strategy.(*RoundRobinStrategy) - assert.True(t, ok, "Expected RoundRobinStrategy") -} diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index 1f097c945..5c0cba8cb 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -35,20 +35,20 @@ const ( // Pre-compiled regex - compiled once at package init. var readQueryRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) -// Efficient query cache using sync.Map (optimized for read-heavy workloads). -type efficientCache struct { +// queryCache implements a thread-safe, size-limited cache for query classification. +type queryCache struct { cache sync.Map size atomic.Int64 max int64 } -func newEfficientCache(maxSize int64) *efficientCache { - return &efficientCache{ +func newQueryCache(maxSize int64) *queryCache { + return &queryCache{ max: maxSize, } } -func (c *efficientCache) get(key string) (value, exists bool) { +func (c *queryCache) get(key string) (value, exists bool) { val, found := c.cache.Load(key) if !found { return false, false @@ -57,7 +57,7 @@ func (c *efficientCache) get(key string) (value, exists bool) { return val.(bool), true } -func (c *efficientCache) set(key string, value bool) { +func (c *queryCache) set(key string, value bool) { // Simple bounded cache - reject if full if c.size.Load() >= c.max { return @@ -146,7 +146,7 @@ type Resolver struct { metrics Metrics tracer trace.Tracer - queryCache *efficientCache + queryCache *queryCache stats *statistics // Background task management. @@ -172,7 +172,7 @@ func WithFallback(fallback bool) Option { } } -// NewResolver creates a new resolver with optimized initialization. +// NewResolver creates a new Resolver instance with the provided primary and replicas. func NewResolver(primary container.DB, replicas []container.DB, logger Logger, metrics Metrics, opts ...Option) container.DB { // Wrap replicas with circuit breakers replicaWrappers := make([]*replicaWrapper, len(replicas)) @@ -190,7 +190,7 @@ func NewResolver(primary container.DB, replicas []container.DB, logger Logger, m readFallback: true, // Default to true logger: logger, metrics: metrics, - queryCache: newEfficientCache(defaultCacheSize), // Bounded sync.Map cache. + queryCache: newQueryCache(defaultCacheSize), // Bounded sync.Map cache. stats: &statistics{}, stopChan: make(chan struct{}), } @@ -344,7 +344,7 @@ func (r *Resolver) selectHealthyReplica() (availableDB container.DB, availableIn return chosenDB, availableIndexes[0] } -// Minimal tracing - only create spans when tracer exists. +// addTrace adds tracing information to the context and returns a span. func (r *Resolver) addTrace(ctx context.Context, method, query string) (context.Context, trace.Span) { if r.tracer == nil { return ctx, nil diff --git a/pkg/gofr/datasource/dbresolver/strategy.go b/pkg/gofr/datasource/dbresolver/strategy.go index 94781730d..037205955 100644 --- a/pkg/gofr/datasource/dbresolver/strategy.go +++ b/pkg/gofr/datasource/dbresolver/strategy.go @@ -18,7 +18,7 @@ type Strategy interface { // RoundRobinStrategy selects replicas in round-robin order. type RoundRobinStrategy struct { - current atomic.Uint64 + current atomic.Int64 count int } @@ -29,18 +29,20 @@ func NewRoundRobinStrategy(count int) Strategy { } } +// Choose selects the next replica in round-robin fashion. // Choose selects the next replica in round-robin fashion. func (s *RoundRobinStrategy) Choose(replicas []container.DB) (container.DB, error) { if len(replicas) == 0 { return nil, errNoReplicasAvailable } - current := s.current.Add(1) - idx := int(current % uint64(len(replicas))) + count := s.current.Add(1) - if len(replicas) > 0 { - idx %= len(replicas) - } + replicaCount := int64(len(replicas)) + + idx64 := count % replicaCount + + idx := int(idx64) return replicas[idx], nil } From 552f580f961e9bccb9e137233a2471d98d921cba Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 13:33:35 +0530 Subject: [PATCH 11/25] add documentation --- docs/quick-start/connecting-mysql/page.md | 39 +++++++++++++++++++++++ docs/references/configs/page.md | 6 ++++ go.sum | 4 +-- go.work | 1 + 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/docs/quick-start/connecting-mysql/page.md b/docs/quick-start/connecting-mysql/page.md index d0aa9cdd7..a2d67c907 100644 --- a/docs/quick-start/connecting-mysql/page.md +++ b/docs/quick-start/connecting-mysql/page.md @@ -239,3 +239,42 @@ Now when we access {% new-tab-link title="http://localhost:9000/customer" href=" ``` **Note:** When using PostgreSQL or Supabase, you may need to use `$1` instead of `?` in SQL queries, depending on your driver configuration. + +### Enabling Read/Write Splitting in MySQL (DBResolver) +GoFr provides built-in support for read/write splitting using its `DBRESOLVER` module for **MySQL**. +This feature allows applications to route write queries (e.g., `INSERT`, `UPDATE`) to the **primary database**, and +distribute read queries (`SELECT`) across **one or more replicas**, boosting performance, scalability, and reliability. + +Import the GoFr's dbresolver for MySQL: + +```shell +go get gofr.dev/pkg/gofr/datasource/dbresolver@latest +``` + +After importing the package, you can configure the DBResolver in your GoFr application using the `AddDBResolver` method. +You can choose the load balancing strategy and enable fallback to primary: + +```go +// Add DB resolver with round-robin strategy and fallback enabled +resolver := dbresolver.NewProvider("round-robin", true) +a.AddDBResolver(resolver) +``` + +- The first argument specifies the **load balancing strategy** for read queries. Supported values: + - `round-robin`: Distributes reads evenly across replicas. + - `random`: Selects a replica at random for each read. +- The second argument enables **fallback** to the primary if all replicas are unavailable. + +### Configuration +Add replica hosts to your `.env` file using the `DB_REPLICA_HOSTS` variable: + +```env +DB_REPLICA_HOSTS=localhost:3307,localhost:3308 +``` + +These hosts will be treated as **read replicas**. + +**Benefits** +- Performance: Offloads read traffic from the primary, reducing latency. +- Scalability: Easily scale reads by adding more replicas. +- Resilience: Ensures high availability through automatic fallback. \ No newline at end of file diff --git a/docs/references/configs/page.md b/docs/references/configs/page.md index 3e0953dde..746e49c8b 100644 --- a/docs/references/configs/page.md +++ b/docs/references/configs/page.md @@ -195,6 +195,12 @@ This document lists all the configuration options supported by the GoFr framewor --- +- DB_REPLICA_HOSTS +- Comma-separated list of replica database hosts. Used for read replicas. +- None + +--- + - DB_CHARSET - The character set for database connection - utf8 diff --git a/go.sum b/go.sum index 9cecc18bd..4a2a0de4e 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA= -cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q= +cloud.google.com/go v0.121.1 h1:S3kTQSydxmu1JfLRLpKtxRPA7rSrYPRPEUmL/PavVUw= +cloud.google.com/go v0.121.1/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw= cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc= cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= diff --git a/go.work b/go.work index 793e95d5d..57dee76c0 100644 --- a/go.work +++ b/go.work @@ -20,4 +20,5 @@ use ( ./pkg/gofr/datasource/scylladb ./pkg/gofr/datasource/solr ./pkg/gofr/datasource/surrealdb + pkg/gofr/datasource/dbresolver ) From d3a342ed94eaa0463a92909e9fd3c65eb0da3d25 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 16:03:57 +0530 Subject: [PATCH 12/25] fix linters --- ...olver-wrapper.go => dbresolver_wrapper.go} | 0 ...per_test.go => dbresolver_wrapper_test.go} | 0 pkg/gofr/external_db.go | 177 +++++++++++------- 3 files changed, 112 insertions(+), 65 deletions(-) rename pkg/gofr/datasource/dbresolver/{dbresolver-wrapper.go => dbresolver_wrapper.go} (100%) rename pkg/gofr/datasource/dbresolver/{dbresolver-wrapper_test.go => dbresolver_wrapper_test.go} (100%) diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go similarity index 100% rename from pkg/gofr/datasource/dbresolver/dbresolver-wrapper.go rename to pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go diff --git a/pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper_test.go similarity index 100% rename from pkg/gofr/datasource/dbresolver/dbresolver-wrapper_test.go rename to pkg/gofr/datasource/dbresolver/dbresolver_wrapper_test.go diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index d302e7232..6196b74c8 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -1,6 +1,9 @@ package gofr import ( + "strconv" + "strings" + "go.opentelemetry.io/otel" "gofr.dev/pkg/gofr/config" "gofr.dev/pkg/gofr/container" @@ -8,8 +11,15 @@ import ( "gofr.dev/pkg/gofr/datasource/sql" "gofr.dev/pkg/gofr/logging" "gofr.dev/pkg/gofr/metrics" - "strconv" - "strings" +) + +const ( + maxIdleReplicaCap = 50 + minIdleReplica = 10 + maxOpenReplicaCap = 200 + minOpenReplica = 50 + defaultIdleReplica = 10 + defaultOpenReplica = 100 ) // AddMongo sets the Mongo datasource in the app's container. @@ -200,15 +210,15 @@ func (a *App) AddElasticsearch(db container.ElasticsearchProvider) { a.container.Elasticsearch = db } -// AddDBResolver sets up read/write splitting for SQL databases +// AddDBResolver sets up read/write splitting for SQL databases. func (a *App) AddDBResolver(resolver container.DBResolverProvider) { - // Exit if SQL is not configured + // Exit if SQL is not configured. if a.container.SQL == nil { a.Logger().Errorf("Cannot set up DB resolver: SQL is not configured") return } - // Set up logger, metrics, tracer + // Set up logger, metrics, tracer. resolver.UseLogger(a.Logger()) resolver.UseMetrics(a.Metrics()) @@ -218,14 +228,14 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { // Connect (no-op for resolver) resolver.Connect() - // Create replica connections + // Create replica connections. replicas := createReplicaConnections(a.Config, a.Logger(), a.Metrics()) if len(replicas) == 0 { a.Logger().Debugf("No replicas configured, skipping DB resolver setup") return } - // Build resolver with primary and replicas + // Build resolver with primary and replicas. resolverDB, err := resolver.Build(a.container.SQL, replicas) if err != nil { a.Logger().Errorf("Failed to build DB resolver: %v", err) @@ -236,14 +246,15 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { a.Logger().Logf("DB read/write splitting enabled with %d replicas", len(replicas)) } -// createReplicaConnections creates optimized DB connections to replicas -func createReplicaConnections(config config.Config, logger logging.Logger, metrics metrics.Manager) []container.DB { - replicaHostsStr := config.Get("DB_REPLICA_HOSTS") +// createReplicaConnections creates optimized DB connections to replicas. +func createReplicaConnections(cfg config.Config, logger logging.Logger, metrics metrics.Manager) []container.DB { + replicaHostsStr := cfg.Get("DB_REPLICA_HOSTS") if replicaHostsStr == "" { return nil } replicaHosts := strings.Split(replicaHostsStr, ",") + var replicas []container.DB for _, host := range replicaHosts { @@ -252,15 +263,16 @@ func createReplicaConnections(config config.Config, logger logging.Logger, metri continue } - // Create optimized replica config + // Create optimized replica config. replicaConfig := &replicaConfigWrapper{ - Config: config, + Config: cfg, hostString: host, } replica := sql.NewSQL(replicaConfig, logger, metrics) if replica != nil { replicas = append(replicas, replica) + logger.Logf("Created DB replica connection to %s", host) } } @@ -268,73 +280,108 @@ func createReplicaConnections(config config.Config, logger logging.Logger, metri return replicas } -// replicaConfigWrapper wraps config and optimizes connection settings for replicas +// replicaConfigWrapper wraps config and optimizes connection settings for replicas. type replicaConfigWrapper struct { config.Config hostString string } -// Get overrides config values for replica optimization +// Get overrides config values for replica optimization. func (c *replicaConfigWrapper) Get(key string) string { switch key { case "DB_HOST": - if strings.Contains(c.hostString, ":") { - return strings.Split(c.hostString, ":")[0] - } - return c.hostString + return c.getHost() case "DB_PORT": - if strings.Contains(c.hostString, ":") { - parts := strings.Split(c.hostString, ":") - if len(parts) > 1 { - return parts[1] - } - } - if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { - return replicaPort - } - return c.Config.Get("DB_PORT") + return c.getPort() case "DB_USER": - if replicaUser := c.Config.Get("DB_REPLICA_USER"); replicaUser != "" { - return replicaUser - } + return c.getUser() case "DB_PASSWORD": - if replicaPass := c.Config.Get("DB_REPLICA_PASSWORD"); replicaPass != "" { - return replicaPass - } + return c.getPassword() case "DB_MAX_IDLE_CONNECTION": - // Simple optimization: 4x idle connections for read replicas - if primaryIdle := c.Config.Get("DB_MAX_IDLE_CONNECTION"); primaryIdle != "" { - if val, err := strconv.Atoi(primaryIdle); err == nil && val > 0 { - optimized := val * 4 - if optimized > 50 { // Cap at 50 - optimized = 50 - } - if optimized < 10 { // Min of 10 for read performance - optimized = 10 - } - return strconv.Itoa(optimized) - } - } - return "10" // Default optimized value + return optimizedIdleConnections(c.Config) case "DB_MAX_OPEN_CONNECTION": - // Simple optimization: 2x max connections for read replicas - if primaryOpen := c.Config.Get("DB_MAX_OPEN_CONNECTION"); primaryOpen != "" { - if val, err := strconv.Atoi(primaryOpen); err == nil { - if val == 0 { // Handle unlimited - return "100" // Reasonable limit for replicas - } - optimized := val * 2 - if optimized > 200 { // Cap at 200 - optimized = 200 - } - if optimized < 50 { // Min of 50 for read distribution - optimized = 50 - } - return strconv.Itoa(optimized) - } + return optimizedOpenConnections(c.Config) + default: + return c.Config.Get(key) + } +} + +func (c *replicaConfigWrapper) getHost() string { + if strings.Contains(c.hostString, ":") { + return strings.Split(c.hostString, ":")[0] + } + + return c.hostString +} + +func (c *replicaConfigWrapper) getPort() string { + if strings.Contains(c.hostString, ":") { + parts := strings.Split(c.hostString, ":") + if len(parts) > 1 { + return parts[1] } - return "100" // Default optimized value } - return c.Config.Get(key) + if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { + return replicaPort + } + + return c.Config.Get("DB_PORT") +} + +func (c *replicaConfigWrapper) getUser() string { + if replicaUser := c.Config.Get("DB_REPLICA_USER"); replicaUser != "" { + return replicaUser + } + + return c.Config.Get("DB_USER") +} + +func (c *replicaConfigWrapper) getPassword() string { + if replicaPass := c.Config.Get("DB_REPLICA_PASSWORD"); replicaPass != "" { + return replicaPass + } + + return c.Config.Get("DB_PASSWORD") +} + +func optimizedIdleConnections(cfg config.Config) string { + val, err := strconv.Atoi(cfg.Get("DB_MAX_IDLE_CONNECTION")) + + if err != nil || val <= 0 { + return strconv.Itoa(defaultIdleReplica) + } + + optimized := val * 4 + + switch { + case optimized > maxIdleReplicaCap: + optimized = maxIdleReplicaCap + case optimized < minIdleReplica: + optimized = minIdleReplica + } + + return strconv.Itoa(optimized) +} + +func optimizedOpenConnections(cfg config.Config) string { + val, err := strconv.Atoi(cfg.Get("DB_MAX_OPEN_CONNECTION")) + if err != nil { + return strconv.Itoa(defaultOpenReplica) + } + + if val == 0 { + return strconv.Itoa(defaultOpenReplica) + } + + optimized := val * 2 + + switch { + case optimized > maxOpenReplicaCap: + optimized = maxOpenReplicaCap + case optimized < minOpenReplica: + optimized = minOpenReplica + } + + return strconv.Itoa(optimized) } From c4f1a232e1435522a0ce74084d2abba75f8ccef8 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 16:11:54 +0530 Subject: [PATCH 13/25] resolve small issue in external_db.go --- pkg/gofr/container/datasources.go | 5 ++--- pkg/gofr/external_db.go | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go index 2cd539c21..44e6a72d8 100644 --- a/pkg/gofr/container/datasources.go +++ b/pkg/gofr/container/datasources.go @@ -6,7 +6,6 @@ import ( "database/sql" "github.com/redis/go-redis/v9" - "gofr.dev/pkg/gofr/datasource" "gofr.dev/pkg/gofr/datasource/pubsub" gofrSQL "gofr.dev/pkg/gofr/datasource/sql" @@ -722,9 +721,9 @@ type ElasticsearchProvider interface { provider } -// DBResolverProvider defines an interface for SQL read/write splitting providers +// DBResolverProvider defines an interface for SQL read/write splitting providers. type DBResolverProvider interface { - // Build creates a resolver with the given primary and replicas + // Build creates a resolver with the given primary and replicas. Build(primary DB, replicas []DB) (DB, error) provider diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 6196b74c8..6f1bb3f40 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -5,6 +5,7 @@ import ( "strings" "go.opentelemetry.io/otel" + "gofr.dev/pkg/gofr/config" "gofr.dev/pkg/gofr/container" "gofr.dev/pkg/gofr/datasource/file" @@ -247,7 +248,7 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { } // createReplicaConnections creates optimized DB connections to replicas. -func createReplicaConnections(cfg config.Config, logger logging.Logger, metrics metrics.Manager) []container.DB { +func createReplicaConnections(cfg config.Config, logger logging.Logger, mtrcs metrics.Manager) []container.DB { replicaHostsStr := cfg.Get("DB_REPLICA_HOSTS") if replicaHostsStr == "" { return nil @@ -269,7 +270,7 @@ func createReplicaConnections(cfg config.Config, logger logging.Logger, metrics hostString: host, } - replica := sql.NewSQL(replicaConfig, logger, metrics) + replica := sql.NewSQL(replicaConfig, logger, mtrcs) if replica != nil { replicas = append(replicas, replica) From f38c2effab681154a0ac0964c6fec788b22a8385 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 16:25:04 +0530 Subject: [PATCH 14/25] fix import in datasources.go --- pkg/gofr/container/datasources.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go index 44e6a72d8..cab3e9c29 100644 --- a/pkg/gofr/container/datasources.go +++ b/pkg/gofr/container/datasources.go @@ -6,6 +6,7 @@ import ( "database/sql" "github.com/redis/go-redis/v9" + "gofr.dev/pkg/gofr/datasource" "gofr.dev/pkg/gofr/datasource/pubsub" gofrSQL "gofr.dev/pkg/gofr/datasource/sql" From 6f22477c042e2be8dea85b8587d8feb1870d8369 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 17:18:53 +0530 Subject: [PATCH 15/25] fix import issue in datasources.go --- pkg/gofr/container/datasources.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go index cab3e9c29..44e6a72d8 100644 --- a/pkg/gofr/container/datasources.go +++ b/pkg/gofr/container/datasources.go @@ -6,7 +6,6 @@ import ( "database/sql" "github.com/redis/go-redis/v9" - "gofr.dev/pkg/gofr/datasource" "gofr.dev/pkg/gofr/datasource/pubsub" gofrSQL "gofr.dev/pkg/gofr/datasource/sql" From a264cd55468bcbb5889b1686fd2ae5ad32f53378 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Thu, 7 Aug 2025 17:43:55 +0530 Subject: [PATCH 16/25] retry import fixing --- pkg/gofr/container/datasources.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/gofr/container/datasources.go b/pkg/gofr/container/datasources.go index 44e6a72d8..cab3e9c29 100644 --- a/pkg/gofr/container/datasources.go +++ b/pkg/gofr/container/datasources.go @@ -6,6 +6,7 @@ import ( "database/sql" "github.com/redis/go-redis/v9" + "gofr.dev/pkg/gofr/datasource" "gofr.dev/pkg/gofr/datasource/pubsub" gofrSQL "gofr.dev/pkg/gofr/datasource/sql" From 6b66f6b2a66c9c0351c3524e3e4b08a1f35e8459 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Fri, 8 Aug 2025 15:51:42 +0530 Subject: [PATCH 17/25] resolve reveiw comments --- go.work | 4 +++- go.work.sum | 2 ++ pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go | 7 +++---- pkg/gofr/datasource/dbresolver/logger.go | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/go.work b/go.work index 57dee76c0..2dd100a75 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,6 @@ -go 1.24.5 +go 1.24.0 + +toolchain go1.24.0 use ( . diff --git a/go.work.sum b/go.work.sum index 1019cb6da..e12e276a8 100644 --- a/go.work.sum +++ b/go.work.sum @@ -885,6 +885,8 @@ github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5Jxw github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.3.2+incompatible h1:wn66NJ6pWB1vBZIilP8G3qQPqHy5XymfYn5vsqeA5oA= github.com/docker/docker v28.3.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI= +github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= diff --git a/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go index ab9e94a1f..b88833f42 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go @@ -65,12 +65,11 @@ func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) ( // Create options slice var opts []Option - var strategy Strategy + // Default to round-robin + strategy := NewRoundRobinStrategy(len(replicas)) + if r.strategyName == "random" { strategy = NewRandomStrategy() - } else { - // Default to round-robin for any other value including "round-robin" - strategy = NewRoundRobinStrategy(len(replicas)) } // Add options. diff --git a/pkg/gofr/datasource/dbresolver/logger.go b/pkg/gofr/datasource/dbresolver/logger.go index 542be9cbe..7b85da516 100644 --- a/pkg/gofr/datasource/dbresolver/logger.go +++ b/pkg/gofr/datasource/dbresolver/logger.go @@ -6,6 +6,8 @@ import ( "strings" ) +var whitespaceRegex = regexp.MustCompile(`\s+`) + // Logger defines the logging interface for dbresolver. type Logger interface { Debug(args ...any) @@ -35,7 +37,7 @@ func (ql *QueryLog) PrettyPrint(logger Logger) { func clean(query string) string { // Replace multiple consecutive whitespace characters with a single space - query = regexp.MustCompile(`\s+`).ReplaceAllString(query, " ") + query = whitespaceRegex.ReplaceAllString(query, " ") // Trim leading and trailing whitespace from the string return strings.TrimSpace(query) } From 2b9c180874d9968e8d459696c89dba64351ad448 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Tue, 12 Aug 2025 10:41:51 +0530 Subject: [PATCH 18/25] enforce dbresovler to use go 1.24.0 --- pkg/gofr/datasource/dbresolver/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/gofr/datasource/dbresolver/go.mod b/pkg/gofr/datasource/dbresolver/go.mod index a31d1ebc9..c97e97ce0 100644 --- a/pkg/gofr/datasource/dbresolver/go.mod +++ b/pkg/gofr/datasource/dbresolver/go.mod @@ -1,6 +1,6 @@ module gofr.dev/pkg/gofr/datasource/dbresolver -go 1.24.5 +go 1.24.0 require ( github.com/stretchr/testify v1.10.0 From 11a3a07bf3043ff7388f9827dae1ff43bea8535b Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Tue, 12 Aug 2025 10:44:36 +0530 Subject: [PATCH 19/25] enforce dbresovler to use go 1.24.0 --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 87f85e491..cc6ca0779 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.121.1 h1:S3kTQSydxmu1JfLRLpKtxRPA7rSrYPRPEUmL/PavVUw= -cloud.google.com/go v0.121.1/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw= +cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA= +cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q= cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc= cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= From f5d01014c6e2bf162b694df61b27067e41ce39a7 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Wed, 20 Aug 2025 14:31:48 +0530 Subject: [PATCH 20/25] sort go.work dependencies --- go.work | 2 +- go.work.sum | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/go.work b/go.work index 3aacfb672..aa0a8af61 100644 --- a/go.work +++ b/go.work @@ -7,6 +7,7 @@ use ( ./pkg/gofr/datasource/cassandra ./pkg/gofr/datasource/clickhouse ./pkg/gofr/datasource/couchbase + ./pkg/gofr/datasource/dbresolver ./pkg/gofr/datasource/dgraph ./pkg/gofr/datasource/elasticsearch ./pkg/gofr/datasource/file/ftp @@ -22,5 +23,4 @@ use ( ./pkg/gofr/datasource/scylladb ./pkg/gofr/datasource/solr ./pkg/gofr/datasource/surrealdb - pkg/gofr/datasource/dbresolver ) diff --git a/go.work.sum b/go.work.sum index 22c78c58d..323d93884 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1142,6 +1142,7 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo= github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -1173,6 +1174,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE= github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/testcontainers/testcontainers-go v0.28.0 h1:1HLm9qm+J5VikzFDYhOd+Zw12NtOl+8drH2E8nTY1r8= github.com/testcontainers/testcontainers-go v0.28.0/go.mod h1:COlDpUXbwW3owtpMkEB1zo9gwb1CoKVKlyrVPejF4AU= github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw= @@ -1216,8 +1218,6 @@ go.opentelemetry.io/contrib/detectors/gcp v1.35.0 h1:bGvFt68+KTiAKFlacHW6AhA56GF go.opentelemetry.io/contrib/detectors/gcp v1.35.0/go.mod h1:qGWP8/+ILwMRIUf9uIVLloR1uo5ZYAslM4O6OqUi1DA= go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw= go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k= -go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw= -go.opentelemetry.io/contrib/detectors/gcp v1.36.0/go.mod h1:IbBN8uAIIx734PTonTPxAxnjc2pQTxWNkwfstZ+6H2k= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM= @@ -1282,6 +1282,9 @@ golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ug golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= +golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= @@ -1317,6 +1320,7 @@ golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1350,6 +1354,9 @@ golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= +golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1375,7 +1382,7 @@ golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1416,11 +1423,14 @@ golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMe golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b h1:DU+gwOBXU+6bO0sEyO7o/NeMlxZxCZEvI7v+J4a1zRQ= golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b/go.mod h1:4ZwOYna0/zsOKwuR5X/m0QFOJpSZvAxFfkQT+Erd9D4= +golang.org/x/telemetry v0.0.0-20250807160809-1a19826ec488 h1:3doPGa+Gg4snce233aCWnbZVFsyFMo/dR40KK/6skyE= +golang.org/x/telemetry v0.0.0-20250807160809-1a19826ec488/go.mod h1:fGb/2+tgXXjhjHsTNdVEEMZNWA0quBnfrO+AfoDSAKw= golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= @@ -1478,6 +1488,7 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY= golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= @@ -1631,8 +1642,10 @@ google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe0 google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= +google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= +google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc= google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7GzIx+cBiwfYPwtmZ41U3Mn/cotLJciaArI= google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= From 50ed2aa242756b060ad216f2468067643da4c7b1 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Mon, 25 Aug 2025 20:07:25 +0530 Subject: [PATCH 21/25] resolve review comments --- pkg/gofr/datasource/dbresolver/resolver.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index 5c0cba8cb..0bf1fdd64 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -286,9 +286,7 @@ func (r *Resolver) isReadQuery(query string) bool { // Fast string comparison for common cases firstSix := strings.ToUpper(trimmed[:6]) switch firstSix { - case "SELECT": - return true - case "SHOW ", "DESCRI", "EXPLAI": + case "SELECT", "SHOW ", "DESCRI", "EXPLAI": return true } From b379e4e2c899f6d03f6f351b3340cd301985e125 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Fri, 29 Aug 2025 12:48:03 +0530 Subject: [PATCH 22/25] resolve PR review comments --- .../dbresolver/dbresolver_wrapper.go | 20 ++++----- .../dbresolver/dbresolver_wrapper_test.go | 17 +++---- pkg/gofr/datasource/dbresolver/query_cache.go | 45 +++++++++++++++++++ pkg/gofr/datasource/dbresolver/resolver.go | 40 +---------------- pkg/gofr/datasource/dbresolver/strategy.go | 19 +++++--- 5 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 pkg/gofr/datasource/dbresolver/query_cache.go diff --git a/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go index b88833f42..420eb5cb8 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper.go @@ -18,14 +18,14 @@ type ResolverWrapper struct { logger Logger metrics Metrics tracer trace.Tracer - strategyName string + strategy Strategy readFallback bool } // NewProvider creates a new ResolverWrapper with strategy and fallback config. -func NewProvider(strategy string, readFallback bool) *ResolverWrapper { +func NewProvider(strategy Strategy, readFallback bool) *ResolverWrapper { return &ResolverWrapper{ - strategyName: strategy, + strategy: strategy, readFallback: readFallback, } } @@ -62,18 +62,16 @@ func (r *ResolverWrapper) Build(primary container.DB, replicas []container.DB) ( return nil, errPrimaryNil } + // Update RoundRobinStrategy count if needed + if rr, ok := r.strategy.(*RoundRobinStrategy); ok { + rr.count = len(replicas) + } + // Create options slice var opts []Option - // Default to round-robin - strategy := NewRoundRobinStrategy(len(replicas)) - - if r.strategyName == "random" { - strategy = NewRandomStrategy() - } - // Add options. - opts = append(opts, WithStrategy(strategy), WithFallback(r.readFallback)) + opts = append(opts, WithStrategy(r.strategy), WithFallback(r.readFallback)) // Create and return the resolver. return NewResolver(primary, replicas, r.logger, r.metrics, opts...), nil diff --git a/pkg/gofr/datasource/dbresolver/dbresolver_wrapper_test.go b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper_test.go index 458232530..02b5b57c1 100644 --- a/pkg/gofr/datasource/dbresolver/dbresolver_wrapper_test.go +++ b/pkg/gofr/datasource/dbresolver/dbresolver_wrapper_test.go @@ -75,7 +75,6 @@ func setupMocks(t *testing.T, createResolver bool) *Mocks { replicaWrappers[i] = &replicaWrapper{ db: r, breaker: newCircuitBreaker(5, 30*time.Second), - index: i, } } @@ -102,7 +101,7 @@ func TestResolverWrapper_Build_Error(t *testing.T) { defer mocks.Ctrl.Finish() t.Run("Error_NilPrimary", func(t *testing.T) { - wrapper := NewProvider("round-robin", true) + wrapper := NewProvider(NewRoundRobinStrategy(2), true) wrapper.UseLogger(mocks.Logger) wrapper.UseMetrics(mocks.Metrics) wrapper.UseTracer(otel.GetTracerProvider().Tracer("gofr-dbresolver")) @@ -121,31 +120,25 @@ func TestResolverWrapper_Build_Success(t *testing.T) { successTests := []struct { name string - strategy string + strategy Strategy readFallback bool replicas []container.DB }{ { name: "RoundRobinStrategy", - strategy: "round-robin", + strategy: NewRoundRobinStrategy(0), readFallback: true, replicas: mocks.Replicas, }, { name: "RandomStrategy", - strategy: "random", + strategy: NewRandomStrategy(), readFallback: false, replicas: mocks.Replicas, }, - { - name: "UnknownStrategyDefaultsToRoundRobin", - strategy: "unknown", - readFallback: true, - replicas: mocks.Replicas, - }, { name: "EmptyReplicas", - strategy: "round-robin", + strategy: NewRoundRobinStrategy(0), readFallback: true, replicas: []container.DB{}, }, diff --git a/pkg/gofr/datasource/dbresolver/query_cache.go b/pkg/gofr/datasource/dbresolver/query_cache.go new file mode 100644 index 000000000..5aa854a5a --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/query_cache.go @@ -0,0 +1,45 @@ +package dbresolver + +import ( + "sync" + "sync/atomic" +) + +// queryCache implements a thread-safe, size-limited cache for query classification. +type queryCache struct { + cache sync.Map + size atomic.Int64 + max int64 +} + +func newQueryCache(maxSize int64) *queryCache { + return &queryCache{ + max: maxSize, + } +} + +func (c *queryCache) get(key string) (value, exists bool) { + val, found := c.cache.Load(key) + if !found { + return false, false + } + + boolVal, ok := val.(bool) + if !ok { + return false, false + } + + return boolVal, true +} + +func (c *queryCache) set(key string, value bool) { + // Simple bounded cache - reject if full + if c.size.Load() >= c.max { + return + } + + // Only increment size if it's a new key. + if _, loaded := c.cache.LoadOrStore(key, value); !loaded { + c.size.Add(1) + } +} diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index 0bf1fdd64..fd12b053a 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -35,40 +35,6 @@ const ( // Pre-compiled regex - compiled once at package init. var readQueryRegex = regexp.MustCompile(`(?i)^\s*(SELECT|SHOW|DESCRIBE|EXPLAIN)`) -// queryCache implements a thread-safe, size-limited cache for query classification. -type queryCache struct { - cache sync.Map - size atomic.Int64 - max int64 -} - -func newQueryCache(maxSize int64) *queryCache { - return &queryCache{ - max: maxSize, - } -} - -func (c *queryCache) get(key string) (value, exists bool) { - val, found := c.cache.Load(key) - if !found { - return false, false - } - - return val.(bool), true -} - -func (c *queryCache) set(key string, value bool) { - // Simple bounded cache - reject if full - if c.size.Load() >= c.max { - return - } - - // Only increment size if it's a new key. - if _, loaded := c.cache.LoadOrStore(key, value); !loaded { - c.size.Add(1) - } -} - // statistics holds atomic counters for various operations. type statistics struct { primaryReads atomic.Uint64 @@ -132,7 +98,6 @@ func (cb *circuitBreaker) recordFailure() { type replicaWrapper struct { db container.DB breaker *circuitBreaker - index int } // Resolver is the main struct that implements the container.DB interface. @@ -180,7 +145,6 @@ func NewResolver(primary container.DB, replicas []container.DB, logger Logger, m replicaWrappers[i] = &replicaWrapper{ db: replica, breaker: newCircuitBreaker(defaultMaxFailures, time.Duration(defaultTimeoutSec)*time.Second), - index: i, } } @@ -315,10 +279,10 @@ func (r *Resolver) selectHealthyReplica() (availableDB container.DB, availableIn availableIndexes []int ) - for _, wrapper := range r.replicas { + for i, wrapper := range r.replicas { if wrapper.breaker.allowRequest() { availableDbs = append(availableDbs, wrapper.db) - availableIndexes = append(availableIndexes, wrapper.index) + availableIndexes = append(availableIndexes, i) } } diff --git a/pkg/gofr/datasource/dbresolver/strategy.go b/pkg/gofr/datasource/dbresolver/strategy.go index 037205955..a0f51e7b6 100644 --- a/pkg/gofr/datasource/dbresolver/strategy.go +++ b/pkg/gofr/datasource/dbresolver/strategy.go @@ -8,6 +8,16 @@ import ( "gofr.dev/pkg/gofr/container" ) +// StrategyType defines the load balancing strategy type. +type StrategyType string + +const ( + // StrategyRoundRobin distributes load sequentially across replicas. + StrategyRoundRobin StrategyType = "round-robin" + // StrategyRandom randomly selects a replica for each request. + StrategyRandom StrategyType = "random" +) + var errNoReplicasAvailable = errors.New("no replicas available") // Strategy interface defines replica selection logic. @@ -32,14 +42,13 @@ func NewRoundRobinStrategy(count int) Strategy { // Choose selects the next replica in round-robin fashion. // Choose selects the next replica in round-robin fashion. func (s *RoundRobinStrategy) Choose(replicas []container.DB) (container.DB, error) { - if len(replicas) == 0 { + replicaCount := int64(len(replicas)) + if replicaCount == 0 { return nil, errNoReplicasAvailable } count := s.current.Add(1) - replicaCount := int64(len(replicas)) - idx64 := count % replicaCount idx := int(idx64) @@ -49,7 +58,7 @@ func (s *RoundRobinStrategy) Choose(replicas []container.DB) (container.DB, erro // Name returns the name of strategy. func (*RoundRobinStrategy) Name() string { - return roundRobinStrategy + return string(StrategyRoundRobin) } // RandomStrategy selects a replica randomly. @@ -71,5 +80,5 @@ func (*RandomStrategy) Choose(replicas []container.DB) (container.DB, error) { // Name returns the name of the strategy. func (*RandomStrategy) Name() string { - return randomStrategy + return string(StrategyRandom) } From 33d8e502e376ad22701c94f767da9903ff87a8e7 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Fri, 29 Aug 2025 15:22:44 +0530 Subject: [PATCH 23/25] add new configs for db_replica_users and passwords --- pkg/gofr/external_db.go | 89 ++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 54 deletions(-) diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 9eefff656..58f7c145b 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -275,55 +275,75 @@ func (a *App) AddDBResolver(resolver container.DBResolverProvider) { // createReplicaConnections creates optimized DB connections to replicas. func createReplicaConnections(cfg config.Config, logger logging.Logger, mtrcs metrics.Manager) []container.DB { - replicaHostsStr := cfg.Get("DB_REPLICA_HOSTS") - if replicaHostsStr == "" { + hosts := strings.Split(cfg.Get("DB_REPLICA_HOSTS"), ",") + ports := strings.Split(cfg.Get("DB_REPLICA_PORTS"), ",") + users := strings.Split(cfg.Get("DB_REPLICA_USERS"), ",") + passwords := strings.Split(cfg.Get("DB_REPLICA_PASSWORDS"), ",") + + // Ensure minimum: at least hosts must be defined + if len(hosts) == 0 || (len(hosts) == 1 && hosts[0] == "") { return nil } - replicaHosts := strings.Split(replicaHostsStr, ",") - var replicas []container.DB - for _, host := range replicaHosts { + for i, host := range hosts { host = strings.TrimSpace(host) if host == "" { continue } - // Create optimized replica config. + port := safeGet(ports, i, cfg.Get("DB_PORT")) + user := safeGet(users, i, cfg.Get("DB_USER")) + pass := safeGet(passwords, i, cfg.Get("DB_PASSWORD")) + + // Wrap replica config replicaConfig := &replicaConfigWrapper{ - Config: cfg, - hostString: host, + Config: cfg, + host: host, + port: port, + user: user, + password: pass, } replica := sql.NewSQL(replicaConfig, logger, mtrcs) if replica != nil { replicas = append(replicas, replica) - - logger.Logf("Created DB replica connection to %s", host) + logger.Logf("Created DB replica connection to %s:%s as user %s", host, port, user) } } return replicas } +// safeGet returns the element at index i if present, otherwise fallback. +func safeGet(list []string, i int, fallback string) string { + if i < len(list) && strings.TrimSpace(list[i]) != "" { + return strings.TrimSpace(list[i]) + } + return fallback +} + // replicaConfigWrapper wraps config and optimizes connection settings for replicas. type replicaConfigWrapper struct { config.Config - hostString string + host string + port string + user string + password string } // Get overrides config values for replica optimization. func (c *replicaConfigWrapper) Get(key string) string { switch key { case "DB_HOST": - return c.getHost() + return c.host case "DB_PORT": - return c.getPort() + return c.port case "DB_USER": - return c.getUser() + return c.user case "DB_PASSWORD": - return c.getPassword() + return c.password case "DB_MAX_IDLE_CONNECTION": return optimizedIdleConnections(c.Config) case "DB_MAX_OPEN_CONNECTION": @@ -333,45 +353,6 @@ func (c *replicaConfigWrapper) Get(key string) string { } } -func (c *replicaConfigWrapper) getHost() string { - if strings.Contains(c.hostString, ":") { - return strings.Split(c.hostString, ":")[0] - } - - return c.hostString -} - -func (c *replicaConfigWrapper) getPort() string { - if strings.Contains(c.hostString, ":") { - parts := strings.Split(c.hostString, ":") - if len(parts) > 1 { - return parts[1] - } - } - - if replicaPort := c.Config.Get("DB_REPLICA_PORT"); replicaPort != "" { - return replicaPort - } - - return c.Config.Get("DB_PORT") -} - -func (c *replicaConfigWrapper) getUser() string { - if replicaUser := c.Config.Get("DB_REPLICA_USER"); replicaUser != "" { - return replicaUser - } - - return c.Config.Get("DB_USER") -} - -func (c *replicaConfigWrapper) getPassword() string { - if replicaPass := c.Config.Get("DB_REPLICA_PASSWORD"); replicaPass != "" { - return replicaPass - } - - return c.Config.Get("DB_PASSWORD") -} - func optimizedIdleConnections(cfg config.Config) string { val, err := strconv.Atoi(cfg.Get("DB_MAX_IDLE_CONNECTION")) From 7ef7fc5550f883ea3a804c18a877b83677321aa3 Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Fri, 29 Aug 2025 16:39:41 +0530 Subject: [PATCH 24/25] add new configs in docs --- docs/quick-start/connecting-mysql/page.md | 35 +++++++++- docs/references/configs/page.md | 55 +++++++++++++++ .../datasource/dbresolver/circuit_breaker.go | 55 +++++++++++++++ pkg/gofr/datasource/dbresolver/options.go | 18 +++++ pkg/gofr/datasource/dbresolver/resolver.go | 68 ------------------- .../datasource/dbresolver/strategy_test.go | 4 +- pkg/gofr/external_db.go | 60 ++++++++++------ 7 files changed, 202 insertions(+), 93 deletions(-) create mode 100644 pkg/gofr/datasource/dbresolver/circuit_breaker.go create mode 100644 pkg/gofr/datasource/dbresolver/options.go diff --git a/docs/quick-start/connecting-mysql/page.md b/docs/quick-start/connecting-mysql/page.md index a2d67c907..22764e951 100644 --- a/docs/quick-start/connecting-mysql/page.md +++ b/docs/quick-start/connecting-mysql/page.md @@ -266,14 +266,45 @@ a.AddDBResolver(resolver) - The second argument enables **fallback** to the primary if all replicas are unavailable. ### Configuration -Add replica hosts to your `.env` file using the `DB_REPLICA_HOSTS` variable: + +#### 1. Replica Hosts +Add replica hosts, ports,users, passwords to your `.env` file using the following configs: ```env -DB_REPLICA_HOSTS=localhost:3307,localhost:3308 +DB_REPLICA_HOSTS=localhost,replica1,replica2 +DB_REPLICA_PORTS=3307,3308,3309 +DB_REPLICA_USERS=readonly1,readonly2,readonly3 +DB_REPLICA_PASSWORDS=pass1,pass2,pass3 + ``` These hosts will be treated as **read replicas**. +#### 2. Replica Connection Pool Tuning +By default, GoFr automatically scales connection pools for replicas based on your primary database settings: + +`DB_MAX_IDLE_CONNECTION` → multiplied by 4 +`DB_MAX_OPEN_CONNECTION` → multiplied by 2 + +This ensures replicas can handle higher read concurrency without impacting the primary. +GoFr also applies min/max caps to keep values safe. These can be customized: + +```go +# Primary DB pool settings +DB_MAX_IDLE_CONNECTION=2 +DB_MAX_OPEN_CONNECTION=20 + +# Replica pool overrides (optional) +DB_REPLICA_MAX_IDLE_CAP=100 +DB_REPLICA_MIN_IDLE=5 +DB_REPLICA_DEFAULT_IDLE=15 + +DB_REPLICA_MAX_OPEN_CAP=500 +DB_REPLICA_MIN_OPEN=20 +DB_REPLICA_DEFAULT_OPEN=150 + +``` + **Benefits** - Performance: Offloads read traffic from the primary, reducing latency. - Scalability: Easily scale reads by adding more replicas. diff --git a/docs/references/configs/page.md b/docs/references/configs/page.md index 746e49c8b..2804227ba 100644 --- a/docs/references/configs/page.md +++ b/docs/references/configs/page.md @@ -201,6 +201,61 @@ This document lists all the configuration options supported by the GoFr framewor --- +- DB_REPLICA_PORTS +- Comma-separated list of replica database ports. Used for read replicas. +- None + +--- + +- DB_REPLICA_USERS +- Comma-separated list of replica database users. Used for read replicas. +- None + +--- + +- DB_REPLICA_PASSWORDS_ +- Comma-separated list of replica database passwords. Used for read replicas. +- None + +--- + +- DB_REPLICA_MAX_IDLE_CONNECTIONS +- Maximum idle connections allowed for a replica +- 50 + +--- + +- DB_REPLICA_MIN_IDLE_CONNECTIONS +- Minimum idle connections for a replica +- 10 + +--- + +- DB_REPLICA_DEFAULT_IDLE_CONNECTIONS +- Idle connections used if no primary setting is provided +- 10 + +--- + +- DB_REPLICA_MAX_OPEN_CONNECTIONS +- Maximum open connections allowed for a replica +- 200 + +--- + +- DB_REPLICA_MIN_OPEN_CONNECTIONS +- Minimum open connections for a replica +- 50 + +--- + +- DB_REPLICA_DEFAULT_OPEN_CONNECTIONS +- Open connections used if no primary setting is provided +- 100 + +--- + + - DB_CHARSET - The character set for database connection - utf8 diff --git a/pkg/gofr/datasource/dbresolver/circuit_breaker.go b/pkg/gofr/datasource/dbresolver/circuit_breaker.go new file mode 100644 index 000000000..4f7f32fe5 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/circuit_breaker.go @@ -0,0 +1,55 @@ +package dbresolver + +import ( + "sync/atomic" + "time" +) + +// Circuit breaker for replica health with atomic operations. +type circuitBreaker struct { + failures atomic.Int32 + lastFailure atomic.Int64 + state atomic.Int32 // 0=closed, 1=open, 2=half-open. + maxFailures int32 + timeout time.Duration +} + +func newCircuitBreaker(maxFailures int32, timeout time.Duration) *circuitBreaker { + return &circuitBreaker{ + maxFailures: maxFailures, + timeout: timeout, + } +} + +func (cb *circuitBreaker) allowRequest() bool { + state := cb.state.Load() + + switch state { + case circuitStateClosed: + return true + case circuitStateOpen: + if time.Since(time.Unix(0, cb.lastFailure.Load())) > cb.timeout { + return cb.state.CompareAndSwap(circuitStateOpen, circuitStateHalfOpen) + } + + return false + case circuitStateHalfOpen: + return true + default: + return true + } +} + +func (cb *circuitBreaker) recordSuccess() { + cb.failures.Store(0) + cb.state.Store(0) +} + +func (cb *circuitBreaker) recordFailure() { + failures := cb.failures.Add(1) + cb.lastFailure.Store(time.Now().UnixNano()) + + if failures >= cb.maxFailures { + cb.state.Store(1) + } +} diff --git a/pkg/gofr/datasource/dbresolver/options.go b/pkg/gofr/datasource/dbresolver/options.go new file mode 100644 index 000000000..8db622061 --- /dev/null +++ b/pkg/gofr/datasource/dbresolver/options.go @@ -0,0 +1,18 @@ +package dbresolver + +// Option is a function type for configuring the resolver. +type Option func(*Resolver) + +// WithStrategy sets the strategy for the resolver. +func WithStrategy(strategy Strategy) Option { + return func(r *Resolver) { + r.strategy = strategy + } +} + +// WithFallback sets whether to fallback to primary on replica failure. +func WithFallback(fallback bool) Option { + return func(r *Resolver) { + r.readFallback = fallback + } +} diff --git a/pkg/gofr/datasource/dbresolver/resolver.go b/pkg/gofr/datasource/dbresolver/resolver.go index fd12b053a..7e2659082 100644 --- a/pkg/gofr/datasource/dbresolver/resolver.go +++ b/pkg/gofr/datasource/dbresolver/resolver.go @@ -21,8 +21,6 @@ import ( const ( healthStatusUP = "UP" healthStatusDOWN = "DOWN" - roundRobinStrategy = "round-robin" - randomStrategy = "random" circuitStateClosed int32 = 0 circuitStateOpen int32 = 1 circuitStateHalfOpen int32 = 2 @@ -45,55 +43,6 @@ type statistics struct { totalQueries atomic.Uint64 } -// Circuit breaker for replica health with atomic operations. -type circuitBreaker struct { - failures atomic.Int32 - lastFailure atomic.Int64 - state atomic.Int32 // 0=closed, 1=open, 2=half-open. - maxFailures int32 - timeout time.Duration -} - -func newCircuitBreaker(maxFailures int32, timeout time.Duration) *circuitBreaker { - return &circuitBreaker{ - maxFailures: maxFailures, - timeout: timeout, - } -} - -func (cb *circuitBreaker) allowRequest() bool { - state := cb.state.Load() - - switch state { - case circuitStateClosed: - return true - case circuitStateOpen: - if time.Since(time.Unix(0, cb.lastFailure.Load())) > cb.timeout { - return cb.state.CompareAndSwap(circuitStateOpen, circuitStateHalfOpen) - } - - return false - case circuitStateHalfOpen: - return true - default: - return true - } -} - -func (cb *circuitBreaker) recordSuccess() { - cb.failures.Store(0) - cb.state.Store(0) -} - -func (cb *circuitBreaker) recordFailure() { - failures := cb.failures.Add(1) - cb.lastFailure.Store(time.Now().UnixNano()) - - if failures >= cb.maxFailures { - cb.state.Store(1) - } -} - // Replica wrapper with circuit breaker. type replicaWrapper struct { db container.DB @@ -120,23 +69,6 @@ type Resolver struct { once sync.Once } -// Option is a function type for configuring the resolver. -type Option func(*Resolver) - -// WithStrategy sets the strategy for the resolver. -func WithStrategy(strategy Strategy) Option { - return func(r *Resolver) { - r.strategy = strategy - } -} - -// WithFallback sets whether to fallback to primary on replica failure. -func WithFallback(fallback bool) Option { - return func(r *Resolver) { - r.readFallback = fallback - } -} - // NewResolver creates a new Resolver instance with the provided primary and replicas. func NewResolver(primary container.DB, replicas []container.DB, logger Logger, metrics Metrics, opts ...Option) container.DB { // Wrap replicas with circuit breakers diff --git a/pkg/gofr/datasource/dbresolver/strategy_test.go b/pkg/gofr/datasource/dbresolver/strategy_test.go index 9d8d82107..5e71a12d8 100644 --- a/pkg/gofr/datasource/dbresolver/strategy_test.go +++ b/pkg/gofr/datasource/dbresolver/strategy_test.go @@ -122,8 +122,8 @@ func TestRandomStrategy_Choose_NoReplicas(t *testing.T) { func TestStrategy_Name(t *testing.T) { roundRobin := NewRoundRobinStrategy(3) - assert.Equal(t, roundRobinStrategy, roundRobin.Name()) + assert.Equal(t, string(StrategyRoundRobin), roundRobin.Name()) random := NewRandomStrategy() - assert.Equal(t, randomStrategy, random.Name()) + assert.Equal(t, string(StrategyRandom), random.Name()) } diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 58f7c145b..532431e8d 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -15,12 +15,12 @@ import ( ) const ( - maxIdleReplicaCap = 50 - minIdleReplica = 10 - maxOpenReplicaCap = 200 - minOpenReplica = 50 - defaultIdleReplica = 10 - defaultOpenReplica = 100 + maxIdleReplicaCapDefault = 50 + minIdleReplicaDefault = 10 + maxOpenReplicaCapDefault = 200 + minOpenReplicaDefault = 50 + defaultIdleReplicaDefault = 10 + defaultOpenReplicaDefault = 100 ) // AddMongo sets the Mongo datasource in the app's container. @@ -353,42 +353,60 @@ func (c *replicaConfigWrapper) Get(key string) string { } } +func getReplicaConfigInt(cfg config.Config, key string, fallback int) int { + valStr := cfg.Get(key) + if valStr == "" { + return fallback + } + val, err := strconv.Atoi(valStr) + if err != nil || val <= 0 { + return fallback + } + return val +} + func optimizedIdleConnections(cfg config.Config) string { - val, err := strconv.Atoi(cfg.Get("DB_MAX_IDLE_CONNECTION")) + // Load caps from config or fallback to defaults + maxCap := getReplicaConfigInt(cfg, "DB_REPLICA_MAX_IDLE_CONNECTIONS", maxIdleReplicaCapDefault) + minVal := getReplicaConfigInt(cfg, "DB_REPLICA_MIN_IDLE_CONNECTIONS", minIdleReplicaDefault) + defaultVal := getReplicaConfigInt(cfg, "DB_REPLICA_DEFAULT_IDLE_CONNECTIONS", defaultIdleReplicaDefault) + val, err := strconv.Atoi(cfg.Get("DB_MAX_IDLE_CONNECTION")) if err != nil || val <= 0 { - return strconv.Itoa(defaultIdleReplica) + return strconv.Itoa(defaultVal) } optimized := val * 4 - switch { - case optimized > maxIdleReplicaCap: - optimized = maxIdleReplicaCap - case optimized < minIdleReplica: - optimized = minIdleReplica + case optimized > maxCap: + optimized = maxCap + case optimized < minVal: + optimized = minVal } return strconv.Itoa(optimized) } func optimizedOpenConnections(cfg config.Config) string { + // Load caps from config or fallback to defaults + maxCap := getReplicaConfigInt(cfg, "DB_REPLICA_MAX_OPEN_CONNECTIONS", maxOpenReplicaCapDefault) + minVal := getReplicaConfigInt(cfg, "DB_REPLICA_MIN_OPEN_CONNECTIONS", minOpenReplicaDefault) + defaultVal := getReplicaConfigInt(cfg, "DB_REPLICA_DEFAULT_OPEN_CONNECTIONS", defaultOpenReplicaDefault) + val, err := strconv.Atoi(cfg.Get("DB_MAX_OPEN_CONNECTION")) if err != nil { - return strconv.Itoa(defaultOpenReplica) + return strconv.Itoa(defaultVal) } - if val == 0 { - return strconv.Itoa(defaultOpenReplica) + return strconv.Itoa(defaultVal) } optimized := val * 2 - switch { - case optimized > maxOpenReplicaCap: - optimized = maxOpenReplicaCap - case optimized < minOpenReplica: - optimized = minOpenReplica + case optimized > maxCap: + optimized = maxCap + case optimized < minVal: + optimized = minVal } return strconv.Itoa(optimized) From ae3b0d5439ae6a818c1fe17d6c74e9730860e6af Mon Sep 17 00:00:00 2001 From: Umang01-hash Date: Fri, 29 Aug 2025 17:10:01 +0530 Subject: [PATCH 25/25] resolve linters --- pkg/gofr/external_db.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkg/gofr/external_db.go b/pkg/gofr/external_db.go index 532431e8d..0114af936 100644 --- a/pkg/gofr/external_db.go +++ b/pkg/gofr/external_db.go @@ -309,6 +309,7 @@ func createReplicaConnections(cfg config.Config, logger logging.Logger, mtrcs me replica := sql.NewSQL(replicaConfig, logger, mtrcs) if replica != nil { replicas = append(replicas, replica) + logger.Logf("Created DB replica connection to %s:%s as user %s", host, port, user) } } @@ -321,6 +322,7 @@ func safeGet(list []string, i int, fallback string) string { if i < len(list) && strings.TrimSpace(list[i]) != "" { return strings.TrimSpace(list[i]) } + return fallback } @@ -355,13 +357,17 @@ func (c *replicaConfigWrapper) Get(key string) string { func getReplicaConfigInt(cfg config.Config, key string, fallback int) int { valStr := cfg.Get(key) + if valStr == "" { return fallback } + val, err := strconv.Atoi(valStr) + if err != nil || val <= 0 { return fallback } + return val } @@ -372,11 +378,13 @@ func optimizedIdleConnections(cfg config.Config) string { defaultVal := getReplicaConfigInt(cfg, "DB_REPLICA_DEFAULT_IDLE_CONNECTIONS", defaultIdleReplicaDefault) val, err := strconv.Atoi(cfg.Get("DB_MAX_IDLE_CONNECTION")) + if err != nil || val <= 0 { return strconv.Itoa(defaultVal) } optimized := val * 4 + switch { case optimized > maxCap: optimized = maxCap @@ -394,14 +402,17 @@ func optimizedOpenConnections(cfg config.Config) string { defaultVal := getReplicaConfigInt(cfg, "DB_REPLICA_DEFAULT_OPEN_CONNECTIONS", defaultOpenReplicaDefault) val, err := strconv.Atoi(cfg.Get("DB_MAX_OPEN_CONNECTION")) + if err != nil { return strconv.Itoa(defaultVal) } + if val == 0 { return strconv.Itoa(defaultVal) } optimized := val * 2 + switch { case optimized > maxCap: optimized = maxCap