minor modification around pointers and versions

Signed-off-by: Afzal Ansari <[email protected]>
jaegertracing · Jul 18, 2023 · 8e96af8 · 8e96af8
1 parent 7e157eb
commit 8e96af8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
 }