Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ack extension to Splunk distribution #4724

Merged
merged 4 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ([#4724](https://github.com/signalfx/splunk-otel-collector/pull/4724))

### 💡 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))
Expand Down
31 changes: 16 additions & 15 deletions docs/components.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,22 @@ The distribution offers support for the following components.

<div>

| 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] |

</div>

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions internal/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -126,6 +127,7 @@ import (
func Get() (otelcol.Factories, error) {
var errs []error
extensions, err := extension.MakeFactoryMap(
ackextension.NewFactory(),
atoulme marked this conversation as resolved.
Show resolved Hide resolved
ballastextension.NewFactory(),
basicauthextension.NewFactory(),
ecsobserver.NewFactory(),
Expand Down
1 change: 1 addition & 0 deletions internal/components/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

func TestDefaultComponents(t *testing.T) {
expectedExtensions := []string{
"ack",
"basicauth",
"ecs_observer",
"ecs_task_observer",
Expand Down
Loading