diff --git a/go.mod b/go.mod index 5a33f15da..74624cd19 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module go.opentelemetry.io/auto -go 1.21 +go 1.21.0 + +toolchain go1.22.2 retract ( v0.6.5 // Contains retractions only. @@ -18,7 +20,7 @@ retract ( ) require ( - github.com/cilium/ebpf v0.12.3 + github.com/cilium/ebpf v0.15.0 github.com/gin-gonic/gin v1.9.1 github.com/go-logr/logr v1.4.1 github.com/go-logr/stdr v1.2.2 diff --git a/go.sum b/go.sum index 670bba1d4..07b179df3 100644 --- a/go.sum +++ b/go.sum @@ -10,13 +10,11 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4= -github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM= +github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= +github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA= -github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -38,6 +36,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= +github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= diff --git a/internal/pkg/instrumentation/bpf/database/sql/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/database/sql/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/database/sql/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/database/sql/bpf_arm64_bpfel.go index 40214dd13..f41b85538 100644 --- a/internal/pkg/instrumentation/bpf/database/sql/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/database/sql/bpf_arm64_bpfel.go @@ -154,5 +154,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/database/sql/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/database/sql/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/database/sql/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/database/sql/bpf_x86_bpfel.go index a64db6e7d..ccef220f6 100644 --- a/internal/pkg/instrumentation/bpf/database/sql/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/database/sql/bpf_x86_bpfel.go @@ -154,5 +154,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_arm64_bpfel.go index 9ced3bd23..e8a7d26b1 100644 --- a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_arm64_bpfel.go @@ -164,5 +164,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_x86_bpfel.go index 3c08c04c5..4437531d8 100644 --- a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/bpf_x86_bpfel.go @@ -164,5 +164,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_arm64_bpfel.go index c3a289f2c..5cb73fdf5 100644 --- a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_arm64_bpfel.go @@ -157,5 +157,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_x86_bpfel.go index 0bcb52edd..159d1c09a 100644 --- a/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/bpf_x86_bpfel.go @@ -157,5 +157,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_arm64_bpfel.go index 7f92febe4..673c1c47d 100644 --- a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_arm64_bpfel.go @@ -183,5 +183,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_x86_bpfel.go index 143197cce..525428213 100644 --- a/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/bpf_x86_bpfel.go @@ -183,5 +183,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_arm64_bpfel.go index 83b6c6f27..caf70e9c4 100644 --- a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_arm64_bpfel.go @@ -159,5 +159,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_x86_bpfel.go index 3bb15aee7..6d57daf33 100644 --- a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/bpf_x86_bpfel.go @@ -159,5 +159,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_arm64_bpfel.go index db3da7a30..eee00da9b 100644 --- a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_arm64_bpfel.go @@ -155,5 +155,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_x86_bpfel.go index 82872a1d3..3f7905abd 100644 --- a/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_x86_bpfel.go @@ -155,5 +155,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/net/http/client/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/net/http/client/bpf_arm64_bpfel.go index 71f2da972..558afa7e5 100644 --- a/internal/pkg/instrumentation/bpf/net/http/client/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/net/http/client/bpf_arm64_bpfel.go @@ -165,5 +165,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_arm64_bpfel.go index e22fd907e..f69832970 100644 --- a/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_arm64_bpfel.go @@ -165,5 +165,5 @@ func _Bpf_no_tpClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_no_tp_bpfel_arm64.o +//go:embed bpf_no_tp_arm64_bpfel.o var _Bpf_no_tpBytes []byte diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_bpfel_x86.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_x86_bpfel.go index 1df381384..9a7bd67e4 100644 --- a/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_x86_bpfel.go @@ -165,5 +165,5 @@ func _Bpf_no_tpClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_no_tp_bpfel_x86.o +//go:embed bpf_no_tp_x86_bpfel.o var _Bpf_no_tpBytes []byte diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/net/http/client/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/net/http/client/bpf_x86_bpfel.go index e77cf8f80..ac5111885 100644 --- a/internal/pkg/instrumentation/bpf/net/http/client/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/net/http/client/bpf_x86_bpfel.go @@ -165,5 +165,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/net/http/server/bpf_bpfel_arm64.go b/internal/pkg/instrumentation/bpf/net/http/server/bpf_arm64_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/net/http/server/bpf_bpfel_arm64.go rename to internal/pkg/instrumentation/bpf/net/http/server/bpf_arm64_bpfel.go index 2848ba5df..95c1e1a41 100644 --- a/internal/pkg/instrumentation/bpf/net/http/server/bpf_bpfel_arm64.go +++ b/internal/pkg/instrumentation/bpf/net/http/server/bpf_arm64_bpfel.go @@ -165,5 +165,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_arm64.o +//go:embed bpf_arm64_bpfel.o var _BpfBytes []byte diff --git a/internal/pkg/instrumentation/bpf/net/http/server/bpf_bpfel_x86.go b/internal/pkg/instrumentation/bpf/net/http/server/bpf_x86_bpfel.go similarity index 99% rename from internal/pkg/instrumentation/bpf/net/http/server/bpf_bpfel_x86.go rename to internal/pkg/instrumentation/bpf/net/http/server/bpf_x86_bpfel.go index c15dd8468..89bc4ad21 100644 --- a/internal/pkg/instrumentation/bpf/net/http/server/bpf_bpfel_x86.go +++ b/internal/pkg/instrumentation/bpf/net/http/server/bpf_x86_bpfel.go @@ -165,5 +165,5 @@ func _BpfClose(closers ...io.Closer) error { // Do not access this directly. // -//go:embed bpf_bpfel_x86.o +//go:embed bpf_x86_bpfel.o var _BpfBytes []byte diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 324df267c..e8d23c921 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,8 @@ module go.opentelemetry.io/auto/internal/tools -go 1.21 +go 1.21.0 + +toolchain go1.22.2 require ( github.com/docker/docker v26.1.0+incompatible