From 4d3911b8f75f95d87a70b242b83328b5482ce591 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 11 Jan 2024 12:42:47 -0800 Subject: [PATCH 1/5] Bump detector semconv to v1.24.0 --- detectors/aws/ec2/ec2.go | 2 +- detectors/aws/ec2/ec2_test.go | 2 +- detectors/aws/ec2/go.mod | 2 +- detectors/aws/ec2/go.sum | 4 ++-- detectors/aws/ecs/ecs.go | 2 +- detectors/aws/ecs/ecs_test.go | 2 +- detectors/aws/ecs/go.mod | 2 +- detectors/aws/ecs/go.sum | 4 ++-- detectors/aws/ecs/test/ecs_test.go | 2 +- detectors/aws/eks/detector.go | 2 +- detectors/aws/eks/detector_test.go | 2 +- detectors/aws/eks/go.mod | 2 +- detectors/aws/eks/go.sum | 4 ++-- detectors/aws/lambda/detector.go | 2 +- detectors/aws/lambda/detector_test.go | 2 +- detectors/aws/lambda/go.mod | 2 +- detectors/aws/lambda/go.sum | 4 ++-- detectors/gcp/cloud-function.go | 2 +- detectors/gcp/cloud-function_test.go | 2 +- detectors/gcp/cloud-run.go | 2 +- detectors/gcp/detector.go | 2 +- detectors/gcp/detector_test.go | 2 +- detectors/gcp/gce.go | 2 +- detectors/gcp/gke.go | 2 +- detectors/gcp/go.mod | 2 +- detectors/gcp/go.sum | 4 ++-- .../github.com/aws/aws-lambda-go/otellambda/example/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/example/go.sum | 4 ++-- .../github.com/aws/aws-lambda-go/otellambda/test/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/test/go.sum | 4 ++-- .../aws/aws-lambda-go/otellambda/test/lambda_test.go | 2 +- .../github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum | 4 ++-- 33 files changed, 41 insertions(+), 41 deletions(-) diff --git a/detectors/aws/ec2/ec2.go b/detectors/aws/ec2/ec2.go index f0c10c3218f..27b44bda94c 100644 --- a/detectors/aws/ec2/ec2.go +++ b/detectors/aws/ec2/ec2.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) type config struct { diff --git a/detectors/aws/ec2/ec2_test.go b/detectors/aws/ec2/ec2_test.go index b489ebeef1d..e1cbd684ac4 100644 --- a/detectors/aws/ec2/ec2_test.go +++ b/detectors/aws/ec2/ec2_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) func TestAWS_Detect(t *testing.T) { diff --git a/detectors/aws/ec2/go.mod b/detectors/aws/ec2/go.mod index 2dc8ec0fcdb..e285c6670e4 100644 --- a/detectors/aws/ec2/go.mod +++ b/detectors/aws/ec2/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go v1.49.16 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/sdk v1.21.0 ) diff --git a/detectors/aws/ec2/go.sum b/detectors/aws/ec2/go.sum index 6b0848b9c1b..2039a1a34f5 100644 --- a/detectors/aws/ec2/go.sum +++ b/detectors/aws/ec2/go.sum @@ -18,8 +18,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/detectors/aws/ecs/ecs.go b/detectors/aws/ecs/ecs.go index a1e06a65b4e..57cc0b42ed6 100644 --- a/detectors/aws/ecs/ecs.go +++ b/detectors/aws/ecs/ecs.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) const ( diff --git a/detectors/aws/ecs/ecs_test.go b/detectors/aws/ecs/ecs_test.go index 13788232d21..0f0a29a1a34 100644 --- a/detectors/aws/ecs/ecs_test.go +++ b/detectors/aws/ecs/ecs_test.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" metadata "github.com/brunoscheufler/aws-ecs-metadata-go" "github.com/stretchr/testify/assert" diff --git a/detectors/aws/ecs/go.mod b/detectors/aws/ecs/go.mod index 7802f89a894..44ca1290372 100644 --- a/detectors/aws/ecs/go.mod +++ b/detectors/aws/ecs/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20220812150832-b6b31c6eeeaf github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/sdk v1.21.0 ) diff --git a/detectors/aws/ecs/go.sum b/detectors/aws/ecs/go.sum index a7770b2153c..6e54f65ff0d 100644 --- a/detectors/aws/ecs/go.sum +++ b/detectors/aws/ecs/go.sum @@ -19,8 +19,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/detectors/aws/ecs/test/ecs_test.go b/detectors/aws/ecs/test/ecs_test.go index d25579cf2f5..44ceb38b169 100644 --- a/detectors/aws/ecs/test/ecs_test.go +++ b/detectors/aws/ecs/test/ecs_test.go @@ -25,7 +25,7 @@ import ( ecs "go.opentelemetry.io/contrib/detectors/aws/ecs" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" "github.com/stretchr/testify/assert" ) diff --git a/detectors/aws/eks/detector.go b/detectors/aws/eks/detector.go index 4d866d0368b..17c396397c0 100644 --- a/detectors/aws/eks/detector.go +++ b/detectors/aws/eks/detector.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) const ( diff --git a/detectors/aws/eks/detector_test.go b/detectors/aws/eks/detector_test.go index c6fcd45e315..03c388a5805 100644 --- a/detectors/aws/eks/detector_test.go +++ b/detectors/aws/eks/detector_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) type MockDetectorUtils struct { diff --git a/detectors/aws/eks/go.mod b/detectors/aws/eks/go.mod index 0a9cddf370d..f2026f73f7e 100644 --- a/detectors/aws/eks/go.mod +++ b/detectors/aws/eks/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/sdk v1.21.0 k8s.io/apimachinery v0.28.4 k8s.io/client-go v0.28.4 diff --git a/detectors/aws/eks/go.sum b/detectors/aws/eks/go.sum index 7e1fa092637..d5f3a92cea1 100644 --- a/detectors/aws/eks/go.sum +++ b/detectors/aws/eks/go.sum @@ -73,8 +73,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/detectors/aws/lambda/detector.go b/detectors/aws/lambda/detector.go index 8f85ba456a5..2fa7e41f6ab 100644 --- a/detectors/aws/lambda/detector.go +++ b/detectors/aws/lambda/detector.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) // For a complete list of reserved environment variables in Lambda, see: diff --git a/detectors/aws/lambda/detector_test.go b/detectors/aws/lambda/detector_test.go index ff4697f95e0..3d35f606a69 100644 --- a/detectors/aws/lambda/detector_test.go +++ b/detectors/aws/lambda/detector_test.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) // successfully return resource when process is running on Amazon Lambda environment. diff --git a/detectors/aws/lambda/go.mod b/detectors/aws/lambda/go.mod index ffd5670c9e9..8d58cc4671f 100644 --- a/detectors/aws/lambda/go.mod +++ b/detectors/aws/lambda/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/sdk v1.21.0 ) diff --git a/detectors/aws/lambda/go.sum b/detectors/aws/lambda/go.sum index 9cb1f75d949..94b88320cc0 100644 --- a/detectors/aws/lambda/go.sum +++ b/detectors/aws/lambda/go.sum @@ -10,8 +10,8 @@ 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.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/detectors/gcp/cloud-function.go b/detectors/gcp/cloud-function.go index 4de94546ae3..34262d2c088 100644 --- a/detectors/gcp/cloud-function.go +++ b/detectors/gcp/cloud-function.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) const ( diff --git a/detectors/gcp/cloud-function_test.go b/detectors/gcp/cloud-function_test.go index 302c90a0b32..0122abac50e 100644 --- a/detectors/gcp/cloud-function_test.go +++ b/detectors/gcp/cloud-function_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) var errTest = errors.New("testError") diff --git a/detectors/gcp/cloud-run.go b/detectors/gcp/cloud-run.go index f5be2062e3d..4e765bd47b7 100644 --- a/detectors/gcp/cloud-run.go +++ b/detectors/gcp/cloud-run.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) const serviceNamespace = "cloud-run-managed" diff --git a/detectors/gcp/detector.go b/detectors/gcp/detector.go index 7c6970405da..4812ef29a49 100644 --- a/detectors/gcp/detector.go +++ b/detectors/gcp/detector.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) // NewDetector returns a resource detector which detects resource attributes on: diff --git a/detectors/gcp/detector_test.go b/detectors/gcp/detector_test.go index 58d45217c5b..89a6e6dc24d 100644 --- a/detectors/gcp/detector_test.go +++ b/detectors/gcp/detector_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) func TestDetect(t *testing.T) { diff --git a/detectors/gcp/gce.go b/detectors/gcp/gce.go index 905b19211ec..5107fde9bde 100644 --- a/detectors/gcp/gce.go +++ b/detectors/gcp/gce.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) // GCE collects resource information of GCE computing instances. diff --git a/detectors/gcp/gke.go b/detectors/gcp/gke.go index e7baad6f6c1..36305ea93cc 100644 --- a/detectors/gcp/gke.go +++ b/detectors/gcp/gke.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) // GKE collects resource information of GKE computing instances. diff --git a/detectors/gcp/go.mod b/detectors/gcp/go.mod index 682d6c6a071..e1fc8a63a5d 100644 --- a/detectors/gcp/go.mod +++ b/detectors/gcp/go.mod @@ -7,7 +7,7 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/sdk v1.21.0 ) diff --git a/detectors/gcp/go.sum b/detectors/gcp/go.sum index be1aa00a811..269714c5f7b 100644 --- a/detectors/gcp/go.sum +++ b/detectors/gcp/go.sum @@ -17,8 +17,8 @@ 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.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod index c197e23cecf..52cabe2dab5 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.46.1 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.0.0-00010101000000-000000000000 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 ) diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum index 6b4f99c3b4d..c51a7b067a8 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum @@ -60,8 +60,8 @@ 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/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 h1:VhlEQAPp9R1ktYfrPk5SOryw1e9LDDTZCbIPFrho0ec= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0/go.mod h1:kB3ufRbfU+CQ4MlUcqtW8Z7YEOBeK2DJ6CmR5rYYF3E= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod index 39e1b3ec54b..716cd5b89a8 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod @@ -14,7 +14,7 @@ require ( go.opentelemetry.io/contrib/detectors/aws/lambda v0.46.1 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.46.1 go.opentelemetry.io/contrib/propagators/aws v1.21.1 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 ) diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.sum index ec8f62127e9..d906ff4d316 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.sum +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.sum @@ -12,8 +12,8 @@ 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.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go index b81eedc2049..68a4fd3a57c 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go @@ -39,7 +39,7 @@ import ( "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" "go.opentelemetry.io/otel/trace" ) diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod index 574cb1472ea..4c252986d53 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod @@ -14,7 +14,7 @@ require ( go.opentelemetry.io/contrib/detectors/aws/lambda v0.46.1 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.46.1 go.opentelemetry.io/contrib/propagators/aws v1.21.1 - go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 go.opentelemetry.io/otel/trace v1.21.0 diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum index a04650d15a2..e70f60e208b 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum @@ -24,8 +24,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1 h1:G88rJFUeP5VT+cfGFI+Aid+HNL/xYSowH+IBcZ7EYbE= +go.opentelemetry.io/otel v1.21.1-0.20240111115607-01472db75fb1/go.mod h1:ZZRIeEURQ7WVNuQNd4nuuudggO3i58V3rF+YVkQq4UM= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk= From faed67ccf0a793738039087bf367dae82f54cca3 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 11 Jan 2024 12:48:50 -0800 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de87a671117..e6deed28e1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/example` are upgraded to v1.20.0. (#4320) - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`are upgraded to v1.20.0. (#4320) - Updated configuration schema to include `schema_url` for resource definition and `without_type_suffix` and `without_units` for the Prometheus exporter. (#4727) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ecs`are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/lambda`are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ec2`are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/eks`are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/gcp`are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test`are upgraded to v1.24.0. (#4803) ### Fixed From afb61aa3de4b201ff048dd057e486ac613ff65b7 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 11 Jan 2024 12:49:24 -0800 Subject: [PATCH 3/5] Fix changelog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6deed28e1a..cc53d3301be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/example` are upgraded to v1.20.0. (#4320) - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`are upgraded to v1.20.0. (#4320) - Updated configuration schema to include `schema_url` for resource definition and `without_type_suffix` and `without_units` for the Prometheus exporter. (#4727) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors - The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ecs`are upgraded to v1.24.0. (#4803) - The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/lambda`are upgraded to v1.24.0. (#4803) - The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ec2`are upgraded to v1.24.0. (#4803) From dad7d1f9250dd3ee1c5a3293a494e9d1a81ed420 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 11 Jan 2024 12:51:06 -0800 Subject: [PATCH 4/5] Fix spacing in changelog --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc53d3301be..a42e91c38e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,12 +25,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/example` are upgraded to v1.20.0. (#4320) - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`are upgraded to v1.20.0. (#4320) - Updated configuration schema to include `schema_url` for resource definition and `without_type_suffix` and `without_units` for the Prometheus exporter. (#4727) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ecs`are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/lambda`are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ec2`are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/eks`are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/gcp`are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test`are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ecs` are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/lambda`.are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ec2`.are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/eks`.are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/gcp`.are upgraded to v1.24.0. (#4803) +- The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test`.are upgraded to v1.24.0. (#4803) ### Fixed From 051cedd79edd0afd7ca5bb819e8d46ef048c9271 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 16 Jan 2024 07:34:51 -0800 Subject: [PATCH 5/5] Apply feedback for changelog --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a42e91c38e0..fdf105e81f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,12 +25,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/example` are upgraded to v1.20.0. (#4320) - The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp`are upgraded to v1.20.0. (#4320) - Updated configuration schema to include `schema_url` for resource definition and `without_type_suffix` and `without_units` for the Prometheus exporter. (#4727) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ecs` are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/lambda`.are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/ec2`.are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/aws/eks`.are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/detectors/gcp`.are upgraded to v1.24.0. (#4803) -- The semantic conventions used by `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test`.are upgraded to v1.24.0. (#4803) +- The semantic conventions used by the `go.opentelemetry.io/contrib/detectors/aws/ecs` resource detector are upgraded to v1.24.0. (#4803) +- The semantic conventions used by the `go.opentelemetry.io/contrib/detectors/aws/lambda` resource detector are upgraded to v1.24.0. (#4803) +- The semantic conventions used by the `go.opentelemetry.io/contrib/detectors/aws/ec2` resource detector are upgraded to v1.24.0. (#4803) +- The semantic conventions used by the `go.opentelemetry.io/contrib/detectors/aws/eks` resource detector are upgraded to v1.24.0. (#4803) +- The semantic conventions used by the `go.opentelemetry.io/contrib/detectors/gcp` resource detector are upgraded to v1.24.0. (#4803) +- The semantic conventions used in `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test` are upgraded to v1.24.0. (#4803) ### Fixed