From b16bec00033d0a62ff09c2ad92e862bbeda61568 Mon Sep 17 00:00:00 2001 From: Raj Nishtala Date: Thu, 12 Dec 2024 09:55:38 -0800 Subject: [PATCH] Adding the awskinesisexporter and updating go toolchain to 1.22.8 --- .github/workflows/dev_builds.yml | 2 +- .github/workflows/pull_requests.yml | 2 +- .github/workflows/workflow-build.yml | 2 +- .github/workflows/workflow-test.yml | 2 +- Dockerfile_local | 2 +- README.md | 4 +++- ci/build-fips-action/Dockerfile | 2 +- otelcolbuilder/.otelcol-builder.yaml | 24 ++---------------------- pkg/receiver/telegrafreceiver/go.mod | 2 +- vagrant/provision.sh | 2 +- 10 files changed, 13 insertions(+), 31 deletions(-) diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml index ce34024609..5cfd326446 100644 --- a/.github/workflows/dev_builds.yml +++ b/.github/workflows/dev_builds.yml @@ -11,7 +11,7 @@ defaults: shell: bash env: - GO_VERSION: "1.22.6" + GO_VERSION: "1.22.8" jobs: # Add lint to dev builds as that's the only way for cache to be shared across branches. diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index e00ddae670..7b48bd02df 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -10,7 +10,7 @@ defaults: shell: bash env: - GO_VERSION: "1.22.6" + GO_VERSION: "1.22.8" jobs: build-changed: diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml index ac4fca2e9f..b0fc3fdf0e 100644 --- a/.github/workflows/workflow-build.yml +++ b/.github/workflows/workflow-build.yml @@ -49,7 +49,7 @@ defaults: shell: bash env: - GO_VERSION: "1.22.6" + GO_VERSION: "1.22.8" VERSION: ${{ inputs.version }} jobs: diff --git a/.github/workflows/workflow-test.yml b/.github/workflows/workflow-test.yml index 4c2bdb2339..2e9f6c5cfe 100644 --- a/.github/workflows/workflow-test.yml +++ b/.github/workflows/workflow-test.yml @@ -28,7 +28,7 @@ defaults: shell: bash env: - GO_VERSION: "1.22.6" + GO_VERSION: "1.22.8" jobs: test: diff --git a/Dockerfile_local b/Dockerfile_local index 4009f3ba54..abb8024d01 100644 --- a/Dockerfile_local +++ b/Dockerfile_local @@ -1,4 +1,4 @@ -FROM golang:1.22.6-alpine AS builder +FROM golang:1.22.8-alpine AS builder ADD . /src WORKDIR /src/otelcolbuilder/ ENV CGO_ENABLED=0 diff --git a/README.md b/README.md index 4af78efcdd..15c811fb44 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,8 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated. | Receivers | Processors | Exporters | Extensions | Connectors | | :------------------------------------------------------: | :----------------------------------------------------------: | :------------------------------------: | :------------------------------------------: | :---------------------------------: | | [active_directory_ds][activedirectorydsreceiver] | [attributes][attributesprocessor] | [awss3][awss3exporter] | [asapclient][asapauthextension] | [forward][forwardconnector] | -| [`active_directory_inv`][activedirectoryinvreceiver] | [batch][batchprocessor] | [carbon][carbonexporter] | [awsproxy][awsproxy] | [count][countconnector] | +| | [batch][batchprocessor] | [awskinesisexporter][awskinesisexporter] | | | +| [`active_directory_inv`][activedirectoryinvreceiver] | | [carbon][carbonexporter] | [awsproxy][awsproxy] | [count][countconnector] | | [aerospike][aerospikereceiver] | [`cascading_filter`][cascadingfilterprocessor] | [debug][debugexporter] | [basicauth][basicauthextension] | [exceptions][exceptionsconnector] | | [apache][apachereceiver] | [cumulativetodelta][cumulativetodeltaprocessor] | [file][fileexporter] | [bearertokenauth][bearertokenauthextension] | [failover][failoverconnector] | | [awscloudwatch][awscloudwatchreceiver] | [deltatorate][deltatorateprocessor] | [kafka][kafkaexporter] | [db_storage][dbstorage] | [roundrobin][roundrobinconnector] | @@ -272,6 +273,7 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated. [tailsamplingprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/tailsamplingprocessor [transformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/transformprocessor [awss3exporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/awss3exporter +[awskinesisexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/awskinesisexporter [carbonexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/carbonexporter [debugexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.114.0/exporter/debugexporter [fileexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/fileexporter diff --git a/ci/build-fips-action/Dockerfile b/ci/build-fips-action/Dockerfile index 2d123fa53e..ea390503db 100644 --- a/ci/build-fips-action/Dockerfile +++ b/ci/build-fips-action/Dockerfile @@ -6,7 +6,7 @@ ENV TARGETARCH=$TARGETARCH RUN yum groupinstall -y "Development Tools" && yum install -y curl git -RUN curl -Lo go.tar.gz https://go.dev/dl/go1.22.6.linux-$TARGETARCH.tar.gz +RUN curl -Lo go.tar.gz https://go.dev/dl/go1.22.8.linux-$TARGETARCH.tar.gz RUN tar -zxvf go.tar.gz -C /usr/local ENV PATH="/usr/local/go/bin:${PATH}" diff --git a/otelcolbuilder/.otelcol-builder.yaml b/otelcolbuilder/.otelcol-builder.yaml index 33d7c60849..a209b579bf 100644 --- a/otelcolbuilder/.otelcol-builder.yaml +++ b/otelcolbuilder/.otelcol-builder.yaml @@ -1,15 +1,12 @@ dist: name: otelcol-sumo description: Sumo Logic OpenTelemetry Collector distribution - # the module name for the new distribution, following Go mod conventions. Optional, but recommended. module: github.com/SumoLogic/sumologic-otel-collector - # the OpenTelemetry Collector version to use as base for the distribution. version: 0.114.0 # the path to write the output (sources and binary). output_path: ./cmd - exporters: # Since include-code was removed we need to manually add all core components that we want to include: # https://github.com/open-telemetry/opentelemetry-collector/pull/4616 @@ -17,7 +14,7 @@ exporters: - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.114.0 - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.114.0 - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.114.0 - + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.114.0 @@ -26,7 +23,6 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter v0.114.0 - processors: # Processors with non-upstreamed changes: - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/processor/cascadingfilterprocessor v0.0.0-00010101000000-000000000000 @@ -41,14 +37,12 @@ processors: path: ./../pkg/processor/sumologicsyslogprocessor - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/processor/metricfrequencyprocessor v0.0.0-00010101000000-000000000000 path: ./../pkg/processor/metricfrequencyprocessor - # Upstream processors: # Since include-code was removed we need to manually add all core components that we want to include: # https://github.com/open-telemetry/opentelemetry-collector/pull/4616 - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.114.0 - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.114.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.114.0 @@ -70,27 +64,21 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.114.0 - receivers: # Receivers with non-upstreamed changes: - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/telegrafreceiver v0.0.0-00010101000000-000000000000 path: ./../pkg/receiver/telegrafreceiver - - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/rawk8seventsreceiver v0.0.0-00010101000000-000000000000 path: ./../pkg/receiver/rawk8seventsreceiver - - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/jobreceiver v0.0.0-00010101000000-000000000000 path: ./../pkg/receiver/jobreceiver - - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/activedirectoryinvreceiver v0.0.0-00010101000000-000000000000 path: ./../pkg/receiver/activedirectoryinvreceiver - # Upstream receivers: - # Since include-code was removed we need to manually add all core components that we want to include: # https://github.com/open-telemetry/opentelemetry-collector/pull/4616 - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.114.0 + # Upstream receivers: - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.114.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.114.0 @@ -173,16 +161,13 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.114.0 - extensions: # Processors with non-upstreamed changes: - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/extension/opampextension v0.0.0-00010101000000-000000000000 path: ./../pkg/extension/opampextension - # Since include-code was removed we need to manually add all core components that we want to include: # https://github.com/open-telemetry/opentelemetry-collector/pull/4616 - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.114.0 - # Upstream extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.114.0 @@ -204,7 +189,6 @@ extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.114.0 - connectors: - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.114.0 @@ -214,7 +198,6 @@ connectors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.114.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.114.0 - providers: - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/globprovider v0.0.0-00010101000000-000000000000 - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/configprovider/opampprovider v0.0.0-00010101000000-000000000000 @@ -224,16 +207,13 @@ providers: - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.114.0 - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.0 - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.114.0 - excludes: - github.com/knadh/koanf v1.5.0 - # Replacement paths are relative to the output_path (location of source files) replaces: # ---------------------------------------------------------------------------- # Needed for telegrafreceiver - github.com/influxdata/telegraf => github.com/SumoLogic/telegraf v1.32.0-sumo-0 - # This is to make sure we build the with the sumologicextension from the tree. # The reason this is needed is that sumologicexporter depends on sumologicextension in its go.mod. # We add a dependency in the builder config in this file but only for a particular (placeholder) diff --git a/pkg/receiver/telegrafreceiver/go.mod b/pkg/receiver/telegrafreceiver/go.mod index 004928288f..3ff197b0bc 100644 --- a/pkg/receiver/telegrafreceiver/go.mod +++ b/pkg/receiver/telegrafreceiver/go.mod @@ -2,7 +2,7 @@ module github.com/SumoLogic/sumologic-otel-collector/pkg/receiver/telegrafreceiv go 1.22.0 -toolchain go1.22.6 +toolchain go1.22.8 require ( github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/vagrant/provision.sh b/vagrant/provision.sh index 8231a8bdf8..4c29fb834d 100644 --- a/vagrant/provision.sh +++ b/vagrant/provision.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export GO_VERSION="1.22.6" +export GO_VERSION="1.22.8" ARCH="$(dpkg --print-architecture)"