From 8e96af8c9f99b50f918d8400259fcfede93a0868 Mon Sep 17 00:00:00 2001 From: Afzal Ansari Date: Tue, 18 Jul 2023 05:26:20 +0000 Subject: [PATCH] minor modification around pointers and versions Signed-off-by: Afzal Ansari --- cmd/all-in-one/all_in_one_test.go | 2 +- cmd/all-in-one/main.go | 6 +++--- cmd/query/app/http_handler_test.go | 4 ++-- pkg/jtracer/jtracer.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/all-in-one/all_in_one_test.go b/cmd/all-in-one/all_in_one_test.go index 6d1675f56fa..c71914837b2 100644 --- a/cmd/all-in-one/all_in_one_test.go +++ b/cmd/all-in-one/all_in_one_test.go @@ -126,7 +126,7 @@ func getSamplingStrategy(t *testing.T) { resp.Body.Close() assert.NotNil(t, queryResponse.ProbabilisticSampling) - assert.EqualValues(t, 1, queryResponse.ProbabilisticSampling.SamplingRate) + assert.EqualValues(t, 1.0, queryResponse.ProbabilisticSampling.SamplingRate) } func healthCheck(t *testing.T) { diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go index a9c24f0976b..64a584edce6 100644 --- a/cmd/all-in-one/main.go +++ b/cmd/all-in-one/main.go @@ -197,7 +197,7 @@ by default uses only in-memory database.`, querySrv := startQuery( svc, qOpts, qOpts.BuildQueryServiceOptions(storageFactory, logger), spanReader, dependencyReader, metricsQueryService, - metricsFactory, tm, *tracer, + metricsFactory, tm, tracer, ) svc.RunAndThen(func() { @@ -273,11 +273,11 @@ func startQuery( metricsQueryService querysvc.MetricsQueryService, baseFactory metrics.Factory, tm *tenancy.Manager, - jt jtracer.JTracer, + jt *jtracer.JTracer, ) *queryApp.Server { spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, baseFactory.Namespace(metrics.NSOptions{Name: "query"})) qs := querysvc.NewQueryService(spanReader, depReader, *queryOpts) - server, err := queryApp.NewServer(svc.Logger, qs, metricsQueryService, qOpts, tm, jt) + server, err := queryApp.NewServer(svc.Logger, qs, metricsQueryService, qOpts, tm, *jt) if err != nil { svc.Logger.Fatal("Could not start jaeger-query service", zap.Error(err)) } diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go index cee3b4bc800..e1d2f091bea 100644 --- a/cmd/query/app/http_handler_test.go +++ b/cmd/query/app/http_handler_test.go @@ -311,8 +311,8 @@ func TestGetTrace(t *testing.T) { sdktrace.WithSampler(sdktrace.AlwaysSample()), ) // Use the bridgeTracer as OpenTracing tracer(otTrace). - otTracer, _ := otbridge.NewTracerPair(tracerProvider.Tracer("")) - jTracer := jtracer.JTracer{OT: otTracer, OTEL: tracerProvider} + otTracer, wrappedTracerProvider := otbridge.NewTracerPair(tracerProvider.Tracer("")) + jTracer := jtracer.JTracer{OT: otTracer, OTEL: wrappedTracerProvider} ts := initializeTestServer(HandlerOptions.Tracer(jTracer)) defer ts.server.Close() diff --git a/pkg/jtracer/jtracer.go b/pkg/jtracer/jtracer.go index bf49f61e571..55a5e84ab24 100644 --- a/pkg/jtracer/jtracer.go +++ b/pkg/jtracer/jtracer.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.4.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" ) @@ -106,6 +106,6 @@ func otelExporter(ctx context.Context) (sdktrace.SpanExporter, error) { } // Shutdown the tracerProvider to clean up resources -func (jt JTracer) Close(ctx context.Context) error { +func (jt *JTracer) Close(ctx context.Context) error { return jt.closer(ctx) }