Skip to content

Commit

Permalink
[chore] prepare grafanacloudconnector for release (#32132)
Browse files Browse the repository at this point in the history
**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:** <Issue number if applicable>
#31647

---------

Signed-off-by: Robbie Lankford <robert.lankford@grafana.com>
  • Loading branch information
rlankfo authored Apr 3, 2024
1 parent 886c4b4 commit 5f1488f
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 6 deletions.
3 changes: 3 additions & 0 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

2 changes: 2 additions & 0 deletions cmd/otelcontribcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions connector/grafanacloudconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion connector/grafanacloudconnector/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion connector/grafanacloudconnector/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions internal/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -388,6 +389,7 @@ func Components() (otelcol.Factories, error) {
countconnector.NewFactory(),
datadogconnector.NewFactory(),
exceptionsconnector.NewFactory(),
grafanacloudconnector.NewFactory(),
routingconnector.NewFactory(),
servicegraphconnector.NewFactory(),
spanmetricsconnector.NewFactory(),
Expand Down

0 comments on commit 5f1488f

Please sign in to comment.