add spanmetrics connector and count connector (#3300)

* add spanmetrics connector and count connector * update docs page * drop to 0.79 on connectors and tweaks to components.md * dont forget to tidy --------- Co-authored-by: jeremyh <jeremyrhicks@gmail.com>
signalfx · Jun 22, 2023 · 4bbcfbc · 4bbcfbc
1 parent 1d7232b
commit 4bbcfbc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/docs/components.md b/docs/components.md
@@ -116,9 +116,11 @@ The distribution offers support for the following components.
 
 <div>
 
-| Connectors                                                                                                           | Stability        |
-|:---------------------------------------------------------------------------------------------------------------------|:-----------------|
-| [forward](https://github.com/open-telemetry/opentelemetry-collector/tree/main/connector/forwardconnector)            | [alpha]          |
+| Connectors                                                                                                                 | Stability        |
+|:---------------------------------------------------------------------------------------------------------------------------|:-----------------|
+| [count](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/countconnector)              | [in development] |
+| [forward](https://github.com/open-telemetry/opentelemetry-collector/tree/main/connector/forwardconnector)                  | [beta]           |
+| [spanmetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/spanmetricsconnector)  | [alpha]          |
 
 </div>
 </div>

diff --git a/go.mod b/go.mod
@@ -15,6 +15,8 @@ require (
 	github.com/hashicorp/vault/api v1.9.2
 	github.com/jaegertracing/jaeger v1.41.0
 	github.com/knadh/koanf v1.5.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.79.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.79.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.79.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.79.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.79.0

diff --git a/go.sum b/go.sum
@@ -1115,6 +1115,10 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
 github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.79.0 h1:fhiuI19Vp6V830F3RtUCita/MNXdm9sHlonUjstIE9M=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.79.0/go.mod h1:EEXQMPfuqiS514i734021gRCattUAq2KDhHiZPQmmjk=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.79.0 h1:OjivbKImHmtCRw2QT2ZC6OwHGuqTGXXQ+ys/pEJvNNw=
+github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.79.0/go.mod h1:kzQyntnBGZPs35fKJSENMjEhDur+HJHAwIxaxWYitDg=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.79.0 h1:o2WthvXeW+uwbXDW0GemAQ7/d6AP56lcEHIOOuqeXNQ=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.79.0/go.mod h1:vHEsZ7gmysbsKwBeXfjdvkbrzZlfweAcGh9+jZP0Mig=
 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.79.0 h1:ZnMXlPr89HVj5HttFJbElyhlS/Em17pQ2rjtpxFv7oY=

diff --git a/internal/components/components.go b/internal/components/components.go
@@ -16,6 +16,8 @@
 package components
 
 import (
+	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector"
+	"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/sapmexporter"
@@ -214,7 +216,9 @@ func Get() (otelcol.Factories, error) {
 	}
 
 	connectors, err := connector.MakeFactoryMap(
+		countconnector.NewFactory(),
 		forwardconnector.NewFactory(),
+		spanmetricsconnector.NewFactory(),
 	)
 	if err != nil {
 		errs = append(errs, err)

diff --git a/internal/components/components_test.go b/internal/components/components_test.go
@@ -113,6 +113,8 @@ func TestDefaultComponents(t *testing.T) {
 		"httpsink",
 	}
 	expectedConnectors := []component.Type{
+		"count",
+		"spanmetrics",
 		"forward",
 	}
 

diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -42,7 +42,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.1 // indirect
 	github.com/blizzy78/varnamelen v0.8.0 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
 	github.com/bombsimon/wsl/v3 v3.4.0 // indirect
 	github.com/breml/bidichk v0.2.4 // indirect
 	github.com/breml/errchkjson v0.3.1 // indirect

diff --git a/internal/tools/go.sum b/internal/tools/go.sum
@@ -107,6 +107,8 @@ github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ
 github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
 github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA=
 github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc=
+github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU=
 github.com/bombsimon/wsl/v3 v3.4.0/go.mod h1:KkIB+TXkqy6MvK9BDZVbZxKNYsE1/oLRJbIFtf14qqo=
 github.com/breml/bidichk v0.2.4 h1:i3yedFWWQ7YzjdZJHnPo9d/xURinSq3OM+gyM43K4/8=