Skip to content

Commit

Permalink
Update to builder 0.6.0, otelcol to 0.19.0 (#23)
Browse files Browse the repository at this point in the history
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
  • Loading branch information
jpkrohling committed Feb 2, 2021
1 parent ba0e7b7 commit 4a99e6c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OTELCOL_BUILDER_VERSION ?= 0.4.0
OTELCOL_BUILDER_VERSION ?= 0.6.0
OTELCOL_BUILDER_DIR ?= ~/bin
OTELCOL_BUILDER ?= $(OTELCOL_BUILDER_DIR)/opentelemetry-collector-builder

Expand All @@ -10,7 +10,7 @@ ifeq (, $(shell which opentelemetry-collector-builder))
@{ \
set -e ;\
mkdir -p $(OTELCOL_BUILDER_DIR) ;\
curl -sLo $(OTELCOL_BUILDER) https://github.com/observatorium/opentelemetry-collector-builder/releases/download/v$(OTELCOL_BUILDER_VERSION)/opentelemetry-collector-builder_$(OTELCOL_BUILDER_VERSION)_linux_amd64 ;\
curl -sLo $(OTELCOL_BUILDER) https://github.com/open-telemetry/opentelemetry-collector-builder/releases/download/v$(OTELCOL_BUILDER_VERSION)/opentelemetry-collector-builder_$(OTELCOL_BUILDER_VERSION)_linux_amd64 ;\
chmod +x $(OTELCOL_BUILDER) ;\
}
else
Expand Down
14 changes: 7 additions & 7 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ dist:
module: github.com/observatorium/observatorium-otelcol
name: observatorium-otelcol
description: Observatorium OpenTelemetry Collector Distribution
version: 0.6.0
version: 0.7.0
output_path: ./_build
otelcol_version: 0.18.0
otelcol_version: 0.19.0

processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.18.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.18.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.18.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.19.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.19.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.19.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.18.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.19.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.18.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.19.0
2 changes: 1 addition & 1 deletion test/install-tracegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1"
go get "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen@v0.19.0"
go install "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen"
rm -r "$d"

0 comments on commit 4a99e6c

Please sign in to comment.