diff --git a/pkg/gofr/datasource/clickhouse/clickhouse.go b/pkg/gofr/datasource/clickhouse/clickhouse.go index 4f24ee5ac..3e21221cf 100644 --- a/pkg/gofr/datasource/clickhouse/clickhouse.go +++ b/pkg/gofr/datasource/clickhouse/clickhouse.go @@ -61,8 +61,8 @@ func (c *client) UseMetrics(metrics interface{}) { // UseTracer sets the tracer for Clickhouse client. func (c *client) UseTracer(tracer any) { - if tracer, ok := tracer.(trace.Tracer); ok { - c.tracer = tracer + if t, ok := tracer.(trace.Tracer); ok { + c.tracer = t } } diff --git a/pkg/gofr/datasource/clickhouse/go.mod b/pkg/gofr/datasource/clickhouse/go.mod index f65655854..2ac283b49 100644 --- a/pkg/gofr/datasource/clickhouse/go.mod +++ b/pkg/gofr/datasource/clickhouse/go.mod @@ -5,6 +5,8 @@ go 1.22 require ( github.com/ClickHouse/clickhouse-go/v2 v2.25.0 github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/otel v1.26.0 + go.opentelemetry.io/otel/trace v1.26.0 go.uber.org/mock v0.4.0 ) @@ -22,8 +24,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect - go.opentelemetry.io/otel v1.26.0 // indirect - go.opentelemetry.io/otel/trace v1.26.0 // indirect golang.org/x/sys v0.18.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/gofr/datasource/pubsub/eventhub/go.mod b/pkg/gofr/datasource/pubsub/eventhub/go.mod index a13d76db3..ddf0a7b95 100644 --- a/pkg/gofr/datasource/pubsub/eventhub/go.mod +++ b/pkg/gofr/datasource/pubsub/eventhub/go.mod @@ -1,4 +1,4 @@ -module gofr.dev/pkg/gofr/datasource/pubsub/azeventhub +module gofr.dev/pkg/gofr/datasource/pubsub/eventhub go 1.22.3 diff --git a/pkg/gofr/gofr.go b/pkg/gofr/gofr.go index 76fc2f708..ab4ae49c4 100644 --- a/pkg/gofr/gofr.go +++ b/pkg/gofr/gofr.go @@ -385,17 +385,6 @@ func (a *App) Migrate(migrationsMap map[int64]migration.Migrate) { } func (a *App) initTracer() { - traceExporter := a.Config.Get("TRACE_EXPORTER") - tracerURL := a.Config.Get("TRACER_URL") - - // deprecated : tracer_host and tracer_port are deprecated and will be removed in upcoming versions. - tracerHost := a.Config.Get("TRACER_HOST") - tracerPort := a.Config.GetOrDefault("TRACER_PORT", "9411") - - if !isValidConfig(a.Logger(), traceExporter, tracerURL, tracerHost, tracerPort) { - return - } - traceRatio, err := strconv.ParseFloat(a.Config.GetOrDefault("TRACER_RATIO", "1"), 64) if err != nil { a.container.Error(err) @@ -412,6 +401,17 @@ func (a *App) initTracer() { otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{})) otel.SetErrorHandler(&otelErrorHandler{logger: a.container.Logger}) + traceExporter := a.Config.Get("TRACE_EXPORTER") + tracerURL := a.Config.Get("TRACER_URL") + + // deprecated : tracer_host and tracer_port are deprecated and will be removed in upcoming versions. + tracerHost := a.Config.Get("TRACER_HOST") + tracerPort := a.Config.GetOrDefault("TRACER_PORT", "9411") + + if !isValidConfig(a.Logger(), traceExporter, tracerURL, tracerHost, tracerPort) { + return + } + exporter, err := a.getExporter(traceExporter, tracerHost, tracerPort, tracerURL) if err != nil {