From 115beab631b5cf72e574510c3fb0c46c8c90b695 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:38:12 +0100 Subject: [PATCH] chore(deps): update otel-collector upstream dependencies (#109) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Juraci Paixão Kröhling --- Makefile | 24 +++++------------ distributions/otelcol-kafka/manifest.yaml | 27 +++++++++---------- .../otelcol-loadbalancer/manifest.yaml | 25 +++++++++-------- distributions/otelcol-otlp/manifest.yaml | 23 ++++++++-------- distributions/otelcol-sampling/manifest.yaml | 27 +++++++++---------- distributions/otelcol-tracing/manifest.yaml | 27 +++++++++---------- renovate.json | 3 ++- scripts/build.sh | 7 ++--- 8 files changed, 73 insertions(+), 90 deletions(-) diff --git a/Makefile b/Makefile index 051afd1..d752ad3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ -GO ?= go GORELEASER ?= goreleaser -OTELCOL_BUILDER_VERSION ?= 0.111.0 +OTELCOL_BUILDER_VERSION ?= 0.115.0 OTELCOL_BUILDER_DIR ?= ${HOME}/bin OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb @@ -10,19 +9,19 @@ DISTRIBUTIONS ?= $(shell echo $(notdir $(wildcard ./distributions/*)) | tr " " " ci: check build check: test ensure-goreleaser-up-to-date -build: go ocb - @./scripts/build.sh -d "${DISTRIBUTIONS}" -b ${OTELCOL_BUILDER} -g ${GO} +build: ocb + @./scripts/build.sh -d "${DISTRIBUTIONS}" -b ${OTELCOL_BUILDER} test: build @./test/test-all.sh -d "${DISTRIBUTIONS}" generate: generate-sources generate-goreleaser -generate-goreleaser: go - @./scripts/generate-goreleaser.sh -d "${DISTRIBUTIONS}" -g ${GO} +generate-goreleaser: + @./scripts/generate-goreleaser.sh -d "${DISTRIBUTIONS}" -generate-sources: go ocb - @./scripts/build.sh -d "${DISTRIBUTIONS}" -s true -b ${OTELCOL_BUILDER} -g ${GO} +generate-sources: ocb + @./scripts/build.sh -d "${DISTRIBUTIONS}" -s true -b ${OTELCOL_BUILDER} goreleaser-verify: goreleaser @${GORELEASER} release --snapshot --clean @@ -49,15 +48,6 @@ else OTELCOL_BUILDER=$(shell command -v ocb) endif -.PHONY: go -go: - @{ \ - if ! command -v '$(GO)' >/dev/null 2>/dev/null; then \ - echo >&2 '$(GO) command not found. Please install golang. https://go.dev/doc/install'; \ - exit 1; \ - fi \ - } - .PHONY: goreleaser goreleaser: @{ \ diff --git a/distributions/otelcol-kafka/manifest.yaml b/distributions/otelcol-kafka/manifest.yaml index 135cbe6..d772f77 100644 --- a/distributions/otelcol-kafka/manifest.yaml +++ b/distributions/otelcol-kafka/manifest.yaml @@ -2,22 +2,21 @@ dist: module: github.com/jpkrohling/otelcol-distributions/kafka name: otelcol description: A distribution of the OpenTelemetry Collector with Kafka receiver and exporter - version: 0.111.0 + version: 0.115.0 output_path: ./_build - otelcol_version: 0.108.1 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.115.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.108.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.115.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.115.0 diff --git a/distributions/otelcol-loadbalancer/manifest.yaml b/distributions/otelcol-loadbalancer/manifest.yaml index 059915b..ab1a855 100644 --- a/distributions/otelcol-loadbalancer/manifest.yaml +++ b/distributions/otelcol-loadbalancer/manifest.yaml @@ -2,21 +2,20 @@ dist: module: github.com/jpkrohling/otelcol-distributions/otelcol-loadbalancer name: otelcol description: Load-balancer distribution of the OpenTelemetry Collector - version: 0.111.0 + version: 0.115.0 output_path: ./_build - otelcol_version: 0.108.1 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.115.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.115.0 diff --git a/distributions/otelcol-otlp/manifest.yaml b/distributions/otelcol-otlp/manifest.yaml index 8e81906..c568130 100644 --- a/distributions/otelcol-otlp/manifest.yaml +++ b/distributions/otelcol-otlp/manifest.yaml @@ -2,20 +2,19 @@ dist: module: github.com/jpkrohling/otelcol-distributions/otelcol-otlp name: otelcol description: OTLP distribution of the OpenTelemetry Collector - version: 0.111.0 + version: 0.115.0 output_path: ./_build - otelcol_version: 0.108.1 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.115.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 diff --git a/distributions/otelcol-sampling/manifest.yaml b/distributions/otelcol-sampling/manifest.yaml index 17b9e23..2076b2f 100644 --- a/distributions/otelcol-sampling/manifest.yaml +++ b/distributions/otelcol-sampling/manifest.yaml @@ -2,23 +2,22 @@ dist: module: github.com/jpkrohling/otelcol-distributions/otelcol-sampling name: otelcol description: OpenTelemetry Collector distribution with sampling processors - version: 0.111.0 + version: 0.115.0 output_path: ./_build - otelcol_version: 0.108.1 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.115.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.115.0 diff --git a/distributions/otelcol-tracing/manifest.yaml b/distributions/otelcol-tracing/manifest.yaml index 87c08c0..44a847d 100644 --- a/distributions/otelcol-tracing/manifest.yaml +++ b/distributions/otelcol-tracing/manifest.yaml @@ -2,22 +2,21 @@ dist: module: github.com/jpkrohling/otelcol-distributions/tracing name: otelcol description: Distributed tracing distribution of the OpenTelemetry Collector - version: 0.111.0 + version: 0.115.0 output_path: ./_build - otelcol_version: 0.108.1 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.115.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.108.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.115.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.115.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0 diff --git a/renovate.json b/renovate.json index 87abba2..548135c 100644 --- a/renovate.json +++ b/renovate.json @@ -12,7 +12,8 @@ { "matchSourceUrls": [ "https://github.com/open-telemetry/opentelemetry-collector", - "https://github.com/open-telemetry/opentelemetry-collector-contrib" + "https://github.com/open-telemetry/opentelemetry-collector-contrib", + "https://github.com/open-telemetry/opentelemetry-collector-releases" ], "groupName": "otel-collector upstream dependencies" } diff --git a/scripts/build.sh b/scripts/build.sh index d8e2e62..b8e940c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,18 +2,16 @@ REPO_DIR="$( cd "$(dirname $( dirname "${BASH_SOURCE[0]}" ))" &> /dev/null && pwd )" BUILDER='' -GO='' # default values skipcompilation=false -while getopts d:s:b:g: flag +while getopts d:s:b: flag do case "${flag}" in d) distributions=${OPTARG};; s) skipcompilation=${OPTARG};; b) BUILDER=${OPTARG};; - g) GO=${OPTARG};; esac done @@ -39,9 +37,8 @@ do echo "Building: $distribution" echo "Using Builder: $(command -v "$BUILDER")" - echo "Using Go: $(command -v "$GO")" - if "$BUILDER" --skip-compilation=${skipcompilation} --go "$GO" --config manifest.yaml > _build/build.log 2>&1; then + if "$BUILDER" --skip-compilation=${skipcompilation} --config manifest.yaml > _build/build.log 2>&1; then echo "✅ SUCCESS: distribution '${distribution}' built." else echo "❌ ERROR: failed to build the distribution '${distribution}'."