Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added solace receiver to the splunk otel collector #3590

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Added solace receiver to the splunk otel collector #3590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf8bdd
added solace receiver to splunk otel collector
Sep 6, 2023
6c667b3
resolving merge conflict with main
Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/components.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ The distribution offers support for the following components.
| [signalfx](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/signalfxreceiver) | [stable] |
| [simpleprometheus](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/simpleprometheusreceiver) | [beta] |
| [smartagent](../pkg/receiver/smartagentreceiver) | [beta] |
| [solace](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/solacereceiver) | [beta] |
| [splunk_hec](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/splunkhecreceiver) | [beta] |
| [sqlquery](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/sqlqueryreceiver) | [alpha] |
| [statsd](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/statsdreceiver) | [beta] |
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.83.0
Expand Down Expand Up @@ -163,7 +164,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.83.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.83.0 // indirect
github.com/ovh/go-ovh v1.4.1 // indirect
github.com/ovh/go-ovh v1.4.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxrecei
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.83.0/go.mod h1:oKch7fKCrlP+JEEzhuk4mAHHm1KWulPQl9DzkwcZjgo=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.83.0 h1:L45mckI3wbOIkxaz5P9MdKwu+TK6erlhlqqm23np02E=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.83.0/go.mod h1:xhhAR2uoo5AFup5IZEmXCO1c1sqXHLE9eVz9Vl/Ff+4=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.83.0 h1:D3LETb4/3aawGRUDMMyr1MaqepIC6c+RpDlXSAvuQBc=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.83.0/go.mod h1:4GeCRLS3BerFkRbwHLxxlpftmVd59aceKFWc4EabV1o=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.83.0 h1:OqnxnU8Ny5lqjGhkmhJpx+P5GoFI41djKkQn39jNrCY=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.83.0/go.mod h1:T1jbxVNo0XY2nA/3aMwoFHChra1GocCBxUuB5BZMarw=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.83.0 h1:UZA8TNrJr59mUMDX5kNBLWxSdd0Z/hrxNHdeZofR0+A=
Expand Down Expand Up @@ -1319,8 +1321,8 @@ github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDO
github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY=
github.com/oracle/oci-go-sdk v24.3.0+incompatible h1:x4mcfb4agelf1O4/1/auGlZ1lr97jXRSSN5MxTgG/zU=
github.com/oracle/oci-go-sdk/v60 v60.0.0 h1:EJAWjEi4SY5Raha6iUzq4LTQ0uM5YFw/wat/L1ehIEM=
github.com/ovh/go-ovh v1.4.1 h1:VBGa5wMyQtTP7Zb+w97zRCh9sLtM/2YKRyy+MEJmWaM=
github.com/ovh/go-ovh v1.4.1/go.mod h1:6bL6pPyUT7tBfI0pqOegJgRjgjuO+mOo+MyXd1EEC0M=
github.com/ovh/go-ovh v1.4.2 h1:ub4jVK6ERbiBTo4y5wbLCjeKCjGY+K36e7BviW+MaAU=
github.com/ovh/go-ovh v1.4.2/go.mod h1:AkPXVtgwB6xlKblMjRKJJmjRp+ogrE7fz2lVgcQY8SY=
github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c h1:vwpFWvAO8DeIZfFeqASzZfsxuWPno9ncAebBEP0N3uE=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
Expand Down
2 changes: 2 additions & 0 deletions internal/components/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver"
Expand Down Expand Up @@ -162,6 +163,7 @@ func Get() (otelcol.Factories, error) {
signalfxgatewayprometheusremotewritereceiver.NewFactory(),
simpleprometheusreceiver.NewFactory(),
smartagentreceiver.NewFactory(),
solacereceiver.NewFactory(),
splunkhecreceiver.NewFactory(),
sqlqueryreceiver.NewFactory(),
statsdreceiver.NewFactory(),
Expand Down
1 change: 1 addition & 0 deletions internal/components/components_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func TestDefaultComponents(t *testing.T) {
"signalfx",
"signalfxgatewayprometheusremotewrite",
"smartagent",
"solace",
"splunk_hec",
"sqlquery",
"statsd",
Expand Down