From c47a69c6aa70540196527701ac68301a76977303 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 21 May 2024 08:45:47 -0700 Subject: [PATCH] Bump semconv/v1.24.0 to v1.25.0 (#5605) Resolve #5601 --------- Co-authored-by: Sam Xie --- CHANGELOG.md | 1 + config/resource.go | 2 +- detectors/aws/ec2/ec2.go | 2 +- detectors/aws/ec2/ec2_test.go | 2 +- detectors/aws/ecs/ecs.go | 2 +- detectors/aws/ecs/ecs_test.go | 2 +- detectors/aws/ecs/test/ecs_test.go | 2 +- detectors/aws/eks/detector.go | 2 +- detectors/aws/eks/detector_test.go | 2 +- detectors/aws/lambda/detector.go | 2 +- detectors/aws/lambda/detector_test.go | 2 +- 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 +- .../github.com/aws/aws-lambda-go/otellambda/test/lambda_test.go | 2 +- 19 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73f285c97db..5a2fa8c0423 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm This parameter is used as a replacement of `WithInstrumentationScope` to specify the name of the logger backing the underlying `Handler`. (#5588) - `NewHandler` now accepts a `name` `string` as the first argument. This parameter is used as a replacement of `WithInstrumentationScope` to specify the name of the logger backing the returned `Handler`. (#5588) +- Upgrade all dependencies of `go.opentelemetry.io/otel/semconv/v1.24.0` to `go.opentelemetry.io/otel/semconv/v1.25.0`. (#5605) ### Removed diff --git a/config/resource.go b/config/resource.go index 3caeb89e302..302a59637e6 100644 --- a/config/resource.go +++ b/config/resource.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) func keyVal(k string, v any) attribute.KeyValue { diff --git a/detectors/aws/ec2/ec2.go b/detectors/aws/ec2/ec2.go index 97e4814919e..ee8aade2ed6 100644 --- a/detectors/aws/ec2/ec2.go +++ b/detectors/aws/ec2/ec2.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) type config struct { diff --git a/detectors/aws/ec2/ec2_test.go b/detectors/aws/ec2/ec2_test.go index a21fbb99cf5..5652b52d4a5 100644 --- a/detectors/aws/ec2/ec2_test.go +++ b/detectors/aws/ec2/ec2_test.go @@ -17,7 +17,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) func TestAWS_Detect(t *testing.T) { diff --git a/detectors/aws/ecs/ecs.go b/detectors/aws/ecs/ecs.go index 5809fe03066..fe5c3423834 100644 --- a/detectors/aws/ecs/ecs.go +++ b/detectors/aws/ecs/ecs.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) const ( diff --git a/detectors/aws/ecs/ecs_test.go b/detectors/aws/ecs/ecs_test.go index 95d1375ee77..f4f54b6ffb7 100644 --- a/detectors/aws/ecs/ecs_test.go +++ b/detectors/aws/ecs/ecs_test.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" metadata "github.com/brunoscheufler/aws-ecs-metadata-go" "github.com/stretchr/testify/assert" diff --git a/detectors/aws/ecs/test/ecs_test.go b/detectors/aws/ecs/test/ecs_test.go index de2921688f8..a34b2da5ecd 100644 --- a/detectors/aws/ecs/test/ecs_test.go +++ b/detectors/aws/ecs/test/ecs_test.go @@ -14,7 +14,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.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" "github.com/stretchr/testify/assert" ) diff --git a/detectors/aws/eks/detector.go b/detectors/aws/eks/detector.go index 857e8b07ed3..81202284c48 100644 --- a/detectors/aws/eks/detector.go +++ b/detectors/aws/eks/detector.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) const ( diff --git a/detectors/aws/eks/detector_test.go b/detectors/aws/eks/detector_test.go index 97513be0e50..160de0cd334 100644 --- a/detectors/aws/eks/detector_test.go +++ b/detectors/aws/eks/detector_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) type MockDetectorUtils struct { diff --git a/detectors/aws/lambda/detector.go b/detectors/aws/lambda/detector.go index e3daaa4db72..420d876bb5f 100644 --- a/detectors/aws/lambda/detector.go +++ b/detectors/aws/lambda/detector.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.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 b12346f9094..ff116425c2f 100644 --- a/detectors/aws/lambda/detector_test.go +++ b/detectors/aws/lambda/detector_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) // successfully return resource when process is running on Amazon Lambda environment. diff --git a/detectors/gcp/cloud-function.go b/detectors/gcp/cloud-function.go index 988a9feaba7..113aa277347 100644 --- a/detectors/gcp/cloud-function.go +++ b/detectors/gcp/cloud-function.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) const ( diff --git a/detectors/gcp/cloud-function_test.go b/detectors/gcp/cloud-function_test.go index 95075f5d904..351f8044e27 100644 --- a/detectors/gcp/cloud-function_test.go +++ b/detectors/gcp/cloud-function_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) var errTest = errors.New("testError") diff --git a/detectors/gcp/cloud-run.go b/detectors/gcp/cloud-run.go index 2926cf8528b..11c1d8823da 100644 --- a/detectors/gcp/cloud-run.go +++ b/detectors/gcp/cloud-run.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) const serviceNamespace = "cloud-run-managed" diff --git a/detectors/gcp/detector.go b/detectors/gcp/detector.go index 9dabfe3d041..7f600b7ce8a 100644 --- a/detectors/gcp/detector.go +++ b/detectors/gcp/detector.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.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 9522698c91a..d21d5c0b8e8 100644 --- a/detectors/gcp/detector_test.go +++ b/detectors/gcp/detector_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) func TestDetect(t *testing.T) { diff --git a/detectors/gcp/gce.go b/detectors/gcp/gce.go index 0bda3d3b9ff..c655dc80a88 100644 --- a/detectors/gcp/gce.go +++ b/detectors/gcp/gce.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) // GCE collects resource information of GCE computing instances. diff --git a/detectors/gcp/gke.go b/detectors/gcp/gke.go index 7934676cbb3..1bcb488fca0 100644 --- a/detectors/gcp/gke.go +++ b/detectors/gcp/gke.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" ) // GKE collects resource information of GKE computing instances. 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 bd8f49d629d..b21d25d31c2 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 @@ -28,7 +28,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.24.0" + semconv "go.opentelemetry.io/otel/semconv/v1.25.0" "go.opentelemetry.io/otel/trace" )