From 9b35586af91be8a91cafe01a5eb878d31da63b57 Mon Sep 17 00:00:00 2001 From: akats7 Date: Fri, 19 Apr 2024 11:41:15 -0400 Subject: [PATCH 1/5] put failoverconnector into alpha and add to contrib distribution --- .chloggen/failover-alpha.yaml | 27 +++++++++++++++++++++++ cmd/otelcontribcol/components.go | 2 ++ cmd/otelcontribcol/go.mod | 3 +++ cmd/otelcontribcol/go.sum | 1 + connector/failoverconnector/metadata.yaml | 8 +++---- 5 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 .chloggen/failover-alpha.yaml diff --git a/.chloggen/failover-alpha.yaml b/.chloggen/failover-alpha.yaml new file mode 100644 index 000000000000..8bda149f36b5 --- /dev/null +++ b/.chloggen/failover-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: failoverconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: This change puts the failoverconnector into alpha + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [20766] + +# (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: [] diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index 8b85c1bd1732..6786b5dcca9b 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -24,6 +24,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" + failoverconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector" 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" @@ -431,6 +432,7 @@ func components() (otelcol.Factories, error) { countconnector.NewFactory(), datadogconnector.NewFactory(), exceptionsconnector.NewFactory(), + failoverconnector.NewFactory(), grafanacloudconnector.NewFactory(), routingconnector.NewFactory(), servicegraphconnector.NewFactory(), diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 92dac7af2c52..4e68f0763586 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -10,6 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.98.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.98.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.98.0 @@ -1156,6 +1157,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/failoverconnector => ../../connector/failoverconnector + replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 80eeb61b4d2b..ca7d3555ffac 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1233,6 +1233,7 @@ github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8P github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-telemetry/opamp-go v0.14.0 h1:KoziIK+wsFojhUXNTkCSTnCPf0eCMqFAaccOs0HrWIY= github.com/open-telemetry/opamp-go v0.14.0/go.mod h1:XOGCigljsLSTZ8FfLwvat0M1QDj3conIIgRa77BWrKs= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.98.0/go.mod h1:WO5aWpnNtWMv44kxyyMmnNZzC+4XIH2SFHJDM6vVFa4= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= diff --git a/connector/failoverconnector/metadata.yaml b/connector/failoverconnector/metadata.yaml index 0558c7a0c2eb..91cfc3a67e72 100644 --- a/connector/failoverconnector/metadata.yaml +++ b/connector/failoverconnector/metadata.yaml @@ -4,11 +4,11 @@ scope_name: otelcol/failover status: class: connector stability: - development: [metrics_to_metrics, traces_to_traces, logs_to_logs] - distributions: [] + alpha: [traces_to_traces, metrics_to_metrics, logs_to_logs] + distributions: [contrib] codeowners: active: [akats7, djaglowski, fatsheep9146] tests: - skip_lifecycle: true - skip_shutdown: true + skip_lifecycle: true + skip_shutdown: true From cff895a323bd73fc710ca5b78a419e0314554387 Mon Sep 17 00:00:00 2001 From: akats7 Date: Fri, 19 Apr 2024 13:01:20 -0400 Subject: [PATCH 2/5] updated metadata --- connector/failoverconnector/README.md | 11 ++++++----- .../internal/metadata/generated_status.go | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/connector/failoverconnector/README.md b/connector/failoverconnector/README.md index 9694a6394f3b..329c113223f5 100644 --- a/connector/failoverconnector/README.md +++ b/connector/failoverconnector/README.md @@ -3,19 +3,20 @@ | Status | | | ------------- |-----------| -| Distributions | [] | +| Distributions | [contrib] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Ffailover%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Ffailover) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Ffailover%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Ffailover) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@akats7](https://www.github.com/akats7), [@djaglowski](https://www.github.com/djaglowski), [@fatsheep9146](https://www.github.com/fatsheep9146) | -[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] | | ------------------------ | ------------------------ | ----------------- | -| metrics | metrics | [development] | -| traces | traces | [development] | -| logs | logs | [development] | +| traces | traces | [alpha] | +| metrics | metrics | [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/failoverconnector/internal/metadata/generated_status.go b/connector/failoverconnector/internal/metadata/generated_status.go index 10fdcbe7b9fb..1caf608cb48f 100644 --- a/connector/failoverconnector/internal/metadata/generated_status.go +++ b/connector/failoverconnector/internal/metadata/generated_status.go @@ -13,9 +13,9 @@ var ( ) const ( - MetricsToMetricsStability = component.StabilityLevelDevelopment - TracesToTracesStability = component.StabilityLevelDevelopment - LogsToLogsStability = component.StabilityLevelDevelopment + TracesToTracesStability = component.StabilityLevelAlpha + MetricsToMetricsStability = component.StabilityLevelAlpha + LogsToLogsStability = component.StabilityLevelAlpha ) func Meter(settings component.TelemetrySettings) metric.Meter { From a0bed0386cc8fea531dfd9118368e6f53eb6641d Mon Sep 17 00:00:00 2001 From: akats7 Date: Fri, 19 Apr 2024 15:59:34 -0400 Subject: [PATCH 3/5] added builder config --- cmd/otelcontribcol/builder-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 5aef7abd8729..f1055b0d0473 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -212,6 +212,7 @@ connectors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.98.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.98.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.98.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.98.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.98.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.98.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.98.0 @@ -429,6 +430,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/failoverconnector => ../../connector/failoverconnector - 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 From 622159e86f07f04da6cd9257be3b8f48eaae2aba Mon Sep 17 00:00:00 2001 From: akats7 Date: Mon, 22 Apr 2024 11:26:50 -0400 Subject: [PATCH 4/5] ran genotelcontribcol --- cmd/otelcontribcol/go.sum | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index ca7d3555ffac..80eeb61b4d2b 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1233,7 +1233,6 @@ github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8P github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-telemetry/opamp-go v0.14.0 h1:KoziIK+wsFojhUXNTkCSTnCPf0eCMqFAaccOs0HrWIY= github.com/open-telemetry/opamp-go v0.14.0/go.mod h1:XOGCigljsLSTZ8FfLwvat0M1QDj3conIIgRa77BWrKs= -github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.98.0/go.mod h1:WO5aWpnNtWMv44kxyyMmnNZzC+4XIH2SFHJDM6vVFa4= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= From e756031e1a509034cb0f5b491681677565dfd532 Mon Sep 17 00:00:00 2001 From: akats7 Date: Mon, 22 Apr 2024 12:58:06 -0400 Subject: [PATCH 5/5] ran gendistributions --- reports/distributions/contrib.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/reports/distributions/contrib.yaml b/reports/distributions/contrib.yaml index f7cce5cd43bd..1a4b4b57a225 100644 --- a/reports/distributions/contrib.yaml +++ b/reports/distributions/contrib.yaml @@ -6,6 +6,7 @@ components: - count - datadog - exceptions + - failover - grafanacloud - routing - servicegraph