From 3e3a0c516c1b2a350633f32193935eab95a3c0c2 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Tue, 18 Jun 2024 10:43:08 -0700 Subject: [PATCH 1/5] Add Active Directory DS receiver --- CHANGELOG.md | 1 + docs/components.md | 1 + go.mod | 1 + go.sum | 1 + internal/components/components.go | 2 ++ internal/components/components_test.go | 1 + 6 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0290aee00d..6313cdf0fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### 🚀 New components 🚀 - (Splunk) Add [upstream](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/rabbitmqreceiver) Opentelemetry Collector RabbitMQ receiver ([#4980](https://github.com/signalfx/splunk-otel-collector/pull/4980)) +- (Splunk) Add Active Directory Domain Services Receiver ## v0.102.1 diff --git a/docs/components.md b/docs/components.md index 2d5353f910..8e6880796a 100644 --- a/docs/components.md +++ b/docs/components.md @@ -13,6 +13,7 @@ The distribution offers support for the following components. | Receivers | Stability | |:----------------------------------------------------------------------------------------------------------------------------------------------|:-----------------| +| [active_directory_ds](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/activedirectorydsreceiver) | [beta] | | [awscontainerinsights](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awscontainerinsightreceiver) | [beta] | | [awsecscontainermetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsecscontainermetricsreceiver) | [beta] | | [apache](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/apachereceiver) | [alpha] | diff --git a/go.mod b/go.mod index 2a21ea57e0..4406aa2b52 100644 --- a/go.mod +++ b/go.mod @@ -57,6 +57,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.102.0 diff --git a/go.sum b/go.sum index bf9bc43de6..4618df724d 100644 --- a/go.sum +++ b/go.sum @@ -1362,6 +1362,7 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsampling github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.102.0/go.mod h1:8hPQU8tprx79lDkMq4aqxU3WEurKYGVe9fM2p1VYN9I= github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0 h1:0TQZTCWFmOQ4OAEIvIV1Ds74X1d5kQYalYJFivsuqzo= github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0/go.mod h1:2T6Wk8q8IoUGtbigSs1/IHCUEt7Q7t+tNRtcKlZSw5M= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0/go.mod h1:+51Evw9XySUq9xEmNpCbGvezpfxreDGRDaLCPKcaiOU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0 h1:5LREf19LeKhqNSwo3wItSy4JoSExjl6QNRB0Zj8T6DU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0/go.mod h1:AZmeqAcOp/ewg1mNbjB5krZOAnbELKTsZCEDT8ZzlkU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.102.0 h1:6rv1z6GzSzbfOvukVp5hmDJ7+6dt2D29cIWBc8mLAjA= diff --git a/internal/components/components.go b/internal/components/components.go index e58d6a7e01..76703b53ce 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -54,6 +54,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" @@ -152,6 +153,7 @@ func Get() (otelcol.Factories, error) { } receivers, err := receiver.MakeFactoryMap( + activedirectorydsreceiver.NewFactory(), awscontainerinsightreceiver.NewFactory(), awsecscontainermetricsreceiver.NewFactory(), apachereceiver.NewFactory(), diff --git a/internal/components/components_test.go b/internal/components/components_test.go index aca199467f..6692af4765 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -43,6 +43,7 @@ func TestDefaultComponents(t *testing.T) { "file_storage", } expectedReceivers := []string{ + "activedirectorydsreceiver", "awscontainerinsightreceiver", "awsecscontainermetrics", "azureeventhub", From 3cfa2f9f2e056e8deb4a5fbdc38b7fa80df3a83a Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Tue, 18 Jun 2024 10:45:51 -0700 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6313cdf0fb..ad4f5dc2f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### 🚀 New components 🚀 - (Splunk) Add [upstream](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/rabbitmqreceiver) Opentelemetry Collector RabbitMQ receiver ([#4980](https://github.com/signalfx/splunk-otel-collector/pull/4980)) -- (Splunk) Add Active Directory Domain Services Receiver +- (Splunk) Add Active Directory Domain Services Receiver ([#4994](https://github.com/signalfx/splunk-otel-collector/pull/4994)) ## v0.102.1 From 74af9927b111bfe7decca1b64f22c0dfe8eab367 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Tue, 18 Jun 2024 10:46:10 -0700 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad4f5dc2f0..622661832f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### 🚀 New components 🚀 - (Splunk) Add [upstream](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/rabbitmqreceiver) Opentelemetry Collector RabbitMQ receiver ([#4980](https://github.com/signalfx/splunk-otel-collector/pull/4980)) -- (Splunk) Add Active Directory Domain Services Receiver ([#4994](https://github.com/signalfx/splunk-otel-collector/pull/4994)) +- (Splunk) Add Active Directory Domain Services receiver ([#4994](https://github.com/signalfx/splunk-otel-collector/pull/4994)) ## v0.102.1 From abd802ded0c4e4cd88068d2b2183b5638e4f532b Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Tue, 18 Jun 2024 11:03:17 -0700 Subject: [PATCH 4/5] make tidy --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 4618df724d..92de264e37 100644 --- a/go.sum +++ b/go.sum @@ -1362,6 +1362,7 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsampling github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.102.0/go.mod h1:8hPQU8tprx79lDkMq4aqxU3WEurKYGVe9fM2p1VYN9I= github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0 h1:0TQZTCWFmOQ4OAEIvIV1Ds74X1d5kQYalYJFivsuqzo= github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0/go.mod h1:2T6Wk8q8IoUGtbigSs1/IHCUEt7Q7t+tNRtcKlZSw5M= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0 h1:u6GSvTRVdDVWlR8GjZQ08RWa77Et0wtMt4zaqEIgKgw= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.102.0/go.mod h1:+51Evw9XySUq9xEmNpCbGvezpfxreDGRDaLCPKcaiOU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0 h1:5LREf19LeKhqNSwo3wItSy4JoSExjl6QNRB0Zj8T6DU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.102.0/go.mod h1:AZmeqAcOp/ewg1mNbjB5krZOAnbELKTsZCEDT8ZzlkU= From 458f97732be0850ed46d0b868ed45b6ab66478f3 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Tue, 18 Jun 2024 11:08:41 -0700 Subject: [PATCH 5/5] Fix expected receiver name --- internal/components/components_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/components/components_test.go b/internal/components/components_test.go index 6692af4765..f68a0c890a 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -43,7 +43,7 @@ func TestDefaultComponents(t *testing.T) { "file_storage", } expectedReceivers := []string{ - "activedirectorydsreceiver", + "active_directory_ds", "awscontainerinsightreceiver", "awsecscontainermetrics", "azureeventhub",