[resourcedetection] Unify gke and gce detectors and fix gke zone/regi…

…on detection (open-telemetry#10347) resourcedetectionprocessor: unify gke and gce detectors and fix gke zone/region detection
McSick · Jun 13, 2022 · bcd8a58 · bcd8a58
1 parent 8f8f80a
commit bcd8a58
Show file tree

Hide file tree

Showing 20 changed files with 631 additions and 620 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 ## Unreleased
 
-## 🛑 Breaking changes 🛑
+### 🛑 Breaking changes 🛑
+
+- `jmxreceiver`: Remove properties & groovyscript parameters from JMX Receiver. Add ResourceAttributes & LogLevel parameter to supply some of the removed functionality with reduced attack surface (#9685)
+- `resourcedetectionprocessor`: 'gke' and 'gce' resource detectors are replaced with a single 'gcp' detector (#10347)
 
 - `pkg/stanza`: Removed reference to deprecated `ClusterName` (#10426)
 
@@ -19,6 +22,7 @@
 ### 🧰 Bug fixes 🧰
 
 - `tanzuobservabilityexporter`: Improve how negative values in exponential histograms are handled. (#10135)
+- `resourcedetectionprocessor`: GCP resource detector now properly detects zone/region on GKE (#10347)
 
 ## v0.52.0
 

diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -45,6 +45,7 @@ require (
 	github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
 	github.com/DataDog/sketches-go v1.4.1 // indirect
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.31.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.2-0.20220512190557-875976f87023 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/go.mod b/go.mod
@@ -176,6 +176,7 @@ require (
 	github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
 	github.com/DataDog/sketches-go v1.4.1 // indirect
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.31.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.2-0.20220512190557-875976f87023 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect

diff --git a/go.sum b/go.sum
diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go
@@ -36,8 +36,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/consul"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/docker"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/env"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/gcp/gce"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/gcp/gke"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/gcp"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/system"
 )
 
@@ -69,8 +68,10 @@ func NewFactory() component.ProcessorFactory {
 		eks.TypeStr:              eks.NewDetector,
 		elasticbeanstalk.TypeStr: elasticbeanstalk.NewDetector,
 		env.TypeStr:              env.NewDetector,
-		gce.TypeStr:              gce.NewDetector,
-		gke.TypeStr:              gke.NewDetector,
+		gcp.TypeStr:              gcp.NewDetector,
+		// TODO(#10348): Remove GKE and GCE after the v0.54.0 release.
+		gcp.DeprecatedGKETypeStr: gcp.NewDetector,
+		gcp.DeprecatedGCETypeStr: gcp.NewDetector,
 		system.TypeStr:           system.NewDetector,
 	})
 
@@ -201,6 +202,9 @@ func (f *factory) getResourceProvider(
 		return provider, nil
 	}
 
+	// TODO(#10348): Remove this after the v0.54.0 release.
+	configuredDetectors = gcp.DeduplicateDetectors(params, configuredDetectors)
+
 	detectorTypes := make([]internal.DetectorType, 0, len(configuredDetectors))
 	for _, key := range configuredDetectors {
 		detectorTypes = append(detectorTypes, internal.DetectorType(strings.TrimSpace(key)))

diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod
@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	cloud.google.com/go/compute v1.6.1
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.31.0
 	github.com/Showmax/go-fqdn v1.0.0
 	github.com/aws/aws-sdk-go v1.44.24
 	github.com/census-instrumentation/opencensus-proto v0.3.0

diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum
diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go b/processor/resourcedetectionprocessor/internal/gcp/gce/gce.go
diff --git a/processor/resourcedetectionprocessor/internal/gcp/gce/gce_test.go b/processor/resourcedetectionprocessor/internal/gcp/gce/gce_test.go