Skip to content

Commit

Permalink
Bump otel collector and builder to 0.99 (#65)
Browse files Browse the repository at this point in the history
* Bump otel collector and builder to 0.99

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>

* Bump to ubi9

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>

---------

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
  • Loading branch information
rubenvp8510 authored May 9, 2024
1 parent 2880d27 commit 938de99
Show file tree
Hide file tree
Showing 7 changed files with 753 additions and 687 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal as builder
FROM registry.access.redhat.com/ubi9/ubi-minimal as builder

RUN microdnf -y install which go-toolset make
WORKDIR /opt/app-root/src
Expand All @@ -10,7 +10,7 @@ RUN make build
## copied with the execute bit lost (see #1317)
RUN chmod 755 /opt/app-root/src/_build/otelcol

FROM registry.access.redhat.com/ubi8/ubi-minimal
FROM registry.access.redhat.com/ubi9/ubi-minimal

# Install the systemd package which provides journalctl required by journald receiver and add user to systemd-journal group.
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/journaldreceiver
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GO ?= $(shell which go)
OTELCOL_VERSION ?= 0.95.0
OTELCOL_VERSION ?= 0.99.0
# TODO: Align the ocb version with the collector version as soon as the ubi go 1.21 is supported.
OCB_VERSION ?= 0.93.0
OCB_VERSION ?= 0.99.0
OTELCOL_BUILDER_DIR ?= ${PWD}/bin
OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
PROJECT ?= opentelemetry-collector
Expand Down
19 changes: 7 additions & 12 deletions _build/build.log
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
Flag --go has been deprecated, use config distribution::go
2024-05-07T15:51:33.472+0200 INFO internal/command.go:123 OpenTelemetry Collector Builder {"version": "0.93.0", "date": "2024-01-24T11:10:24Z"}
2024-05-07T15:51:33.478+0200 INFO internal/command.go:159 Using config file {"path": "manifest.yaml"}
2024-05-07T15:51:33.496+0200 INFO builder/config.go:109 Using go {"go-executable": "/var/home/frzifus/.go/bin/go"}
2024-05-07T15:51:33.496+0200 INFO builder/main.go:67 You're building a distribution with non-aligned version of the builder. Compilation may fail due to API changes. Please upgrade your builder or API {"builder-version": "0.93.0"}
2024-05-07T15:51:33.505+0200 INFO builder/main.go:91 Sources created {"path": "./_build"}
2024-05-07T15:51:33.505+0200 INFO builder/main.go:25 Running go subcommand. {"arguments": ["get", "cloud.google.com/go"]}
2024-05-07T15:51:33.947+0200 INFO builder/main.go:25 Running go subcommand. {"arguments": ["mod", "tidy", "-compat=1.20"]}
2024-05-07T15:51:34.411+0200 INFO builder/main.go:142 Getting go modules
2024-05-07T15:51:34.411+0200 INFO builder/main.go:25 Running go subcommand. {"arguments": ["mod", "download"]}
2024-05-07T15:51:34.640+0200 INFO builder/main.go:102 Compiling
2024-05-07T15:51:34.640+0200 INFO builder/main.go:25 Running go subcommand. {"arguments": ["build", "-trimpath", "-o", "otelcol", "-ldflags=-s -w"]}
2024-05-07T15:53:47.491+0200 INFO builder/main.go:121 Compiled {"binary": "./_build/otelcol"}
2024-05-08T11:39:37.866-0600 INFO internal/command.go:125 OpenTelemetry Collector Builder {"version": "0.99.0", "date": "2024-04-22T20:31:41Z"}
2024-05-08T11:39:37.867-0600 INFO internal/command.go:161 Using config file {"path": "manifest.yaml"}
2024-05-08T11:39:37.872-0600 INFO builder/config.go:118 Using go {"go-executable": "/usr/local/go/bin/go"}
2024-05-08T11:39:37.875-0600 INFO builder/main.go:101 Sources created {"path": "./_build"}
2024-05-08T11:39:38.769-0600 INFO builder/main.go:197 Getting go modules
2024-05-08T11:39:38.825-0600 INFO builder/main.go:112 Compiling
2024-05-08T11:39:41.641-0600 INFO builder/main.go:131 Compiled {"binary": "./_build/otelcol"}
401 changes: 208 additions & 193 deletions _build/go.mod

Large diffs are not rendered by default.

892 changes: 461 additions & 431 deletions _build/go.sum

Large diffs are not rendered by default.

30 changes: 28 additions & 2 deletions _build/main.go

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

90 changes: 45 additions & 45 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,56 @@ dist:
module: github.com/os-observability/redhat-opentelemetry-collector
name: otelcol
description: OpenTelemetry Collector
version: 0.95.0
version: 0.99.0
output_path: ./_build
otelcol_version: 0.95.0
otelcol_version: 0.99.0

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

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.95.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.95.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.95.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.95.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.99.0
extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.95.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.95.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.95.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.99.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.99.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.99.0
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.95.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.95.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.99.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.99.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.99.0
connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.95.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.95.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.99.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.99.0

0 comments on commit 938de99

Please # to comment.