adopt apache receiver into our distro

signalfx · Mar 23, 2024 · 6139755 · 6139755
1 parent 7e1f0cc
commit 6139755
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/go.mod b/go.mod
@@ -229,6 +229,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.96.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.96.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.96.0 // indirect
 	github.com/ovh/go-ovh v1.4.3 // indirect
 	github.com/packethost/packngo v0.31.0 // indirect
 	github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect

diff --git a/go.sum b/go.sum
@@ -1403,6 +1403,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsampling
 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0/go.mod h1:dMQQJpxvUVsvii1WU/NaUzWmUf4H63ycRC1YG6RZA+M=
 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.96.0 h1:kqxZ0V2h6kv+AU4Dl2vp57/ayycJy9w3krWe9vBt/IA=
 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.96.0/go.mod h1:nSzmYMNiaw/CtKrmfG93D2Wpln0ZTvEPZ6oW/UECHuM=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.96.0 h1:xbz1xQqRsBae70Svb0eDkaoGDS/JnYSDxe11T6IpGTs=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.96.0/go.mod h1:DjessC3tgnKWkkfpZsK9L/iGYio3NmqJI1yk6bVUBPM=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.96.0 h1:15HoMfuG4cpR+CYm0wXWa3ipDZoQqlY2PG1qpFJrwho=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.96.0/go.mod h1:PO85MJYS4jy8EcIBYJeYMr469OZ1QicUJmHxU2m3I3s=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.96.0 h1:jYLHY2LTbRJw4ZvDr9i67+/S2otrcog3ECR9EPy+7HM=

diff --git a/internal/components/components.go b/internal/components/components.go
@@ -51,6 +51,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/apachereceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver"
@@ -141,6 +142,7 @@ func Get() (otelcol.Factories, error) {
 	}
 
 	receivers, err := receiver.MakeFactoryMap(
+		apachereceiver.NewFactory(),
 		azureeventhubreceiver.NewFactory(),
 		carbonreceiver.NewFactory(),
 		cloudfoundryreceiver.NewFactory(),

diff --git a/internal/components/components_test.go b/internal/components/components_test.go
@@ -42,6 +42,7 @@ func TestDefaultComponents(t *testing.T) {
 	}
 	expectedReceivers := []component.Type{
 		"azureeventhub",
+		"apache",
 		"carbon",
 		"cloudfoundry",
 		"collectd",