Skip to content

Commit

Permalink
[BREAKING CHANGE] Update version to v0.112.0 (#106)
Browse files Browse the repository at this point in the history
* remove deprecated loggingexporter and ballastextension
* add build-in-podman for reproducible builds

Added the list of providers due to open-telemetry/opentelemetry-collector#11547

Signed-off-by: Andreas Gerstmayr <[email protected]>
  • Loading branch information
andreasgerstmayr authored Nov 13, 2024
1 parent 6a8bfab commit 38c2a30
Show file tree
Hide file tree
Showing 8 changed files with 869 additions and 797 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal as builder

RUN microdnf -y install which go-toolset make
RUN microdnf -y install which golang make
WORKDIR /opt/app-root/src
COPY . .
USER root
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
GO ?= $(shell which go)
OTELCOL_VERSION ?= 0.107.0
# TODO: Align the ocb version with the collector version as soon as the ubi go 1.21 is supported.
OCB_VERSION ?= 0.107.0
OTELCOL_VERSION ?= 0.112.0
OCB_VERSION ?= $(OTELCOL_VERSION)
OTELCOL_BUILDER_DIR ?= ${PWD}/bin
OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
PROJECT ?= opentelemetry-collector
Expand All @@ -13,6 +12,10 @@ build: ocb
mkdir -p _build
${OTELCOL_BUILDER} --skip-compilation=false --go ${GO} --config manifest.yaml 2>&1 | tee _build/build.log

build-in-podman:
podman run -v $$PWD:/app -w /app --security-opt label=disable registry.access.redhat.com/ubi9/ubi-minimal \
/bin/sh -c "microdnf -y install make which golang git && make build"

generate-sources: ocb
@mkdir -p _build
${OTELCOL_BUILDER} --skip-compilation=true --go ${GO} --config manifest.yaml 2>&1 | tee _build/build.log
Expand Down
14 changes: 7 additions & 7 deletions _build/build.log
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Flag --go has been deprecated, use config distribution::go
2024-11-01T01:21:55.019-0600 INFO internal/command.go:125 OpenTelemetry Collector Builder {"version": "(devel)"}
2024-11-01T01:21:55.020-0600 INFO internal/command.go:161 Using config file {"path": "manifest.yaml"}
2024-11-01T01:21:55.106-0600 INFO builder/config.go:142 Using go {"go-executable": "/usr/local/go/bin/go"}
2024-11-01T01:21:55.110-0600 INFO builder/main.go:100 Sources created {"path": "./_build"}
2024-11-01T01:22:08.587-0600 INFO builder/main.go:191 Getting go modules
2024-11-01T01:22:23.243-0600 INFO builder/main.go:111 Compiling
2024-11-01T01:22:52.161-0600 INFO builder/main.go:130 Compiled {"binary": "./_build/otelcol"}
2024-11-12T16:52:14.811Z INFO internal/command.go:125 OpenTelemetry Collector Builder {"version": "0.112.0"}
2024-11-12T16:52:14.812Z INFO internal/command.go:161 Using config file {"path": "manifest.yaml"}
2024-11-12T16:52:14.880Z INFO builder/config.go:142 Using go {"go-executable": "/usr/bin/go"}
2024-11-12T16:52:14.882Z INFO builder/main.go:101 Sources created {"path": "./_build"}
2024-11-12T16:52:36.302Z INFO builder/main.go:192 Getting go modules
2024-11-12T16:52:56.469Z INFO builder/main.go:112 Compiling
2024-11-12T16:54:01.093Z INFO builder/main.go:131 Compiled {"binary": "./_build/otelcol"}
108 changes: 51 additions & 57 deletions _build/components.go

Large diffs are not rendered by default.

452 changes: 237 additions & 215 deletions _build/go.mod

Large diffs are not rendered by default.

965 changes: 507 additions & 458 deletions _build/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _build/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

114 changes: 59 additions & 55 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,70 @@ dist:
module: github.com/os-observability/redhat-opentelemetry-collector
name: otelcol
description: OpenTelemetry Collector
version: 0.107.0
version: 0.112.0
output_path: ./_build
otelcol_version: 0.107.0
otelcol_version: 0.112.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.107.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.112.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.107.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.107.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.112.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.112.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.112.0
extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.107.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.107.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.107.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.112.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.112.0
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.107.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.107.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.112.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.112.0
connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.107.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.112.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.112.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.112.0
providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.18.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.18.0

0 comments on commit 38c2a30

Please sign in to comment.