From 74de35339e1734c8fda202216c5b8f661e9e3458 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Wed, 24 Apr 2024 15:45:22 -0700 Subject: [PATCH 1/4] Add ack extension --- CHANGELOG.md | 4 ++++ go.mod | 2 +- internal/components/components.go | 2 ++ internal/components/components_test.go | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f75f9968d..3dcb6ff9d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ - Emit entity events only for matching receivers ([#4691](https://github.com/signalfx/splunk-otel-collector/pull/4691)) - Remove `log_endpoints` config option ([#4692](https://github.com/signalfx/splunk-otel-collector/pull/4692)) +### 🚀 New components 🚀 + +- (Splunk) Add Ack extension + ### 💡 Enhancements 💡 - (Splunk) Include [`splunk-otel-dotnet`](https://github.com/signalfx/splunk-otel-dotnet) in the `splunk-otel-auto-instrumentation` deb/rpm packages (x86_64/amd64 only) ([#4679](https://github.com/signalfx/splunk-otel-collector/pull/4679)) diff --git a/go.mod b/go.mod index 2a008715b3..ec54b5ce8f 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.99.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.99.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.99.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.99.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.99.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.99.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension v0.99.0 @@ -240,7 +241,6 @@ require ( github.com/montanaflynn/stats v0.7.1 // indirect github.com/mrunalp/fileutils v0.5.1 // indirect github.com/okta/okta-sdk-golang/v2 v2.20.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.99.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.99.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.99.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.99.0 // indirect diff --git a/internal/components/components.go b/internal/components/components.go index 340f6eb6b5..19e1857149 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -27,6 +27,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension" @@ -126,6 +127,7 @@ import ( func Get() (otelcol.Factories, error) { var errs []error extensions, err := extension.MakeFactoryMap( + ackextension.NewFactory(), ballastextension.NewFactory(), basicauthextension.NewFactory(), ecsobserver.NewFactory(), diff --git a/internal/components/components_test.go b/internal/components/components_test.go index d450f8e953..c2bc36c3dd 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -26,6 +26,7 @@ import ( func TestDefaultComponents(t *testing.T) { expectedExtensions := []string{ + "ack", "basicauth", "ecs_observer", "ecs_task_observer", From 9d5922b499980737f46d199fc84101af4057b5a3 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Wed, 24 Apr 2024 15:47:13 -0700 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dcb6ff9d8..893f312204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ ### 🚀 New components 🚀 -- (Splunk) Add Ack extension +- (Splunk) Add Ack extension ([#4724](https://github.com/signalfx/splunk-otel-collector/pull/4724)) ### 💡 Enhancements 💡 From d8e68871b70947b90adb15e189403e5f09ce828c Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Wed, 24 Apr 2024 15:47:31 -0700 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 893f312204..7942750330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ ### 🚀 New components 🚀 -- (Splunk) Add Ack extension ([#4724](https://github.com/signalfx/splunk-otel-collector/pull/4724)) +- (Splunk) Add ack extension ([#4724](https://github.com/signalfx/splunk-otel-collector/pull/4724)) ### 💡 Enhancements 💡 From c716cd91084eff19cd1c55670efcde08ddd55aba Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Wed, 24 Apr 2024 16:03:17 -0700 Subject: [PATCH 4/4] Add ack extension to components.md --- docs/components.md | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/docs/components.md b/docs/components.md index fb787702e0..257abd71db 100644 --- a/docs/components.md +++ b/docs/components.md @@ -109,21 +109,22 @@ The distribution offers support for the following components.
-| Extensions | Stability | -|:------------------------------------------------------------------------------------------------------------------------------------|:-----------| -| [basicauth](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/basicauthextension) | [beta] | -| [docker_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/dockerobserver) | [beta] | -| [ecs_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecsobserver) | [beta] | -| [ecs_task_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecstaskobserver) | [beta] | -| [healthcheck](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/healthcheckextension) | [beta] | -| [httpforwarder](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/httpforwarderextension) | [beta] | -| [host_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/hostobserver) | [beta] | -| [k8s_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/k8sobserver) | [beta] | -| [pprof](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/pprofextension) | [beta] | -| [smartagent](../pkg/extension/smartagentextension) | [beta] | -| [zpages](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension) | [beta] | -| [file_storage](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/storage/filestorage) | [beta] | -| [ballast](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/ballastextension) | [beta] | +| Extensions | Stability | +|:------------------------------------------------------------------------------------------------------------------------------------|:----------| +| [ack](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/ackextension) | [alpha] | +| [basicauth](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/basicauthextension) | [beta] | +| [docker_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/dockerobserver) | [beta] | +| [ecs_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecsobserver) | [beta] | +| [ecs_task_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecstaskobserver) | [beta] | +| [healthcheck](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/healthcheckextension) | [beta] | +| [httpforwarder](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/httpforwarderextension) | [beta] | +| [host_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/hostobserver) | [beta] | +| [k8s_observer](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/k8sobserver) | [beta] | +| [pprof](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/pprofextension) | [beta] | +| [smartagent](../pkg/extension/smartagentextension) | [beta] | +| [zpages](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension) | [beta] | +| [file_storage](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/storage/filestorage) | [beta] | +| [ballast](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/ballastextension) | [beta] |