From 98ae65b4824bb00801ee8533972f0c73e8b333dd Mon Sep 17 00:00:00 2001 From: Christos Markou Date: Fri, 26 Jul 2024 14:44:25 +0300 Subject: [PATCH] [connector/otlpjson] Move stability to alpha (#34253) **Description:** This is the 3rd PR for the new otlpjson connector (https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208). Moves its stability to `alpha`. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34239 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34249 **Testing:** ~ **Documentation:** Updated --------- Signed-off-by: ChrsMark --- .chloggen/otlpjsoncon_alpha.yaml | 27 +++++++++++++++++++ cmd/otelcontribcol/builder-config.yaml | 2 ++ cmd/otelcontribcol/components.go | 3 +++ cmd/otelcontribcol/go.mod | 3 +++ connector/otlpjsonconnector/README.md | 8 +++--- connector/otlpjsonconnector/config.go | 4 --- connector/otlpjsonconnector/config_test.go | 4 --- .../internal/metadata/generated_status.go | 6 ++--- connector/otlpjsonconnector/metadata.yaml | 3 ++- 9 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 .chloggen/otlpjsoncon_alpha.yaml delete mode 100644 connector/otlpjsonconnector/config_test.go diff --git a/.chloggen/otlpjsoncon_alpha.yaml b/.chloggen/otlpjsoncon_alpha.yaml new file mode 100644 index 000000000000..d377ad1629a4 --- /dev/null +++ b/.chloggen/otlpjsoncon_alpha.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: otlpjsonconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Move connector's stability to alpha. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34208, 34253] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 294d571463d3..68760fb25790 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -226,6 +226,7 @@ connectors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.105.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.105.0 @@ -455,6 +456,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ../../connector/exceptionsconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector => ../../connector/failoverconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector + - github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector => ../../connector/otlpjsonconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector => ../../connector/roundrobinconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ../../connector/servicegraphconnector diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index fa9632185fff..be4d3c9376a3 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -27,6 +27,7 @@ import ( exceptionsconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector" failoverconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector" grafanacloudconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector" + otlpjsonconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" roundrobinconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector" routingconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector" servicegraphconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" @@ -647,6 +648,7 @@ func components() (otelcol.Factories, error) { exceptionsconnector.NewFactory(), failoverconnector.NewFactory(), grafanacloudconnector.NewFactory(), + otlpjsonconnector.NewFactory(), roundrobinconnector.NewFactory(), routingconnector.NewFactory(), servicegraphconnector.NewFactory(), @@ -662,6 +664,7 @@ func components() (otelcol.Factories, error) { factories.ConnectorModules[exceptionsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.105.0" factories.ConnectorModules[failoverconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.105.0" factories.ConnectorModules[grafanacloudconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.105.0" + factories.ConnectorModules[otlpjsonconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.105.0" factories.ConnectorModules[roundrobinconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.105.0" factories.ConnectorModules[routingconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.105.0" factories.ConnectorModules[servicegraphconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.105.0" diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 00664dc8a732..e8e9d339a13d 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -14,6 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.105.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.105.0 @@ -1266,6 +1267,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/fail replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector +replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector => ../../connector/otlpjsonconnector + replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector => ../../connector/roundrobinconnector replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector diff --git a/connector/otlpjsonconnector/README.md b/connector/otlpjsonconnector/README.md index 6e61f650932f..73a330e0898f 100644 --- a/connector/otlpjsonconnector/README.md +++ b/connector/otlpjsonconnector/README.md @@ -7,16 +7,16 @@ | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fotlpjson%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fotlpjson) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fotlpjson%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fotlpjson) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@ChrsMark](https://www.github.com/ChrsMark) | -[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] | | ------------------------ | ------------------------ | ----------------- | -| logs | metrics | [development] | -| logs | traces | [development] | -| logs | logs | [development] | +| logs | metrics | [alpha] | +| logs | traces | [alpha] | +| logs | logs | [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/otlpjsonconnector/config.go b/connector/otlpjsonconnector/config.go index 180fa353c5dd..509a2039283c 100644 --- a/connector/otlpjsonconnector/config.go +++ b/connector/otlpjsonconnector/config.go @@ -4,7 +4,3 @@ package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" type Config struct{} - -func (c *Config) Validate() error { - return nil -} diff --git a/connector/otlpjsonconnector/config_test.go b/connector/otlpjsonconnector/config_test.go deleted file mode 100644 index d594196c182b..000000000000 --- a/connector/otlpjsonconnector/config_test.go +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package otlpjsonconnector diff --git a/connector/otlpjsonconnector/internal/metadata/generated_status.go b/connector/otlpjsonconnector/internal/metadata/generated_status.go index dd3f763e24db..6d86f44cf5eb 100644 --- a/connector/otlpjsonconnector/internal/metadata/generated_status.go +++ b/connector/otlpjsonconnector/internal/metadata/generated_status.go @@ -11,7 +11,7 @@ var ( ) const ( - LogsToMetricsStability = component.StabilityLevelDevelopment - LogsToTracesStability = component.StabilityLevelDevelopment - LogsToLogsStability = component.StabilityLevelDevelopment + LogsToMetricsStability = component.StabilityLevelAlpha + LogsToTracesStability = component.StabilityLevelAlpha + LogsToLogsStability = component.StabilityLevelAlpha ) diff --git a/connector/otlpjsonconnector/metadata.yaml b/connector/otlpjsonconnector/metadata.yaml index c6927d232eee..2a7295154996 100644 --- a/connector/otlpjsonconnector/metadata.yaml +++ b/connector/otlpjsonconnector/metadata.yaml @@ -1,9 +1,10 @@ type: otlpjson +scope_name: otelcol/otlpjson status: class: connector stability: - development: [logs_to_metrics, logs_to_traces, logs_to_logs] + alpha: [logs_to_metrics, logs_to_traces, logs_to_logs] distributions: [contrib] codeowners: active: [djaglowski, ChrsMark]