From 8227c49d2cb9d32f9d6c1cd5d1a0b1fee69e4527 Mon Sep 17 00:00:00 2001 From: james hughes Date: Fri, 22 Mar 2024 18:06:17 -0700 Subject: [PATCH] adopt apache receiver into our distro --- go.mod | 1 + go.sum | 2 ++ internal/components/components.go | 2 ++ internal/components/components_test.go | 1 + 4 files changed, 6 insertions(+) diff --git a/go.mod b/go.mod index 7b5ad675d6..595f3998f3 100644 --- a/go.mod +++ b/go.mod @@ -53,6 +53,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.96.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.96.0 diff --git a/go.sum b/go.sum index 8472ca3b30..7e523218c7 100644 --- 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 index f41d401fda..d19e32a917 100644 --- 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 index b2dc572e72..f34a011a96 100644 --- 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",