From fce9e360208028c5713f48faed0cd603feb980e4 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Mon, 14 Aug 2023 18:14:45 +0000 Subject: [PATCH] use faas.instance instead of faas.id in gcp detector --- CHANGELOG.md | 4 ++++ detectors/gcp/detector.go | 8 ++++---- detectors/gcp/detector_test.go | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfc28098000..616770d3b03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - `WithRouteTag` in `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` adds HTTP route attribute to metrics. (#615) - Add `WithSpanOptions` option in `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc`. (#3768) +### Changed + +- `go.opentelemetry.io/contrib/detectors/gcp`: Detect faas.instance instead of faas.id, since faas.id is being removed. (#4198) + ### Fixed - AWS XRay Remote Sampling to cap quotaBalance to 1x quota in `go.opentelemetry.io/contrib/samplers/aws/xray`. (#3651, #3652) diff --git a/detectors/gcp/detector.go b/detectors/gcp/detector.go index 50b2f2736a1..9b1edf620e3 100644 --- a/detectors/gcp/detector.go +++ b/detectors/gcp/detector.go @@ -60,27 +60,27 @@ func (d *detector) Detect(ctx context.Context) (*resource.Resource, error) { b.attrs = append(b.attrs, semconv.CloudPlatformGCPCloudRun) b.add(semconv.FaaSNameKey, d.detector.FaaSName) b.add(semconv.FaaSVersionKey, d.detector.FaaSVersion) - b.add(semconv.FaaSIDKey, d.detector.FaaSID) + b.add(semconv.FaaSInstanceKey, d.detector.FaaSID) b.add(semconv.CloudRegionKey, d.detector.FaaSCloudRegion) case gcp.CloudFunctions: b.attrs = append(b.attrs, semconv.CloudPlatformGCPCloudFunctions) b.add(semconv.FaaSNameKey, d.detector.FaaSName) b.add(semconv.FaaSVersionKey, d.detector.FaaSVersion) - b.add(semconv.FaaSIDKey, d.detector.FaaSID) + b.add(semconv.FaaSInstanceKey, d.detector.FaaSID) b.add(semconv.CloudRegionKey, d.detector.FaaSCloudRegion) case gcp.AppEngineFlex: b.attrs = append(b.attrs, semconv.CloudPlatformGCPAppEngine) b.addZoneAndRegion(d.detector.AppEngineFlexAvailabilityZoneAndRegion) b.add(semconv.FaaSNameKey, d.detector.AppEngineServiceName) b.add(semconv.FaaSVersionKey, d.detector.AppEngineServiceVersion) - b.add(semconv.FaaSIDKey, d.detector.AppEngineServiceInstance) + b.add(semconv.FaaSInstanceKey, d.detector.AppEngineServiceInstance) case gcp.AppEngineStandard: b.attrs = append(b.attrs, semconv.CloudPlatformGCPAppEngine) b.add(semconv.CloudAvailabilityZoneKey, d.detector.AppEngineStandardAvailabilityZone) b.add(semconv.CloudRegionKey, d.detector.AppEngineStandardCloudRegion) b.add(semconv.FaaSNameKey, d.detector.AppEngineServiceName) b.add(semconv.FaaSVersionKey, d.detector.AppEngineServiceVersion) - b.add(semconv.FaaSIDKey, d.detector.AppEngineServiceInstance) + b.add(semconv.FaaSInstanceKey, d.detector.AppEngineServiceInstance) case gcp.GCE: b.attrs = append(b.attrs, semconv.CloudPlatformGCPComputeEngine) b.addZoneAndRegion(d.detector.GCEAvailabilityZoneAndRegion) diff --git a/detectors/gcp/detector_test.go b/detectors/gcp/detector_test.go index 9085d2322af..4af146c5290 100644 --- a/detectors/gcp/detector_test.go +++ b/detectors/gcp/detector_test.go @@ -113,7 +113,7 @@ func TestDetect(t *testing.T) { semconv.CloudRegion("us-central1"), semconv.FaaSName("my-service"), semconv.FaaSVersion("123456"), - semconv.FaaSID("1472385723456792345"), + semconv.FaaSInstance("1472385723456792345"), ), }, { @@ -133,7 +133,7 @@ func TestDetect(t *testing.T) { semconv.CloudRegion("us-central1"), semconv.FaaSName("my-service"), semconv.FaaSVersion("123456"), - semconv.FaaSID("1472385723456792345"), + semconv.FaaSInstance("1472385723456792345"), ), }, { @@ -155,7 +155,7 @@ func TestDetect(t *testing.T) { semconv.CloudAvailabilityZone("us-central1-c"), semconv.FaaSName("my-service"), semconv.FaaSVersion("123456"), - semconv.FaaSID("1472385723456792345"), + semconv.FaaSInstance("1472385723456792345"), ), }, { @@ -177,7 +177,7 @@ func TestDetect(t *testing.T) { semconv.CloudAvailabilityZone("us-central1-c"), semconv.FaaSName("my-service"), semconv.FaaSVersion("123456"), - semconv.FaaSID("1472385723456792345"), + semconv.FaaSInstance("1472385723456792345"), ), }, {