From 4234c676718f6a8abc824da5a7049d45f2683e42 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Wed, 28 Feb 2024 11:23:20 +0100 Subject: [PATCH 1/8] feat(sumologicextension): add to distribution Signed-off-by: Dominik Rosiek --- cmd/otelcontribcol/builder-config.yaml | 2 ++ cmd/otelcontribcol/components.go | 2 ++ cmd/otelcontribcol/go.mod | 4 ++++ cmd/otelcontribcol/go.sum | 2 ++ 4 files changed, 10 insertions(+) diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index fb5fa75c890d..c972881d5151 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -30,6 +30,7 @@ extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.95.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.96.0 import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension v0.96.0 @@ -442,6 +443,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/extension/remotetapextension => ../../extension/remotetapextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension => ../../extension/opampextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension + - 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 7c91bf81f859..b4825c85adde 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -96,6 +96,7 @@ import ( solarwindsapmsettingsextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension" dbstorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage" filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage" + sumologicextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension" attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" cumulativetodeltaprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" deltatorateprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor" @@ -233,6 +234,7 @@ func components() (otelcol.Factories, error) { solarwindsapmsettingsextension.NewFactory(), dbstorage.NewFactory(), filestorage.NewFactory(), + sumologicextension.NewFactory(), otlpencodingextension.NewFactory(), jaegerencodingextension.NewFactory(), jsonlogencodingextension.NewFactory(), diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index e3152f6ae2d2..226e88e7830c 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -82,6 +82,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.95.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 @@ -508,6 +509,7 @@ require ( github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-ps v1.0.0 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect @@ -1187,6 +1189,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/opam replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension => ../../extension/sumologicextension + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery => ../../internal/sqlquery diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 414b1dd6c074..f4b4dab2c997 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1186,6 +1186,8 @@ github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HK github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= From 0b8045db9c2fd58dbd3964b68ab66742d19a86d6 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Wed, 28 Feb 2024 11:25:33 +0100 Subject: [PATCH 2/8] chore: changelog Signed-off-by: Dominik Rosiek --- .chloggen/drosiek-add-sumologicextension.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 .chloggen/drosiek-add-sumologicextension.yaml diff --git a/.chloggen/drosiek-add-sumologicextension.yaml b/.chloggen/drosiek-add-sumologicextension.yaml new file mode 100755 index 000000000000..e7fd6c143b5d --- /dev/null +++ b/.chloggen/drosiek-add-sumologicextension.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: new_component + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: sumologicextension + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add Sumo Logic Extension to Contrib Distrubution + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29601] + +# (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] From 97c08a6aba038bf702b7fddedd20aa3de5b3db00 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Wed, 28 Feb 2024 11:33:06 +0100 Subject: [PATCH 3/8] chore: make generate Signed-off-by: Dominik Rosiek --- extension/sumologicextension/README.md | 4 ++-- .../sumologicextension/internal/metadata/generated_status.go | 2 +- extension/sumologicextension/metadata.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extension/sumologicextension/README.md b/extension/sumologicextension/README.md index 225437747609..ef837a1c17a9 100644 --- a/extension/sumologicextension/README.md +++ b/extension/sumologicextension/README.md @@ -2,12 +2,12 @@ | Status | | | ------------- |-----------| -| Stability | [development] | +| Stability | [beta] | | Distributions | [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fsumologic%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fsumologic) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fsumologic%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fsumologic) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@astencel-sumo](https://www.github.com/astencel-sumo), [@sumo-drosiek](https://www.github.com/sumo-drosiek), [@swiatekm-sumo](https://www.github.com/swiatekm-sumo) | -[development]: https://github.com/open-telemetry/opentelemetry-collector#development +[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [sumo]: https://github.com/SumoLogic/sumologic-otel-collector diff --git a/extension/sumologicextension/internal/metadata/generated_status.go b/extension/sumologicextension/internal/metadata/generated_status.go index 6a5f54d7cff1..c1ff84b7c10b 100644 --- a/extension/sumologicextension/internal/metadata/generated_status.go +++ b/extension/sumologicextension/internal/metadata/generated_status.go @@ -13,7 +13,7 @@ var ( ) const ( - ExtensionStability = component.StabilityLevelDevelopment + ExtensionStability = component.StabilityLevelBeta ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/extension/sumologicextension/metadata.yaml b/extension/sumologicextension/metadata.yaml index b538baea69af..69c6dafa2a40 100644 --- a/extension/sumologicextension/metadata.yaml +++ b/extension/sumologicextension/metadata.yaml @@ -4,7 +4,7 @@ scope_name: otelcol/sumologic status: class: extension stability: - development: [extension] + beta: [extension] distributions: [sumo] codeowners: active: [astencel-sumo, sumo-drosiek, swiatekm-sumo] From 3cb33b64ca718c51fb8c758be560251476878a03 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Thu, 29 Feb 2024 07:54:47 +0100 Subject: [PATCH 4/8] feat(sumligicextension): use aplha stability level Signed-off-by: Dominik Rosiek --- .chloggen/drosiek-add-sumologicextension.yaml | 2 +- extension/sumologicextension/README.md | 4 ++-- .../sumologicextension/internal/metadata/generated_status.go | 2 +- extension/sumologicextension/metadata.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.chloggen/drosiek-add-sumologicextension.yaml b/.chloggen/drosiek-add-sumologicextension.yaml index e7fd6c143b5d..b2fa34f0c7b0 100755 --- a/.chloggen/drosiek-add-sumologicextension.yaml +++ b/.chloggen/drosiek-add-sumologicextension.yaml @@ -7,7 +7,7 @@ change_type: new_component component: sumologicextension # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: add Sumo Logic Extension to Contrib Distrubution +note: enable Sumo Logic Extension # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. issues: [29601] diff --git a/extension/sumologicextension/README.md b/extension/sumologicextension/README.md index ef837a1c17a9..3d4b169541e0 100644 --- a/extension/sumologicextension/README.md +++ b/extension/sumologicextension/README.md @@ -2,12 +2,12 @@ | Status | | | ------------- |-----------| -| Stability | [beta] | +| Stability | [alpha] | | Distributions | [sumo] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fsumologic%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fsumologic) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fsumologic%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fsumologic) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@astencel-sumo](https://www.github.com/astencel-sumo), [@sumo-drosiek](https://www.github.com/sumo-drosiek), [@swiatekm-sumo](https://www.github.com/swiatekm-sumo) | -[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta +[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [sumo]: https://github.com/SumoLogic/sumologic-otel-collector diff --git a/extension/sumologicextension/internal/metadata/generated_status.go b/extension/sumologicextension/internal/metadata/generated_status.go index c1ff84b7c10b..d74258369567 100644 --- a/extension/sumologicextension/internal/metadata/generated_status.go +++ b/extension/sumologicextension/internal/metadata/generated_status.go @@ -13,7 +13,7 @@ var ( ) const ( - ExtensionStability = component.StabilityLevelBeta + ExtensionStability = component.StabilityLevelAlpha ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/extension/sumologicextension/metadata.yaml b/extension/sumologicextension/metadata.yaml index 69c6dafa2a40..0954bdbf67d4 100644 --- a/extension/sumologicextension/metadata.yaml +++ b/extension/sumologicextension/metadata.yaml @@ -4,7 +4,7 @@ scope_name: otelcol/sumologic status: class: extension stability: - beta: [extension] + alpha: [extension] distributions: [sumo] codeowners: active: [astencel-sumo, sumo-drosiek, swiatekm-sumo] From 9a216232ecea913d17436e1ece7c67bc0ec01ae0 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Mon, 11 Mar 2024 07:53:43 +0100 Subject: [PATCH 5/8] Update cmd/otelcontribcol/go.mod Co-authored-by: Andrzej Stencel --- cmd/otelcontribcol/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 226e88e7830c..4e5570721416 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -82,7 +82,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.95.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.96.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.96.0 From 0c6c0874ebd70fac815c03f304242b6a709e2cda Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Mon, 11 Mar 2024 07:53:51 +0100 Subject: [PATCH 6/8] Update cmd/otelcontribcol/builder-config.yaml Co-authored-by: Andrzej Stencel --- cmd/otelcontribcol/builder-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index c972881d5151..f898aaac1cd9 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -30,7 +30,7 @@ extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.96.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.95.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.96.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.96.0 import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/jaegerencodingextension v0.96.0 From e326ed12aa6e27c96521a117e9c6be31e2a36bc1 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Mon, 11 Mar 2024 07:54:01 +0100 Subject: [PATCH 7/8] Update .chloggen/drosiek-add-sumologicextension.yaml Co-authored-by: Andrzej Stencel --- .chloggen/drosiek-add-sumologicextension.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/drosiek-add-sumologicextension.yaml b/.chloggen/drosiek-add-sumologicextension.yaml index b2fa34f0c7b0..0457e98e7234 100755 --- a/.chloggen/drosiek-add-sumologicextension.yaml +++ b/.chloggen/drosiek-add-sumologicextension.yaml @@ -7,7 +7,7 @@ change_type: new_component component: sumologicextension # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: enable Sumo Logic Extension +note: promote to `alpha` stability # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. issues: [29601] From 2f898337653a4b34a2b985142eec5b247dee93a5 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 11 Mar 2024 08:04:24 +0100 Subject: [PATCH 8/8] chore: fix changelog Signed-off-by: Dominik Rosiek --- .chloggen/drosiek-add-sumologicextension.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/drosiek-add-sumologicextension.yaml b/.chloggen/drosiek-add-sumologicextension.yaml index 0457e98e7234..e10597eb4c82 100755 --- a/.chloggen/drosiek-add-sumologicextension.yaml +++ b/.chloggen/drosiek-add-sumologicextension.yaml @@ -7,7 +7,7 @@ change_type: new_component component: sumologicextension # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: promote to `alpha` stability +note: "promote to `alpha` stability" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. issues: [29601]