[PoC] Enable auto/sdk in otel global

MrAlias · MrAlias · commit 2cc75b04f400 · 2024-12-10T14:21:55.000-08:00
diff --git a/internal/pkg/inject/offset_results.json b/internal/pkg/inject/offset_results.json
@@ -941,7 +941,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
@@ -1039,7 +1040,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
@@ -1137,7 +1139,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
@@ -1240,7 +1243,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
@@ -1343,7 +1347,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
@@ -1436,7 +1441,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
@@ -1529,7 +1535,8 @@
                       "1.29.0",
                       "1.30.0",
                       "1.31.0",
-                      "1.32.0"
+                      "1.32.0",
+                      "1.32.1-0.20241210212144-ac386f383cdf"
                     ]
                   }
                 ]
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
@@ -23,6 +23,9 @@ char __license[] SEC("license") = "Dual MIT/GPL";
 #define MAX_BUCKETS 8
 #define MAX_TRACERS 64
 
+// Records state of our write to auto-instrumentation flag.
+bool wrote_flag = false;
+
 struct span_description_t {
     char buf[MAX_STATUS_DESCRIPTION_LEN];
 };
@@ -388,6 +391,33 @@ static __always_inline long fill_tracer_id(tracer_id_t *tracer_id, go_tracer_ptr
     return 0;
 }
 
+// This instrumentation attaches uprobe to the following function:
+// func (t *tracer) newSpan(ctx context.Context, autoSpan *bool, name string, opts []trace.SpanStartOption) (context.Context, trace.Span) {
+// https://github.com/open-telemetry/opentelemetry-go/blob/ac386f383cdfc14f546b4e55e8726a0a45e8a409/internal/global/trace.go#L161
+SEC("uprobe/newSpan")
+int uprobe_newStart(struct pt_regs *ctx) {
+    if (wrote_flag) {
+        // Already wrote flag value.
+        return 0;
+    }
+
+    void *flag_ptr = get_argument(ctx, 4);
+    if (flag_ptr == NULL) {
+        bpf_printk("invalid flag_ptr: NULL");
+        return -1;
+    }
+
+    bool true_value = true;
+    long res = bpf_probe_write_user(flag_ptr, &true_value, sizeof(bool));
+    if (res != 0) {
+        bpf_printk("failed to write bool flag value: %ld", res);
+        return -2;
+    }
+
+    wrote_flag = true;
+    return 0;
+}
+
 // This instrumentation attaches uprobe to the following function:
 // func (t *tracer) Start(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span)
 // https://github.com/open-telemetry/opentelemetry-go/blob/98b32a6c3a87fbee5d34c063b9096f416b250897/internal/global/trace.go#L149
diff --git a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_arm64_bpfel.go b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_arm64_bpfel.go
diff --git a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_x86_bpfel.go b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_x86_bpfel.go
diff --git a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/probe.go b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/probe.go
@@ -108,6 +108,10 @@ func New(logger *slog.Logger) probe.Probe {
 				tracerIDContainsScopeAttributes{},
 			},
 			Uprobes: []probe.Uprobe{
+				{
+					Sym:        "go.opentelemetry.io/otel/internal/global.(*tracer).newSpan",
+					EntryProbe: "uprobe_newStart",
+				},
 				{
 					Sym:         "go.opentelemetry.io/otel/internal/global.(*tracer).Start",
 					EntryProbe:  "uprobe_Start",
diff --git a/internal/test/e2e/autosdk/go.mod b/internal/test/e2e/autosdk/go.mod
@@ -3,9 +3,16 @@ module go.opentelemetry.io/auto/internal/test/e2e/autosdk
 go 1.22.0
 
 require (
-	go.opentelemetry.io/auto/sdk v1.1.0
-	go.opentelemetry.io/otel v1.32.0
+	go.opentelemetry.io/otel v1.32.1-0.20241210212144-ac386f383cdf
 	go.opentelemetry.io/otel/trace v1.32.0
 )
 
+require (
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+)
+
 replace go.opentelemetry.io/auto/sdk => ../../../../sdk/
diff --git a/internal/test/e2e/autosdk/go.sum b/internal/test/e2e/autosdk/go.sum
@@ -1,5 +1,10 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -8,6 +13,10 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
 go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel v1.32.1-0.20241210212144-ac386f383cdf h1:UdjRouPHKYAwmq0PNPIR+XH1gtolmJTBhkvufgwQS/g=
+go.opentelemetry.io/otel v1.32.1-0.20241210212144-ac386f383cdf/go.mod h1:TV/DhW5+BLw6Z88V8qkXPPjIrjOYagH9a6HmSRrnNP0=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
 go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
 go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/internal/test/e2e/autosdk/main.go b/internal/test/e2e/autosdk/main.go
@@ -10,11 +10,10 @@ import (
 	"os/signal"
 	"time"
 
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
-
-	"go.opentelemetry.io/auto/sdk"
 )
 
 const (
@@ -79,7 +78,7 @@ func main() {
 	// give time for auto-instrumentation to start up
 	time.Sleep(5 * time.Second)
 
-	provider := sdk.TracerProvider()
+	provider := otel.GetTracerProvider()
 	tracer := provider.Tracer(
 		pkgName,
 		trace.WithInstrumentationVersion(pkgVer),

Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,8 @@`
`941`	`941`	`"1.29.0",`
`942`	`942`	`"1.30.0",`
`943`	`943`	`"1.31.0",`
`944`		`- "1.32.0"`
	`944`	`+ "1.32.0",`
	`945`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`945`	`946`	`]`
`946`	`947`	`}`
`947`	`948`	`]`
`@@ -1039,7 +1040,8 @@`
`1039`	`1040`	`"1.29.0",`
`1040`	`1041`	`"1.30.0",`
`1041`	`1042`	`"1.31.0",`
`1042`		`- "1.32.0"`
	`1043`	`+ "1.32.0",`
	`1044`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`1043`	`1045`	`]`
`1044`	`1046`	`}`
`1045`	`1047`	`]`
`@@ -1137,7 +1139,8 @@`
`1137`	`1139`	`"1.29.0",`
`1138`	`1140`	`"1.30.0",`
`1139`	`1141`	`"1.31.0",`
`1140`		`- "1.32.0"`
	`1142`	`+ "1.32.0",`
	`1143`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`1141`	`1144`	`]`
`1142`	`1145`	`}`
`1143`	`1146`	`]`
`@@ -1240,7 +1243,8 @@`
`1240`	`1243`	`"1.29.0",`
`1241`	`1244`	`"1.30.0",`
`1242`	`1245`	`"1.31.0",`
`1243`		`- "1.32.0"`
	`1246`	`+ "1.32.0",`
	`1247`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`1244`	`1248`	`]`
`1245`	`1249`	`}`
`1246`	`1250`	`]`
`@@ -1343,7 +1347,8 @@`
`1343`	`1347`	`"1.29.0",`
`1344`	`1348`	`"1.30.0",`
`1345`	`1349`	`"1.31.0",`
`1346`		`- "1.32.0"`
	`1350`	`+ "1.32.0",`
	`1351`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`1347`	`1352`	`]`
`1348`	`1353`	`}`
`1349`	`1354`	`]`
`@@ -1436,7 +1441,8 @@`
`1436`	`1441`	`"1.29.0",`
`1437`	`1442`	`"1.30.0",`
`1438`	`1443`	`"1.31.0",`
`1439`		`- "1.32.0"`
	`1444`	`+ "1.32.0",`
	`1445`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`1440`	`1446`	`]`
`1441`	`1447`	`}`
`1442`	`1448`	`]`
`@@ -1529,7 +1535,8 @@`
`1529`	`1535`	`"1.29.0",`
`1530`	`1536`	`"1.30.0",`
`1531`	`1537`	`"1.31.0",`
`1532`		`- "1.32.0"`
	`1538`	`+ "1.32.0",`
	`1539`	`+ "1.32.1-0.20241210212144-ac386f383cdf"`
`1533`	`1540`	`]`
`1534`	`1541`	`}`
`1535`	`1542`	`]`