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

Add spanmetrics connector to default components #2668

Closed
wants to merge 2 commits into from
Closed

Add spanmetrics connector to default components #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c90faf8
Add spanmetrics connector to default components
meijeran Mar 5, 2024
062b7df
Merge branch 'main' into add-spanmetrics
meijeran Mar 11, 2024
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
6 changes: 4 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.21

require (
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.94.0
Expand Down Expand Up @@ -50,6 +51,7 @@ require (
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.94.1
go.opentelemetry.io/collector/confmap v0.94.1
go.opentelemetry.io/collector/connector v0.94.1
go.opentelemetry.io/collector/exporter v0.94.1
go.opentelemetry.io/collector/exporter/loggingexporter v0.94.1
go.opentelemetry.io/collector/exporter/otlpexporter v0.94.1
Expand Down Expand Up @@ -231,7 +233,7 @@ require (
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/klauspost/compress v1.17.5 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/knadh/koanf/v2 v2.0.2 // indirect
github.com/knadh/koanf/v2 v2.1.0 // indirect
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect
Expand Down Expand Up @@ -326,6 +328,7 @@ require (
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/tinylru v1.1.0 // indirect
github.com/tidwall/wal v1.1.7 // indirect
github.com/tilinna/clock v1.1.0 // indirect
github.com/tinylib/msgp v1.1.9 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
Expand All @@ -350,7 +353,6 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
go.opentelemetry.io/collector/config/configtls v0.94.1 // indirect
go.opentelemetry.io/collector/config/internal v0.94.1 // indirect
go.opentelemetry.io/collector/connector v0.94.1 // indirect
go.opentelemetry.io/collector/consumer v0.94.1 // indirect
go.opentelemetry.io/collector/extension/auth v0.94.1 // indirect
go.opentelemetry.io/collector/pdata v1.1.0 // indirect
Expand Down
8 changes: 6 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,8 @@ github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPq
github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
github.com/knadh/koanf/v2 v2.0.2 h1:sEZzPW2rVWSahcYILNq/syJdEyRafZIG0l9aWwL86HA=
github.com/knadh/koanf/v2 v2.0.2/go.mod h1:HN9uZ+qFAejH1e4G41gnoffIanINWQuONLXiV7kir6k=
github.com/knadh/koanf/v2 v2.1.0 h1:eh4QmHHBuU8BybfIJ8mB8K8gsGCD/AUQTdwGq/GzId8=
github.com/knadh/koanf/v2 v2.1.0/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es=
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down Expand Up @@ -766,6 +766,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3pro
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.94.0/go.mod h1:WfLllQhkLL04o29QKZdSoXQ4ZV2bEXuzMSR9nNw9WPo=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.94.0 h1:FG37HfcpKix1R4NmksrzPzU3buPJMz/I61Mn9UyKWSQ=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.94.0/go.mod h1:gR0ZddmLZfA0Tr780ei77gF+TKNm/b6JeMW0ukI7ja8=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.94.0 h1:yG2Y7AAvruaY0AV5/2vdQ0Cbiq4849hPm3OClQGfYOM=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.94.0/go.mod h1:hhSpAfse5IQTj+o/ZGhjlblDazOYOOCnYFnp2O2Geyg=
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.94.0 h1:Rph+nFgSb9PP1DMVixgF0NK1bjfxpfCFtNa0Ov2BFBc=
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.94.0/go.mod h1:YbKjegC6d1lY6JOzjKK3FV99lkBH6SbYTGpLUDp8BII=
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.94.0 h1:06ERYtjwnhwxZO62Mtxg2l7aERDs8G+Crer0lbrxBRs=
Expand Down Expand Up @@ -1098,6 +1100,8 @@ github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I
github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ6OFbzw8=
github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4=
github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E=
github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs=
github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao=
github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU=
github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k=
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
Expand Down
13 changes: 13 additions & 0 deletions pkg/defaultcomponents/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package defaultcomponents // import "aws-observability.io/collector/defaultcomponents

import (
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
Expand Down Expand Up @@ -56,6 +57,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/loggingexporter"
"go.opentelemetry.io/collector/exporter/otlpexporter"
Expand Down Expand Up @@ -159,11 +161,22 @@ func Components() (otelcol.Factories, error) {
errs = multierr.Append(errs, err)
}

connectorList := []connector.Factory{
spanmetricsconnector.NewFactory(),
}

connectors, err := connector.MakeFactoryMap(connectorList...)

if err != nil {
errs = multierr.Append(errs, err)
}

factories := otelcol.Factories{
Extensions: extensions,
Receivers: receivers,
Processors: processors,
Exporters: exporters,
Connectors: connectors,
}

return factories, errs
Expand Down
6 changes: 6 additions & 0 deletions pkg/defaultcomponents/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const (
receiversCount = 10
extensionsCount = 8
processorCount = 15
connectorCount = 1
)

// Assert that the components behind feature gate are not in the default
Expand Down Expand Up @@ -105,4 +106,9 @@ func TestComponents(t *testing.T) {
assert.NotNil(t, processors["tail_sampling"])
assert.NotNil(t, processors["k8sattributes"])

// Connectors
connectors := factories.Connectors
assert.Len(t, connectors, connectorCount)
assert.NotNil(t, connectors["spanmetrics"])

}
4 changes: 3 additions & 1 deletion testbed/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ require (
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/klauspost/compress v1.17.5 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/knadh/koanf/v2 v2.0.2 // indirect
github.com/knadh/koanf/v2 v2.1.0 // indirect
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect
Expand All @@ -191,6 +191,7 @@ require (
github.com/mrunalp/fileutils v0.5.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.94.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.94.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.94.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.94.0 // indirect
Expand Down Expand Up @@ -320,6 +321,7 @@ require (
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/tinylru v1.1.0 // indirect
github.com/tidwall/wal v1.1.7 // indirect
github.com/tilinna/clock v1.1.0 // indirect
github.com/tinylib/msgp v1.1.9 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
Expand Down
8 changes: 6 additions & 2 deletions testbed/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,8 @@ github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPq
github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
github.com/knadh/koanf/v2 v2.0.2 h1:sEZzPW2rVWSahcYILNq/syJdEyRafZIG0l9aWwL86HA=
github.com/knadh/koanf/v2 v2.0.2/go.mod h1:HN9uZ+qFAejH1e4G41gnoffIanINWQuONLXiV7kir6k=
github.com/knadh/koanf/v2 v2.1.0 h1:eh4QmHHBuU8BybfIJ8mB8K8gsGCD/AUQTdwGq/GzId8=
github.com/knadh/koanf/v2 v2.1.0/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es=
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down Expand Up @@ -772,6 +772,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.94.0 h1:FG37HfcpKix1R4NmksrzPzU3buPJMz/I61Mn9UyKWSQ=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.94.0/go.mod h1:gR0ZddmLZfA0Tr780ei77gF+TKNm/b6JeMW0ukI7ja8=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.94.0 h1:yG2Y7AAvruaY0AV5/2vdQ0Cbiq4849hPm3OClQGfYOM=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.94.0/go.mod h1:hhSpAfse5IQTj+o/ZGhjlblDazOYOOCnYFnp2O2Geyg=
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.94.0 h1:Rph+nFgSb9PP1DMVixgF0NK1bjfxpfCFtNa0Ov2BFBc=
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.94.0/go.mod h1:YbKjegC6d1lY6JOzjKK3FV99lkBH6SbYTGpLUDp8BII=
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.94.0 h1:06ERYtjwnhwxZO62Mtxg2l7aERDs8G+Crer0lbrxBRs=
Expand Down Expand Up @@ -1138,6 +1140,8 @@ github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I
github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ6OFbzw8=
github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4=
github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E=
github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs=
github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao=
github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU=
github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k=
Expand Down