From e61c32beb8ff0155e9633c22659a92d04fb79559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Fri, 12 Mar 2021 13:15:29 +0100 Subject: [PATCH] Update to builder/collector v0.22.0 (#28) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #26 Signed-off-by: Juraci Paixão Kröhling --- Makefile | 2 +- manifest.yaml | 14 +++++++------- test/install-tracegen.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 98b392e..139d642 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ GO=$(shell which go) -OTELCOL_BUILDER_VERSION ?= 0.7.0 +OTELCOL_BUILDER_VERSION ?= 0.22.0 OTELCOL_BUILDER_DIR ?= ~/bin OTELCOL_BUILDER ?= $(OTELCOL_BUILDER_DIR)/opentelemetry-collector-builder diff --git a/manifest.yaml b/manifest.yaml index ef43821..e21abcc 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -2,18 +2,18 @@ dist: module: github.com/observatorium/observatorium-otelcol name: observatorium-otelcol description: Observatorium OpenTelemetry Collector Distribution - version: 0.8.0 + version: 0.22.0 output_path: ./_build - otelcol_version: 0.20.0 + otelcol_version: 0.22.0 processors: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.20.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.20.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.20.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.22.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.22.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.22.0 replaces: # needed because the k8sprocessor references version v0 (local by the build) - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.20.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.22.0 # needed because the resourcedetectionprocessor references version v0 (local by the build) - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.20.0 + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.22.0 diff --git a/test/install-tracegen.sh b/test/install-tracegen.sh index 74a9bb1..00ae852 100755 --- a/test/install-tracegen.sh +++ b/test/install-tracegen.sh @@ -3,6 +3,6 @@ d=$(mktemp -d) cd "$d" go mod init temp >/dev/null 2>&1 -go get "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen@v0.20.0" +go get "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen@v0.22.0" go install "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen" rm -r "$d"