moving imports to internal package

TykTechnologies · Jul 24, 2023 · 6b84656 · 6b84656
1 parent c3284a5
commit 6b84656
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/gateway/api_loader_test.go b/gateway/api_loader_test.go
@@ -432,7 +432,6 @@ func TestAllApisAreMTLS(t *testing.T) {
 }
 
 func TestOpenTelemetry(t *testing.T) {
-
 	t.Run("Opentelemetry enabled - check if we are sending traces", func(t *testing.T) {
 		otelCollectorMock := httpCollectorMock(t, func(w http.ResponseWriter, r *http.Request) {
 			//check the body
@@ -466,15 +465,19 @@ func TestOpenTelemetry(t *testing.T) {
 			globalConf.OpenTelemetry.SpanProcessorType = "simple"
 		})
 		defer ts.Close()
+		detailedTracing := []bool{true, false}
+		for _, detailed := range detailedTracing {
+			ts.Gw.BuildAndLoadAPI(func(spec *APISpec) {
+				spec.APIID = "test"
+				spec.Proxy.ListenPath = "/my-api/"
+				spec.UseKeylessAccess = true
+				spec.DetailedTracing = detailed
+			})
 
-		ts.Gw.BuildAndLoadAPI(func(spec *APISpec) {
-			spec.APIID = "test"
-			spec.Proxy.ListenPath = "/my-api/"
-			spec.UseKeylessAccess = true
-		})
+			_, _ = ts.Run(t, test.TestCase{Path: "/my-api/", Code: http.StatusOK})
+			assert.Equal(t, "otel", ts.Gw.TracerProvider.Type())
+		}
 
-		_, _ = ts.Run(t, test.TestCase{Path: "/my-api/", Code: http.StatusOK})
-		assert.Equal(t, "otel", ts.Gw.TracerProvider.Type())
 	})
 
 	t.Run("Opentelemetry disabled - check if we are not sending traces", func(t *testing.T) {

diff --git a/gateway/middleware.go b/gateway/middleware.go
@@ -30,8 +30,6 @@ import (
 	"github.com/TykTechnologies/tyk/storage"
 	"github.com/TykTechnologies/tyk/trace"
 	"github.com/TykTechnologies/tyk/user"
-
-	tyktrace "github.com/TykTechnologies/opentelemetry/trace"
 )
 
 const (
@@ -71,14 +69,14 @@ func (tr TraceMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Request,
 	} else if baseMw := tr.Base(); baseMw != nil {
 		cfg := baseMw.Gw.GetConfig()
 		if cfg.OpenTelemetry.Enabled {
-			var span tyktrace.Span
+			var span otel.Span
 			if baseMw.Spec.DetailedTracing {
 				var ctx context.Context
 				ctx, span = baseMw.Gw.TracerProvider.Tracer().Start(r.Context(), tr.Name())
 				defer span.End()
 				setContext(r, ctx)
 			} else {
-				span = tyktrace.SpanFromContext(r.Context())
+				span = otel.SpanFromContext(r.Context())
 			}
 
 			err, i := tr.TykMiddleware.ProcessRequest(w, r, conf)

diff --git a/internal/otel/otel.go b/internal/otel/otel.go
@@ -20,6 +20,8 @@ type (
 	Sampling = otelconfig.Sampling
 
 	SpanAttribute = tyktrace.Attribute
+
+	Span = tyktrace.Span
 )
 
 // HTTP Handlers
@@ -117,3 +119,7 @@ var APIKeyAttribute = semconv.TykAPIKey
 var APIKeyAliasAttribute = semconv.TykAPIKeyAlias
 
 var OAuthClientIDAttribute = semconv.TykOauthID
+
+func SpanFromContext(ctx context.Context) tyktrace.Span {
+	return tyktrace.SpanFromContext(ctx)
+}