From f5469f396a37c4076f1acb8ea09d37f1518a6b2e Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 20 Oct 2023 08:32:32 -0700 Subject: [PATCH] Add loadbalancingexporter to distro (#3825) --- CHANGELOG.md | 1 + docs/components.md | 27 +++++++++++++------------- go.mod | 5 ++++- go.sum | 10 +++++++++- internal/components/components.go | 2 ++ internal/components/components_test.go | 1 + 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05d24bab1f..cfc26cae86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ the `libsplunk.so` shared object library (default: `--without-systemd-instrumentation`) - `--otlp-endpoint host:port`: Set the OTLP gRPC endpoint for captured traces (default: `http://LISTEN_INTERFACE:4317` where `LISTEN_INTERFACE` is the value from the `--listen-interface` option if specified, or `127.0.0.1` otherwise) +- (Splunk) Add the loadbalancing exporter to the distribution ([#3825](https://github.com/signalfx/splunk-otel-collector/pull/3825)) ## v0.86.0 diff --git a/docs/components.md b/docs/components.md index ac1ce5c249..11ccd2babe 100644 --- a/docs/components.md +++ b/docs/components.md @@ -82,19 +82,20 @@ The distribution offers support for the following components.
-| Exporters | Stability | -|:---------------------------------------------------------------------------------------------------------------------|:-----------------| -| [debug](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/debugexporter) | [in development] | -| [file](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter) | [alpha] | -| [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/kafkaexporter) | [beta] | -| [httpsink](../internal/exporter/httpsinkexporter) | [in development] | -| [logging](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/loggingexporter) | [deprecated] | -| [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter) | [stable] | -| [otlphttp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter) | [stable] | -| [pulsar](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/pulsarexporter) | [alpha] | -| [signalfx](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter) | [beta] | -| [sapm](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sapmexporter) | [beta] | -| [splunk_hec](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/splunkhecexporter) | [beta] | +| Exporters | Stability | +|:----------------------------------------------------------------------------------------------------------------------------|:-----------------| +| [debug](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/debugexporter) | [in development] | +| [file](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter) | [alpha] | +| [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/kafkaexporter) | [beta] | +| [httpsink](../internal/exporter/httpsinkexporter) | [in development] | +| [loadbalancing](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/loadbalancingexporter) | [beta] | +| [logging](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/loggingexporter) | [deprecated] | +| [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter) | [stable] | +| [otlphttp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter) | [stable] | +| [pulsar](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/pulsarexporter) | [alpha] | +| [signalfx](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter) | [beta] | +| [sapm](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sapmexporter) | [beta] | +| [splunk_hec](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/splunkhecexporter) | [beta] |
diff --git a/go.mod b/go.mod index b71d54c733..b9b523dc1d 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.87.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.87.0 @@ -165,6 +166,7 @@ require ( github.com/moby/patternmatcher v0.5.0 // indirect github.com/moby/sys/sequential v0.5.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.87.0 // indirect @@ -204,6 +206,7 @@ require ( go.opentelemetry.io/proto/otlp v1.0.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect + sigs.k8s.io/controller-runtime v0.16.2 // indirect ) require ( @@ -261,7 +264,7 @@ require ( github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect github.com/containerd/containerd v1.7.6 // indirect - github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-semver v0.3.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/denisenkom/go-mssqldb v0.12.3 // indirect diff --git a/go.sum b/go.sum index 2b2bc93346..bbdcdf8809 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,9 @@ github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45m github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw= github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -462,6 +463,7 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -1114,6 +1116,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.87.0/go.mod h1:hCW56IompCDBqn91bU5tseVCsiMi3cjJCwwYwHIW8Qs= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0 h1:JADmKOCiLljFDjic3Fb5yyPsvNj7IBJyZU6QrnOUZH0= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.87.0/go.mod h1:WKjmyVi+Xhhvuvj2J+1Z0fXvY38MKRbREe2aR5UPOIw= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0 h1:+apdZt5DPPIxjBrayu1muKbvUK3zqsfgb+3fMh6Hnyo= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.87.0/go.mod h1:JXVmcuySy3xyo3JjoU+CrNWy/C12Fw6JB1HWXf26HwQ= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.87.0 h1:52+RVfmzj+JePVJuD07gfppdzF9fsKASIRGzTC05QIg= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.87.0 h1:eWYdD2BOC4PtYi2zlJt2qrZkXrld3YWqowdu3tUJVAg= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter v0.87.0/go.mod h1:v/wW5xSrLdfOExRRe5LKsaYuxj0E7K9/mho5BNITD+k= @@ -1170,6 +1174,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.87. github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.87.0/go.mod h1:UzFeYKNUASQbotHqmgwyQaxWzNnxs+raNJlEfjm2dMQ= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.87.0 h1:Y33/Rqo5qBOc29oobYHQdzkZF/EliWepokS0YDRbkjg= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.87.0/go.mod h1:rKGi5XluJau5mJNh1Mj4k1GafWnCdYobT9YJW/+zzbY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0 h1:sy75u6ZwBvRwv9RjEF65SqlkBsAeZFqF4+eFOLhIsJQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.87.0/go.mod h1:trWrnucNKCkBEYpe5IBo+RgGQtzwMT454sGkWsggmDM= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.87.0 h1:In1MvDALXpwvKssEX9FAWS1aAAhw2XIBsTb5ti2iFMg= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.87.0/go.mod h1:BYadY3muPFv/Bpla5px88egUfaR6aNhTZsi39dIGgWs= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0 h1:jtdLqdRyt29EUd6H6p431/XmGHwS6BHB5s/EqCfEWoc= @@ -2265,6 +2271,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU= +sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= diff --git a/internal/components/components.go b/internal/components/components.go index cf7cc59651..940b9a27d6 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -20,6 +20,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter" @@ -185,6 +186,7 @@ func Get() (otelcol.Factories, error) { debugexporter.NewFactory(), fileexporter.NewFactory(), kafkaexporter.NewFactory(), + loadbalancingexporter.NewFactory(), loggingexporter.NewFactory(), otlpexporter.NewFactory(), otlphttpexporter.NewFactory(), diff --git a/internal/components/components_test.go b/internal/components/components_test.go index 25331ee60d..8645536283 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -107,6 +107,7 @@ func TestDefaultComponents(t *testing.T) { "debug", "file", "kafka", + "loadbalancing", "logging", "otlp", "otlphttp",