Merge pull request #645 from solarwinds/feature/NH-68385

NH-68385: Adding k8sobjectsreceiver to k8s collector docker image
solarwinds · Jun 25, 2024 · b1b81e1 · b1b81e1
2 parents dab9711 + 0223f03
commit b1b81e1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/build/docker/structure-test.yaml b/build/docker/structure-test.yaml
@@ -17,4 +17,4 @@ commandTests:
   - name: "swi-otelcol is working in the image"
     command: "/swi-otelcol"
     args: ["-v"]
-    expectedOutput: ["swi-k8s-opentelemetry-collector version 0.10.0"]
+    expectedOutput: ["swi-k8s-opentelemetry-collector version 0.11.0"]
diff --git a/src/cmd/components.go b/src/cmd/components.go
@@ -31,6 +31,7 @@ import (
 	filelogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver"
 	journaldreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver"
 	k8seventsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver"
+	k8sobjectsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver"
 	prometheusreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
 	receivercreator "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator"
 	simpleprometheusreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver"
@@ -66,6 +67,7 @@ func components() (otelcol.Factories, error) {
 	factories.Receivers, err = receiver.MakeFactoryMap(
 		prometheusreceiver.NewFactory(),
 		k8seventsreceiver.NewFactory(),
+		k8sobjectsreceiver.NewFactory(),
 		filelogreceiver.NewFactory(),
 		journaldreceiver.NewFactory(),
 		windowseventlogreceiver.NewFactory(),

diff --git a/src/cmd/go.mod b/src/cmd/go.mod
@@ -33,6 +33,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.98.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.98.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.98.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.98.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.98.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.98.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.98.0

diff --git a/src/cmd/go.sum b/src/cmd/go.sum
@@ -539,6 +539,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.98.
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.98.0/go.mod h1:EwaZ9Bj0+7l5roLUkdKIH1pHXdfHCGve/8mZTf5Hzxk=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.98.0 h1:i5+XkPXUFqbNnOYngPq1b7nZ1PyGdAtLwcsEGHJ79yw=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.98.0/go.mod h1:JRRvo6HJ8jtHzHA2/H4+bIZsO5M8gpSXDLZ06fHN7II=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.98.0 h1:wRD+b1q1n6lSzX7HsydCtSyqL2HqW0miyWOw87rI+L8=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.98.0/go.mod h1:1OsbednOq+I/HsWwIhJ8J6Glv8JhWiNNPm9ReVq9Nfk=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.98.0 h1:F6ZLrCnfX4JmSQaqfpHY3k7dLjAmXOoYdWbfVkbpT/s=
 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.98.0/go.mod h1:jdQtG3kZnRRZ6lv/Q3iBINkMN8BfZStsLhG08okP19M=
 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.98.0 h1:Y4UbYtpt+AsCVj4W8HKxLSlKNrMLhxypmA34GkwjJGE=
@@ -581,6 +583,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldrecei
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.98.0/go.mod h1:rxpSJXQyNJj5sDvz86sZCBCrGDpS+JK5qyzVNee6eeE=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.98.0 h1:K6dYF20qdqn9QSlijqbTVAjCZQxzLwDdsQkdtW+Zlm8=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.98.0/go.mod h1:eVg5mfwmn3uk0K7o3jRe2m8i0Ldv9aenjTmyuwTJCJ0=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.98.0 h1:OFI2v3A31Y7mDumVdD2F8DSNAeoazhN1gf2s5rfwT30=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.98.0/go.mod h1:5STdsD6gbx/5uQMu0UIOJ9BHEz+rt8yy37j4IRX4zzw=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.98.0 h1:zlAAkEfq8HMwVPRIMWeoMIdwwO2ULDoTQCj/NxfJ4MI=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.98.0/go.mod h1:JLA1nMGAcSlqAdtK9KuVg092WnrXE2ULkCr1j/1po6g=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.98.0 h1:VzeSurxdtdhxAumPzq/jqmSNdazAigoJLoryIiV8cE8=

diff --git a/src/cmd/main.go b/src/cmd/main.go
@@ -26,7 +26,7 @@ func main() {
 	info := component.BuildInfo{
 		Command:     "swi-k8s-opentelemetry-collector",
 		Description: "SolarWinds distribution for OpenTelemetry",
-		Version:     "0.10.0",
+		Version:     "0.11.0",
 	}
 
 	if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: components}); err != nil {