@@ -24,7 +24,6 @@ import (
2424 "testing"
2525 "time"
2626
27- "github.com/opentracing/opentracing-go"
2827 "github.com/stretchr/testify/assert"
2928 "github.com/stretchr/testify/mock"
3029 "github.com/stretchr/testify/require"
@@ -40,6 +39,7 @@ import (
4039 "github.com/jaegertracing/jaeger/model"
4140 "github.com/jaegertracing/jaeger/pkg/config/tlscfg"
4241 "github.com/jaegertracing/jaeger/pkg/healthcheck"
42+ "github.com/jaegertracing/jaeger/pkg/jtracer"
4343 "github.com/jaegertracing/jaeger/pkg/tenancy"
4444 "github.com/jaegertracing/jaeger/ports"
4545 "github.com/jaegertracing/jaeger/proto-gen/api_v2"
@@ -69,7 +69,7 @@ func TestCreateTLSServerSinglePortError(t *testing.T) {
6969
7070 _ , err := NewServer (zap .NewNop (), & querysvc.QueryService {}, nil ,
7171 & QueryOptions {HTTPHostPort : ":8080" , GRPCHostPort : ":8080" , TLSGRPC : tlsCfg , TLSHTTP : tlsCfg },
72- tenancy .NewManager (& tenancy.Options {}), opentracing. NoopTracer {} )
72+ tenancy .NewManager (& tenancy.Options {}), jtracer . NoOp () )
7373 assert .NotNil (t , err )
7474}
7575
@@ -83,7 +83,7 @@ func TestCreateTLSGrpcServerError(t *testing.T) {
8383
8484 _ , err := NewServer (zap .NewNop (), & querysvc.QueryService {}, nil ,
8585 & QueryOptions {HTTPHostPort : ":8080" , GRPCHostPort : ":8081" , TLSGRPC : tlsCfg },
86- tenancy .NewManager (& tenancy.Options {}), opentracing. NoopTracer {} )
86+ tenancy .NewManager (& tenancy.Options {}), jtracer . NoOp () )
8787 assert .NotNil (t , err )
8888}
8989
@@ -97,7 +97,7 @@ func TestCreateTLSHttpServerError(t *testing.T) {
9797
9898 _ , err := NewServer (zap .NewNop (), & querysvc.QueryService {}, nil ,
9999 & QueryOptions {HTTPHostPort : ":8080" , GRPCHostPort : ":8081" , TLSHTTP : tlsCfg },
100- tenancy .NewManager (& tenancy.Options {}), opentracing. NoopTracer {} )
100+ tenancy .NewManager (& tenancy.Options {}), jtracer . NoOp () )
101101 assert .NotNil (t , err )
102102}
103103
@@ -340,7 +340,7 @@ func TestServerHTTPTLS(t *testing.T) {
340340 querySvc := querysvc .NewQueryService (spanReader , dependencyReader , querysvc.QueryServiceOptions {})
341341 server , err := NewServer (flagsSvc .Logger , querySvc , nil ,
342342 serverOptions , tenancy .NewManager (& tenancy.Options {}),
343- opentracing. NoopTracer {} )
343+ jtracer . NoOp () )
344344 assert .Nil (t , err )
345345 assert .NoError (t , server .Start ())
346346
@@ -500,7 +500,7 @@ func TestServerGRPCTLS(t *testing.T) {
500500 querySvc := querysvc .NewQueryService (spanReader , dependencyReader , querysvc.QueryServiceOptions {})
501501 server , err := NewServer (flagsSvc .Logger , querySvc , nil ,
502502 serverOptions , tenancy .NewManager (& tenancy.Options {}),
503- opentracing. NoopTracer {} )
503+ jtracer . NoOp () )
504504 assert .Nil (t , err )
505505 assert .NoError (t , server .Start ())
506506
@@ -555,13 +555,13 @@ func TestServerBadHostPort(t *testing.T) {
555555 _ , err := NewServer (zap .NewNop (), & querysvc.QueryService {}, nil ,
556556 & QueryOptions {HTTPHostPort : "8080" , GRPCHostPort : "127.0.0.1:8081" , BearerTokenPropagation : true },
557557 tenancy .NewManager (& tenancy.Options {}),
558- opentracing. NoopTracer {} )
558+ jtracer . NoOp () )
559559
560560 assert .NotNil (t , err )
561561 _ , err = NewServer (zap .NewNop (), & querysvc.QueryService {}, nil ,
562562 & QueryOptions {HTTPHostPort : "127.0.0.1:8081" , GRPCHostPort : "9123" , BearerTokenPropagation : true },
563563 tenancy .NewManager (& tenancy.Options {}),
564- opentracing. NoopTracer {} )
564+ jtracer . NoOp () )
565565
566566 assert .NotNil (t , err )
567567}
@@ -592,7 +592,7 @@ func TestServerInUseHostPort(t *testing.T) {
592592 BearerTokenPropagation : true ,
593593 },
594594 tenancy .NewManager (& tenancy.Options {}),
595- opentracing. NoopTracer {} ,
595+ jtracer . NoOp () ,
596596 )
597597 assert .NoError (t , err )
598598
@@ -622,7 +622,7 @@ func TestServerSinglePort(t *testing.T) {
622622 server , err := NewServer (flagsSvc .Logger , querySvc , nil ,
623623 & QueryOptions {GRPCHostPort : hostPort , HTTPHostPort : hostPort , BearerTokenPropagation : true },
624624 tenancy .NewManager (& tenancy.Options {}),
625- opentracing. NoopTracer {} )
625+ jtracer . NoOp () )
626626 assert .Nil (t , err )
627627 assert .NoError (t , server .Start ())
628628
@@ -668,7 +668,7 @@ func TestServerGracefulExit(t *testing.T) {
668668 hostPort := ports .PortToHostPort (ports .QueryAdminHTTP )
669669
670670 querySvc := & querysvc.QueryService {}
671- tracer := opentracing. NoopTracer {}
671+ tracer := jtracer . NoOp ()
672672
673673 server , err := NewServer (flagsSvc .Logger , querySvc , nil , & QueryOptions {GRPCHostPort : hostPort , HTTPHostPort : hostPort },
674674 tenancy .NewManager (& tenancy.Options {}), tracer )
@@ -697,7 +697,7 @@ func TestServerHandlesPortZero(t *testing.T) {
697697 flagsSvc .Logger = zap .New (zapCore )
698698
699699 querySvc := & querysvc.QueryService {}
700- tracer := opentracing. NoopTracer {}
700+ tracer := jtracer . NoOp ()
701701 server , err := NewServer (flagsSvc .Logger , querySvc , nil ,
702702 & QueryOptions {GRPCHostPort : ":0" , HTTPHostPort : ":0" },
703703 tenancy .NewManager (& tenancy.Options {}),
@@ -759,7 +759,7 @@ func TestServerHTTPTenancy(t *testing.T) {
759759 querySvc := querysvc .NewQueryService (spanReader , dependencyReader , querysvc.QueryServiceOptions {})
760760 server , err := NewServer (zap .NewNop (), querySvc , nil ,
761761 serverOptions , tenancyMgr ,
762- opentracing. NoopTracer {} )
762+ jtracer . NoOp () )
763763 require .Nil (t , err )
764764 require .NoError (t , server .Start ())
765765
0 commit comments