Skip to content

Commit

Permalink
Merge pull request #2749 from aws-observability/chore/exporter_featur…
Browse files Browse the repository at this point in the history
…e_gates

restore 3p exporter feature gates to alpha stage
  • Loading branch information
Aneurysm9 committed Jun 19, 2024
2 parents cc1ea01 + 37d29f4 commit bedc840
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions pkg/defaultcomponents/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 19 additions & 1 deletion pkg/defaultcomponents/defaults_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

const (
exportersCount = 12
exportersCount = 15
receiversCount = 10
extensionsCount = 8
processorCount = 15
Expand Down Expand Up @@ -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) {
Expand All @@ -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

Expand Down

0 comments on commit bedc840

Please sign in to comment.