Use otelglobal e2e test

MrAlias · MrAlias · commit 0fa0bd8051d5 · 2024-12-10T14:36:28.000-08:00
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
@@ -111,6 +111,7 @@ func New(logger *slog.Logger) probe.Probe {
 				{
 					Sym:        "go.opentelemetry.io/otel/internal/global.(*tracer).newSpan",
 					EntryProbe: "uprobe_newStart",
+					Optional:   true,
 				},
 				{
 					Sym:         "go.opentelemetry.io/otel/internal/global.(*tracer).Start",
diff --git a/internal/test/e2e/autosdk/go.mod b/internal/test/e2e/autosdk/go.mod
@@ -3,16 +3,9 @@ module go.opentelemetry.io/auto/internal/test/e2e/autosdk
 go 1.22.0
 
 require (
-	go.opentelemetry.io/otel v1.32.1-0.20241210212144-ac386f383cdf
+	go.opentelemetry.io/auto/sdk v1.1.0
+	go.opentelemetry.io/otel v1.32.0
 	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,10 +1,5 @@
 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=
@@ -13,10 +8,6 @@ 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,10 +10,11 @@ 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 (
@@ -78,7 +79,7 @@ func main() {
 	// give time for auto-instrumentation to start up
 	time.Sleep(5 * time.Second)
 
-	provider := otel.GetTracerProvider()
+	provider := sdk.TracerProvider()
 	tracer := provider.Tracer(
 		pkgName,
 		trace.WithInstrumentationVersion(pkgVer),
diff --git a/internal/test/e2e/otelglobal/go.mod b/internal/test/e2e/otelglobal/go.mod
@@ -3,12 +3,13 @@ module go.opentelemetry.io/auto/internal/test/e2e/otelglobal
 go 1.22.0
 
 require (
-	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
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/otel/metric v1.32.0 // indirect
 )
diff --git a/internal/test/e2e/otelglobal/go.sum b/internal/test/e2e/otelglobal/go.sum
@@ -11,8 +11,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 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=

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ func New(logger *slog.Logger) probe.Probe {`
`111`	`111`	`{`
`112`	`112`	`Sym: "go.opentelemetry.io/otel/internal/global.(*tracer).newSpan",`
`113`	`113`	`EntryProbe: "uprobe_newStart",`
	`114`	`+ Optional: true,`
`114`	`115`	`},`
`115`	`116`	`{`
`116`	`117`	`Sym: "go.opentelemetry.io/otel/internal/global.(*tracer).Start",`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,13 @@ module go.opentelemetry.io/auto/internal/test/e2e/otelglobal`
`3`	`3`	`go 1.22.0`
`4`	`4`
`5`	`5`	`require (`
`6`		`- go.opentelemetry.io/otel v1.32.0`
	`6`	`+ go.opentelemetry.io/otel v1.32.1-0.20241210212144-ac386f383cdf`
`7`	`7`	`go.opentelemetry.io/otel/trace v1.32.0`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`require (`
`11`	`11`	`github.com/go-logr/logr v1.4.2 // indirect`
`12`	`12`	`github.com/go-logr/stdr v1.2.2 // indirect`
	`13`	`+ go.opentelemetry.io/auto/sdk v1.1.0 // indirect`
`13`	`14`	`go.opentelemetry.io/otel/metric v1.32.0 // indirect`
`14`	`15`	`)`