From 5f1488f0c31f67aec0e962f3bbfcae5c3e8724e3 Mon Sep 17 00:00:00 2001 From: Robert Lankford Date: Wed, 3 Apr 2024 00:16:20 -0700 Subject: [PATCH] [chore] prepare grafanacloudconnector for release (#32132) **Description:** As described in the documentation, this is the last PR to mark the new component as Alpha stability and add it to the cmd/otelcontribcol binary by updating the cmd/otelcontribcol/components.go file. **Link to tracking Issue:** #31647 --------- Signed-off-by: Robbie Lankford --- cmd/configschema/go.mod | 3 +++ cmd/configschema/go.sum | 2 ++ cmd/otelcontribcol/builder-config.yaml | 3 ++- cmd/otelcontribcol/components.go | 2 ++ cmd/otelcontribcol/go.mod | 3 +++ cmd/otelcontribcol/go.sum | 2 ++ connector/grafanacloudconnector/README.md | 4 ++-- connector/grafanacloudconnector/go.mod | 2 +- .../internal/metadata/generated_status.go | 2 +- connector/grafanacloudconnector/metadata.yaml | 2 +- go.mod | 3 +++ go.sum | 2 ++ internal/components/components.go | 2 ++ 13 files changed, 26 insertions(+), 6 deletions(-) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 9fa5113e0773..314f1720b2f6 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -477,6 +477,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.97.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.97.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.97.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.97.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.97.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.97.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.97.0 // indirect @@ -1156,3 +1157,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/stor replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension => ../../extension/encoding/otlpencodingextension replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding => ../../extension/encoding + +replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index df613643025b..8d4d09092bf4 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2347,6 +2347,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index fc50e19ef940..f546e302ed5b 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -209,6 +209,7 @@ connectors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.97.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.97.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.97.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.97.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.97.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.97.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.97.0 @@ -426,6 +427,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector => ../../connector/countconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector => ../../connector/datadogconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ../../connector/exceptionsconnector + - github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ../../connector/servicegraphconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ../../connector/spanmetricsconnector @@ -446,4 +448,3 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension => ../../extension/sumologicextension - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery - diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index b4825c85adde..53f8be8576c4 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -22,6 +22,7 @@ import ( countconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector" datadogconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector" exceptionsconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector" + grafanacloudconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector" routingconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector" servicegraphconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" spanmetricsconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" @@ -424,6 +425,7 @@ func components() (otelcol.Factories, error) { countconnector.NewFactory(), datadogconnector.NewFactory(), exceptionsconnector.NewFactory(), + grafanacloudconnector.NewFactory(), routingconnector.NewFactory(), servicegraphconnector.NewFactory(), spanmetricsconnector.NewFactory(), diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 4f475f5f8975..59b643353d2b 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -8,6 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.97.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.97.0 @@ -1158,6 +1159,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/data replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ../../connector/exceptionsconnector +replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector + replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ../../connector/servicegraphconnector diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index cf9167a8b7eb..842f215cfce5 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -2346,6 +2346,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.2.0 h1:I0DwBVMGAx26dttAj1BtJLAkVGncrkkUXfJLC4Flt/I= gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/connector/grafanacloudconnector/README.md b/connector/grafanacloudconnector/README.md index b70b3196aab2..41c415c8d770 100644 --- a/connector/grafanacloudconnector/README.md +++ b/connector/grafanacloudconnector/README.md @@ -7,14 +7,14 @@ | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fgrafanacloud%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fgrafanacloud) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fgrafanacloud%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fgrafanacloud) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@rlankfo](https://www.github.com/rlankfo), [@jcreixell](https://www.github.com/jcreixell) \| Seeking more code owners! | -[development]: https://github.com/open-telemetry/opentelemetry-collector#development +[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib ## Supported Pipeline Types | [Exporter Pipeline Type] | [Receiver Pipeline Type] | [Stability Level] | | ------------------------ | ------------------------ | ----------------- | -| traces | metrics | [development] | +| traces | metrics | [alpha] | [Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type [Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type diff --git a/connector/grafanacloudconnector/go.mod b/connector/grafanacloudconnector/go.mod index ff27c2885857..8f403e0664ff 100644 --- a/connector/grafanacloudconnector/go.mod +++ b/connector/grafanacloudconnector/go.mod @@ -1,6 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector -go 1.21.8 +go 1.21 require ( github.com/stretchr/testify v1.9.0 diff --git a/connector/grafanacloudconnector/internal/metadata/generated_status.go b/connector/grafanacloudconnector/internal/metadata/generated_status.go index 01477c50b966..78efdb31a113 100644 --- a/connector/grafanacloudconnector/internal/metadata/generated_status.go +++ b/connector/grafanacloudconnector/internal/metadata/generated_status.go @@ -13,7 +13,7 @@ var ( ) const ( - TracesToMetricsStability = component.StabilityLevelDevelopment + TracesToMetricsStability = component.StabilityLevelAlpha ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/connector/grafanacloudconnector/metadata.yaml b/connector/grafanacloudconnector/metadata.yaml index a87ba6192129..df5a33ad6cc2 100644 --- a/connector/grafanacloudconnector/metadata.yaml +++ b/connector/grafanacloudconnector/metadata.yaml @@ -4,7 +4,7 @@ scope_name: otelcol/grafanacloud status: class: connector stability: - development: [traces_to_metrics] + alpha: [traces_to_metrics] distributions: [contrib] codeowners: active: [jpkrohling, rlankfo, jcreixell] diff --git a/go.mod b/go.mod index 65987e39067c..70069136073e 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.97.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.97.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.97.0 @@ -1147,9 +1148,11 @@ replace ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector => ./connector/countconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector => ./connector/datadogconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ./connector/exceptionsconnector + github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ./connector/grafanacloudconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ./connector/routingconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ./connector/servicegraphconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ./connector/spanmetricsconnector + ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ./internal/sqlquery diff --git a/go.sum b/go.sum index 4dbe9ac25fb1..f39b84f159a9 100644 --- a/go.sum +++ b/go.sum @@ -2348,6 +2348,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/components/components.go b/internal/components/components.go index 44d61ba4aa55..979bb07bc50d 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -24,6 +24,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector" + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" @@ -388,6 +389,7 @@ func Components() (otelcol.Factories, error) { countconnector.NewFactory(), datadogconnector.NewFactory(), exceptionsconnector.NewFactory(), + grafanacloudconnector.NewFactory(), routingconnector.NewFactory(), servicegraphconnector.NewFactory(), spanmetricsconnector.NewFactory(),