Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version to v0.113.0 #109

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GO ?= $(shell which go)
OTELCOL_VERSION ?= 0.112.0
OCB_VERSION ?= $(OTELCOL_VERSION)
OCB_VERSION ?= 0.113.0
OTELCOL_VERSION = $(OCB_VERSION)
OTELCOL_BUILDER_DIR ?= ${PWD}/bin
OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
PROJECT ?= opentelemetry-collector
Expand All @@ -10,15 +10,15 @@ MAKEFLAGS += --silent

build: ocb
mkdir -p _build
${OTELCOL_BUILDER} --skip-compilation=false --go ${GO} --config manifest.yaml 2>&1 | tee _build/build.log
DIST_GO=${GO} ${OTELCOL_BUILDER} --skip-compilation=false --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"
/bin/sh -c "microdnf -y install make which golang && make build"

generate-sources: ocb
@mkdir -p _build
${OTELCOL_BUILDER} --skip-compilation=true --go ${GO} --config manifest.yaml 2>&1 | tee _build/build.log
DIST_GO=${GO} ${OTELCOL_BUILDER} --skip-compilation=true --config manifest.yaml 2>&1 | tee _build/build.log

ocb:
ifeq (, $(shell which ocb >/dev/null 2>/dev/null))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This repository configures a build of the OpenTelemetry Collector with the suppo
## Update collector version

1. Update Makefile and manifest.yaml to select the desired upstream version and component selection for the product release.
1. Run `make build`
1. Run `make build` or `make build-in-podman`
1. Create a pull request with the changes, including changes in the `_build` directory.
1. Update changelog in [RPM spec](./opentelemetry-collector.spec.in)

Expand Down
15 changes: 7 additions & 8 deletions _build/build.log
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Flag --go has been deprecated, use config distribution::go
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"}
2024-11-14T14:29:34.133Z INFO internal/command.go:97 OpenTelemetry Collector Builder {"version": "0.113.0"}
2024-11-14T14:29:34.133Z INFO internal/command.go:102 Using config file {"path": "manifest.yaml"}
2024-11-14T14:29:34.207Z INFO builder/config.go:159 Using go {"go-executable": "/usr/bin/go"}
2024-11-14T14:29:34.209Z INFO builder/main.go:100 Sources created {"path": "./_build"}
2024-11-14T14:29:51.292Z INFO builder/main.go:191 Getting go modules
2024-11-14T14:30:08.203Z INFO builder/main.go:111 Compiling
2024-11-14T14:31:10.493Z INFO builder/main.go:130 Compiled {"binary": "./_build/otelcol"}
102 changes: 51 additions & 51 deletions _build/components.go

Large diffs are not rendered by default.

316 changes: 160 additions & 156 deletions _build/go.mod

Large diffs are not rendered by default.

680 changes: 342 additions & 338 deletions _build/go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _build/main.go

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

113 changes: 53 additions & 60 deletions manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,71 +1,64 @@
dist:
module: github.com/os-observability/redhat-opentelemetry-collector
name: otelcol
description: OpenTelemetry Collector
version: 0.112.0
description: Red Hat build of OpenTelemetry
version: 0.113.0
output_path: ./_build
otelcol_version: 0.112.0

receivers:
- 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
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.113.0

exporters:
- 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
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.113.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.113.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.113.0
extensions:
- 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
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.113.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.113.0
processors:
- 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
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.113.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.113.0
connectors:
- 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
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.113.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.113.0
2 changes: 2 additions & 0 deletions opentelemetry-collector.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ fi
%{_bindir}/*

%changelog
* Thu Nov 14 2024 Andreas Gerstmayr <agerstmayr@redhat.com> - 0.113.0-1
- bump collector version to 0.113.0
* Wed Nov 13 2024 Andreas Gerstmayr <agerstmayr@redhat.com> - 0.112.0-1
- bump collector version to 0.112.0
* Thu Sep 12 2024 Felix Kolwa <fkolwa@redhat.com> - 0.107.0-2
Expand Down
Loading