[test] Replace OT const with OTEL (#4624)

## Which problem is this PR solving? * Part of #3381 * This PR adds `otel trace` spans type to span model ## Short description of the changes - Replace OT const with `otel trace` spans const i.e. `ext.SpanKind..` with `trace.SpanKind..` --------- Signed-off-by: Afzal Ansari <[email protected]> Signed-off-by: Afzal <[email protected]> Co-authored-by: Afzal <[email protected]>
jaegertracing · Aug 4, 2023 · 369219c · 369219c
1 parent ab6732b
commit 369219c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cmd/query/app/handler_options.go b/cmd/query/app/handler_options.go
@@ -61,7 +61,7 @@ func (handlerOptions) QueryLookbackDuration(queryLookbackDuration time.Duration)
 	}
 }
 
-// Tracer creates a HandlerOption that initializes OpenTracing tracer
+// Tracer creates a HandlerOption that passes the tracer to the handler
 func (handlerOptions) Tracer(tracer *jtracer.JTracer) HandlerOption {
 	return func(apiHandler *APIHandler) {
 		apiHandler.tracer = tracer

diff --git a/model/adjuster/span_id_deduper_test.go b/model/adjuster/span_id_deduper_test.go
@@ -18,15 +18,16 @@ package adjuster
 import (
 	"testing"
 
-	"github.com/opentracing/opentracing-go/ext"
 	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/jaegertracing/jaeger/model"
 )
 
 var (
 	clientSpanID  = model.NewSpanID(1)
 	anotherSpanID = model.NewSpanID(11)
+	keySpanKind   = "span.kind"
 )
 
 func newTrace() *model.Trace {
@@ -39,7 +40,7 @@ func newTrace() *model.Trace {
 				SpanID:  clientSpanID,
 				Tags: model.KeyValues{
 					// span.kind = client
-					model.String(string(ext.SpanKind), string(ext.SpanKindRPCClientEnum)),
+					model.String(keySpanKind, trace.SpanKindClient.String()),
 				},
 			},
 			{
@@ -48,7 +49,7 @@ func newTrace() *model.Trace {
 				SpanID:  clientSpanID, // shared span ID
 				Tags: model.KeyValues{
 					// span.kind = server
-					model.String(string(ext.SpanKind), string(ext.SpanKindRPCServerEnum)),
+					model.String(keySpanKind, trace.SpanKindServer.String()),
 				},
 			},
 			{