From 37d29f47f70ba9978706a6a78a3841b0dc1690bd Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Wed, 19 Jun 2024 16:47:58 -0400 Subject: [PATCH] restore 3p exporter feature gates to alpha stage Signed-off-by: Anthony J Mirabella --- README.md | 6 +++--- pkg/defaultcomponents/defaults.go | 6 +++--- pkg/defaultcomponents/defaults_test.go | 20 +++++++++++++++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9551bca38..a2b4a8c11 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ Use the community resources below for getting help with the ADOT Collector. * If you think you may have found a bug, open a [bug report](https://github.com/aws-observability/aws-otel-collector/issues/new?template=bug_report.md). * For contributing guidelines, refer to [CONTRIBUTING.md](CONTRIBUTING.md). -### Notice: ADOT Collector v0.41.0 Breaking Changes -* Users of the `datadog`, `logzio`, `sapm`, `signalfx` exporter components. please refer to [Attention: ADOT Collector v0.41.0 breaking changes - third party exporters deprecation](https://github.com/aws-observability/aws-otel-collector/issues/2734) - for more information on an upcoming breaking change . +### Notice: ADOT Collector Planned Breaking Changes +* Users of the `datadog`, `logzio`, `sapm`, `signalfx` exporter components. please refer to [this issue](https://github.com/aws-observability/aws-otel-collector/issues/2734) + for more information on a planned change to remove these components from the distribution. #### ADOT Collector Built-in Components diff --git a/pkg/defaultcomponents/defaults.go b/pkg/defaultcomponents/defaults.go index 61c2e9e02..8146a1b79 100644 --- a/pkg/defaultcomponents/defaults.go +++ b/pkg/defaultcomponents/defaults.go @@ -78,15 +78,15 @@ var datadogExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustReg featuregate.WithRegisterDescription("Removes the Datadog exporter from the set of configurable exporters ")) var logzioExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustRegister("adot.exporter.logzioexporter.deprecation", - featuregate.StageBeta, + featuregate.StageAlpha, featuregate.WithRegisterDescription("Removes the Logzio Exporter from the set of configurable exporters ")) var sapmExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustRegister("adot.exporter.sapmexporter.deprecation", - featuregate.StageBeta, + featuregate.StageAlpha, featuregate.WithRegisterDescription("Removes the SAPM Exporter from the set of configurable exporters")) var signalfxExporterFeatureGateDeprecation = featuregate.GlobalRegistry().MustRegister("adot.exporter.signalfxexporter.deprecation", - featuregate.StageBeta, + featuregate.StageAlpha, featuregate.WithRegisterDescription("Removes the SignalFx Metrics Exporter from the set of configurable exporters")) // Components register OTel components for ADOT-collector distribution diff --git a/pkg/defaultcomponents/defaults_test.go b/pkg/defaultcomponents/defaults_test.go index aa848ea77..125857e22 100644 --- a/pkg/defaultcomponents/defaults_test.go +++ b/pkg/defaultcomponents/defaults_test.go @@ -25,7 +25,7 @@ import ( ) const ( - exportersCount = 12 + exportersCount = 15 receiversCount = 10 extensionsCount = 8 processorCount = 15 @@ -106,6 +106,9 @@ func TestComponents(t *testing.T) { // Ensure that the components behind feature gates are included assert.NotNil(t, exporters[component.MustNewType("datadog")]) + assert.NotNil(t, exporters[component.MustNewType("sapm")]) + assert.NotNil(t, exporters[component.MustNewType("signalfx")]) + assert.NotNil(t, exporters[component.MustNewType("logzio")]) } func TestEnableFeatureGate(t *testing.T) { @@ -120,6 +123,21 @@ func TestEnableFeatureGate(t *testing.T) { featureName: "adot.exporter.datadogexporter.deprecation", component: component.MustNewType("datadog"), }, + { + desc: "disable logzio exporter", + featureName: "adot.exporter.logzioexporter.deprecation", + component: component.MustNewType("logzio"), + }, + { + desc: "disable sapm exporter", + featureName: "adot.exporter.sapmexporter.deprecation", + component: component.MustNewType("sapm"), + }, + { + desc: "disable signalfx exporter", + featureName: "adot.exporter.signalfxexporter.deprecation", + component: component.MustNewType("signalfx"), + }, } expectedLen := exportersCount