fix(otelglobal): use correct SetName arg offsets and simplify tests

open-telemetry · Jan 11, 2024 · 3c8c55f · 3c8c55f
1 parent 7cc2452
commit 3c8c55f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf/probe.bpf.c b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf/probe.bpf.c
@@ -179,12 +179,12 @@ int uprobe_SetName(struct pt_regs *ctx) {
         return 0;
     }
 
-    void *span_name_ptr = get_argument(ctx, 4);
+    void *span_name_ptr = get_argument(ctx, 2);
     if (span_name_ptr == NULL) {
         return 0;
     }
 
-    void *span_name_len_ptr = get_argument(ctx, 5);
+    void *span_name_len_ptr = get_argument(ctx, 3);
     if (span_name_len_ptr == NULL) {
         return 0;
     }

diff --git a/internal/test/e2e/otelglobal/main.go b/internal/test/e2e/otelglobal/main.go
@@ -29,21 +29,14 @@ func innerFunction(ctx context.Context) {
 	defer span.End()
 
 	span.SetAttributes(attribute.String("inner.key", "inner.value"))
-}
-
-func setNameOverride(ctx context.Context) {
-	_, span := tracer.Start(ctx, "SetNameOriginal")
-	defer span.End()
-
-	span.SetName("SetNameOverride")
+	span.SetName("child override")
 }
 
 func createMainSpan(ctx context.Context) {
 	ctx, span := tracer.Start(ctx, "parent")
 	defer span.End()
 
 	innerFunction(ctx)
-	setNameOverride(ctx)
 
 	intAttr := attribute.Int("int_key", 42)
 	strAttr := attribute.String("string_key", "forty-two")

diff --git a/internal/test/e2e/otelglobal/traces.json b/internal/test/e2e/otelglobal/traces.json
@@ -59,16 +59,7 @@
                 }
               ],
               "kind": 3,
-              "name": "child",
-              "parentSpanId": "xxxxx",
-              "spanId": "xxxxx",
-              "status": {},
-              "traceId": "xxxxx"
-            },
-            {
-              "attributes": [],
-              "kind": 3,
-              "name": "SetNameOverride",
+              "name": "child override",
               "parentSpanId": "xxxxx",
               "spanId": "xxxxx",
               "status": {},