fix: refactoring

Author: SkArchon

router-tests/telemetry/telemetry_test.go

@@ -9140,7 +9140,51 @@ func TestTelemetryExpressions(t *testing.T) {
 		assert.ErrorContains(t, err, "failed to build base mux: line 1, column 17: type expr.SubgraphRequest has no field clientTrace2")
 	})
 
-	t.Run("verify expression is correctly evaluated", func(t *testing.T) {
+	t.Run("verify name and id expressions", func(t *testing.T) {
+		t.Parallel()
+		metricReader := metric.NewManualReader()
+		exporter := tracetest.NewInMemoryExporter(t)
+
+		testenv.Run(t, &testenv.Config{
+			TraceExporter: exporter,
+			MetricReader:  metricReader,
+			SubgraphTracingOptions: &core.SubgraphTracingOptions{
+				ExpressionAttributes: []core.ExpressionAttribute{
+					{
+						Key:        "sg_name",
+						Expression: "subgraph.name",
+					},
+					{
+						Key:        "sg_id",
+						Expression: "subgraph.id",
+					},
+				},
+			},
+		}, func(t *testing.T, xEnv *testenv.Environment) {
+			xEnv.MakeGraphQLRequestOK(testenv.GraphQLRequest{
+				Query:  `query employees { employees { id details { forename surname } notes } }`,
+				Header: map[string][]string{"service-name": {"service-name"}},
+			})
+
+			sn := exporter.GetSpans().Snapshots()
+			engineFetchSpan := sn[6]
+			require.Equal(t, "Engine - Fetch", engineFetchSpan.Name())
+			require.Equal(t, trace.SpanKindInternal, engineFetchSpan.SpanKind())
+
+			attributes := engineFetchSpan.Attributes()
+			exprAttributes := attributes[14:]
+
+			require.Len(t, exprAttributes, 2)
+
+			sgName := findAttr(exprAttributes, "sg_name")
+			require.Equal(t, "employees", sgName.Value.AsString())
+
+			sgId := findAttr(exprAttributes, "sg_id")
+			require.Equal(t, "0", sgId.Value.AsString())
+		})
+	})
+
+	t.Run("verify available clientTrace expression are correctly evaluated", func(t *testing.T) {
 		t.Parallel()
 		metricReader := metric.NewManualReader()
 		exporter := tracetest.NewInMemoryExporter(t)
@@ -9260,7 +9304,7 @@ func TestTelemetryExpressions(t *testing.T) {
 				ExpressionAttributes: []core.ExpressionAttribute{
 					{
 						Key:        "tls_start",
-						Expression: "subgraph.operation.trace.tlsStart?.time",
+						Expression: "subgraph.request.clientTrace.tlsStart?.time",
 					},
 				},
 			},
@@ -9276,9 +9320,10 @@ func TestTelemetryExpressions(t *testing.T) {
 			require.Equal(t, trace.SpanKindInternal, engineFetchSpan.SpanKind())
 
 			attributes := engineFetchSpan.Attributes()
-			exprAttributes := attributes[0:]
 
-			attr := findAttr(exprAttributes, "tls_start")
+			require.Len(t, attributes[14:], 0)
+
+			attr := findAttr(attributes, "tls_start")
 			require.False(t, attr.Valid())
 		})
 	})
@@ -9295,7 +9340,7 @@ func TestTelemetryExpressions(t *testing.T) {
 				ExpressionAttributes: []core.ExpressionAttribute{
 					{
 						Key:        "wrote_headers",
-						Expression: "subgraph.operation.trace.wroteHeaders?.time",
+						Expression: "subgraph.request.clientTrace.wroteHeaders?.time",
 					},
 				},
 			},

router/core/access_log_field_handler_test.go

@@ -122,9 +122,9 @@ func TestAccessLogsFieldHandler(t *testing.T) {
 		)
 
 		expressionResponse := response[1]
-		require.IsType(t, &ExprWrapError{}, expressionResponse.Interface)
+		require.IsType(t, &expr.WrapError{}, expressionResponse.Interface)
 		require.Equal(t, expressionResponseKey, expressionResponse.Key)
-		require.Equal(t, &ExprWrapError{requestError}, expressionResponse.Interface)
+		require.Equal(t, &expr.WrapError{requestError}, expressionResponse.Interface)
 	})
 
 }

router/pkg/config/fixtures/full.yaml

@@ -86,6 +86,11 @@ compliance:
 telemetry:
   # Common options
   service_name: "cosmo-router"
+  subgraph:
+    attributes:
+      - key: "wg.tracing.custom.conn.subgraph.hostport"
+        value_from:
+          expression: "subgraph.request.clientTrace.connCreate.hostPort"
 
   # If no exporter is specified it uses https://cosmo-otel.wundergraph.com for tracing and metrics
 
@@ -115,10 +120,6 @@ telemetry:
         export_timeout: 30s
         path: "/v1/traces"
         headers: {}
-    subgraph:
-      attributes:
-        - key: "wg.tracing.custom.conn.subgraph.hostport"
-          expression: "subgraph.operation.trace.conn.create.hostPort"
 
   # OpenTelemetry Metrics
   metrics:

router/pkg/config/testdata/config_defaults.json

@@ -8,6 +8,9 @@
   "Telemetry": {
     "ServiceName": "cosmo-router",
     "Attributes": null,
+    "Subgraph": {
+      "Attributes": null
+    },
     "ResourceAttributes": null,
     "Tracing": {
       "Enabled": true,
@@ -25,9 +28,6 @@
         "Enabled": false,
         "HeaderName": "x-wg-trace-id"
       },
-      "Subgraph": {
-        "Attributes": null
-      },
       "ExportGraphQLVariables": false,
       "WithNewRoot": false
     },

router/pkg/config/testdata/config_full.json

@@ -8,6 +8,20 @@
   "Telemetry": {
     "ServiceName": "cosmo-router",
     "Attributes": null,
+    "Subgraph": {
+      "Attributes": [
+        {
+          "Key": "wg.tracing.custom.conn.subgraph.hostport",
+          "Default": "",
+          "ValueFrom": {
+            "RequestHeader": "",
+            "ContextField": "",
+            "ResponseHeader": "",
+            "Expression": "subgraph.request.clientTrace.connCreate.hostPort"
+          }
+        }
+      ]
+    },
     "ResourceAttributes": null,
     "Tracing": {
       "Enabled": true,
@@ -35,14 +49,6 @@
         "Enabled": false,
         "HeaderName": "x-wg-trace-id"
       },
-      "Subgraph": {
-        "Attributes": [
-          {
-            "Key": "wg.tracing.custom.conn.subgraph.hostport",
-            "Expression": "subgraph.operation.trace.conn.create.hostPort"
-          }
-        ]
-      },
       "ExportGraphQLVariables": true,
       "WithNewRoot": false
     },