From cbdb120b1a6e53454a60f3368599f1d0974db018 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Mon, 16 Dec 2024 09:53:02 -0800 Subject: [PATCH 1/2] Add the OTel IIS receiver --- CHANGELOG.md | 3 ++- docs/components.md | 1 + go.mod | 1 + go.sum | 2 ++ internal/components/components.go | 2 ++ internal/components/components_test.go | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7afd8f19..0e7909182f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ ### 🚀 New components 🚀 -- (Splunk) Add `filestats` receiver ([](https://github.com/signalfx/splunk-otel-collector/pull/5229)) +- (Splunk) Add `filestats` receiver ([#5229](https://github.com/signalfx/splunk-otel-collector/pull/5229)) +- (Splunk) Add `iis` receiver ([#TODO](https://github.com/signalfx/splunk-otel-collector/pull/TODO)) ### 💡 Enhancements 💡 diff --git a/docs/components.md b/docs/components.md index d97990f12d..3d49b0fdb6 100644 --- a/docs/components.md +++ b/docs/components.md @@ -34,6 +34,7 @@ The distribution offers support for the following components. | [haproxy](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/haproxyreceiver) | [beta] | | [hostmetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver) | [beta] | | [httpcheck](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/httpcheckreceiver) | [in development] | +| [iis](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/iisreceiver) | [beta] | | [jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver) | [beta] | | [jmx](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) | [alpha] | | [journald](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/journaldreceiver) | [alpha] | diff --git a/go.mod b/go.mod index 197c921429..75abc31c0f 100644 --- a/go.mod +++ b/go.mod @@ -78,6 +78,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver v0.114.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.114.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.114.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.114.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.114.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.114.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.114.0 diff --git a/go.sum b/go.sum index 4ebec47c3b..f6f56ddcaf 100644 --- a/go.sum +++ b/go.sum @@ -1437,6 +1437,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsre github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.114.0/go.mod h1:rBegsrFk6WSDU4v9TiOvH3h7xintiOhPq9qd+72SlK8= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.114.0 h1:ttO0p9Kgolur1j5UPIFg+7Emt6UBDF/ecAEy6tYlekM= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.114.0/go.mod h1:6HUFHSVcu+B9rIbeT9Qk2MQhoHR5/fZk/ltNbP8FmlU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.114.0 h1:AYabw6MArMmYwXjPt/HHnouj9jPdKlSnp4N9z+ErKkE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.114.0/go.mod h1:s5vgQbTqL+KtLCjshLIbjdvjGgJss5e1/P1sfaLkrrY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.114.0 h1:1NeG/cgiqBMWQJxFvWQmWo9BVj3k4uOvEK0o++BFINY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.114.0/go.mod h1:skPwfv1xYwB5onG9sj31J4OYUxx6p+wc40aogGy+nVE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.114.0 h1:jcPnl7WklWnCkHwngHtQ1C6hkOHgsrfu6cNlnsOE1vA= diff --git a/internal/components/components.go b/internal/components/components.go index aa3c48ecf1..24537b87af 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -75,6 +75,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver" @@ -184,6 +185,7 @@ func Get() (otelcol.Factories, error) { haproxyreceiver.NewFactory(), hostmetricsreceiver.NewFactory(), httpcheckreceiver.NewFactory(), + iisreceiver.NewFactory(), jaegerreceiver.NewFactory(), jmxreceiver.NewFactory(), journaldreceiver.NewFactory(), diff --git a/internal/components/components_test.go b/internal/components/components_test.go index 6b692a25a7..e2dba067ba 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -64,6 +64,7 @@ func TestDefaultComponents(t *testing.T) { "haproxy", "hostmetrics", "httpcheck", + "iis", "jaeger", "jmx", "journald", From 74995a22702d937d129ef9d55fc762b86e666bb9 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Mon, 16 Dec 2024 10:15:03 -0800 Subject: [PATCH 2/2] Add PR number to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e7909182f..d33815f81a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### 🚀 New components 🚀 - (Splunk) Add `filestats` receiver ([#5229](https://github.com/signalfx/splunk-otel-collector/pull/5229)) -- (Splunk) Add `iis` receiver ([#TODO](https://github.com/signalfx/splunk-otel-collector/pull/TODO)) +- (Splunk) Add `iis` receiver ([#5717](https://github.com/signalfx/splunk-otel-collector/pull/5717)) ### 💡 Enhancements 💡