From b366bdd10bfcba98b41cd328d3dec8299d504282 Mon Sep 17 00:00:00 2001 From: Mailo Arsac Date: Thu, 17 Oct 2024 10:20:31 -0700 Subject: [PATCH] chore: Update to collector version 0.111.0 --- build.mk | 2 +- configs/nr-otel-collector-agent-linux.yaml | 12 ++-- configs/nr-otel-collector-gateway.yaml | 6 +- .../nr-otel-collector/THIRD_PARTY_NOTICES.md | 10 +--- distributions/nr-otel-collector/manifest.yaml | 57 +++++++++---------- .../templates/nr-otel-collector-agent.yml.j2 | 8 +-- 6 files changed, 43 insertions(+), 52 deletions(-) diff --git a/build.mk b/build.mk index b89db15..2f14b8a 100644 --- a/build.mk +++ b/build.mk @@ -1,7 +1,7 @@ GO ?= go GORELEASER ?= goreleaser -OTELCOL_BUILDER_VERSION ?= 0.108.0 +OTELCOL_BUILDER_VERSION ?= 0.111.0 OTELCOL_BUILDER_DIR ?= ${HOME}/bin OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb diff --git a/configs/nr-otel-collector-agent-linux.yaml b/configs/nr-otel-collector-agent-linux.yaml index 0892e29..3d5ab7d 100644 --- a/configs/nr-otel-collector-agent-linux.yaml +++ b/configs/nr-otel-collector-agent-linux.yaml @@ -202,7 +202,7 @@ processors: override: true exporters: - logging: + debug: otlphttp: endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT} headers: @@ -230,22 +230,22 @@ service: - resourcedetection/env - cumulativetodelta - batch - exporters: [logging, otlphttp] + exporters: [debug, otlphttp] logs/host: receivers: [filelog] processors: [transform, resourcedetection, resourcedetection/cloud, resourcedetection/env, batch] - exporters: [logging, otlphttp] + exporters: [debug, otlphttp] traces: receivers: [otlp] processors: [transform, resourcedetection, resourcedetection/cloud, resourcedetection/env, batch] - exporters: [logging, otlphttp] + exporters: [debug, otlphttp] metrics: receivers: [otlp] processors: [transform, resourcedetection, resourcedetection/cloud, resourcedetection/env, batch] - exporters: [logging, otlphttp] + exporters: [debug, otlphttp] logs: receivers: [otlp] processors: [transform, resourcedetection, resourcedetection/cloud, resourcedetection/env, batch] - exporters: [logging, otlphttp] + exporters: [debug, otlphttp] extensions: [health_check] diff --git a/configs/nr-otel-collector-gateway.yaml b/configs/nr-otel-collector-gateway.yaml index 873a9f6..17e55b8 100644 --- a/configs/nr-otel-collector-gateway.yaml +++ b/configs/nr-otel-collector-gateway.yaml @@ -22,7 +22,7 @@ processors: limit_mib: ${NEW_RELIC_MEMORY_LIMIT_MIB} exporters: - logging: + debug: verbosity: detailed otlp: endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT} @@ -36,11 +36,11 @@ service: traces: receivers: [otlp] processors: [memory_limiter, batch] - exporters: [logging, otlp] + exporters: [debug, otlp] metrics: receivers: [otlp] processors: [memory_limiter, batch] - exporters: [logging, otlp] + exporters: [debug, otlp] extensions: [health_check] diff --git a/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md b/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md index abbe751..16eeac5 100644 --- a/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md +++ b/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md @@ -253,7 +253,7 @@ Distributed under the following license(s): -## [go.opentelemetry.io/collector/exporter/loggingexporter](https://go.opentelemetry.io/collector/exporter/loggingexporter) +## [go.opentelemetry.io/collector/exporter/debugexporter](https://go.opentelemetry.io/collector/exporter/debugexporter) Distributed under the following license(s): @@ -285,14 +285,6 @@ Distributed under the following license(s): -## [go.opentelemetry.io/collector/extension/ballastextension](https://go.opentelemetry.io/collector/extension/ballastextension) - -Distributed under the following license(s): - -* Apache-2.0 - - - ## [go.opentelemetry.io/collector/extension/zpagesextension](https://go.opentelemetry.io/collector/extension/zpagesextension) Distributed under the following license(s): diff --git a/distributions/nr-otel-collector/manifest.yaml b/distributions/nr-otel-collector/manifest.yaml index 0b3948a..c752307 100644 --- a/distributions/nr-otel-collector/manifest.yaml +++ b/distributions/nr-otel-collector/manifest.yaml @@ -4,43 +4,42 @@ dist: description: New Relic OpenTelemetry Collector version: 0.8.3 output_path: ./_build - otelcol_version: 0.108.0 + otelcol_version: 0.111.0 extensions: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.108.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.0 - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.108.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.111.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.111.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.108.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.111.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.108.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.111.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.111.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.108.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.108.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.111.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.111.0 # When adding a replace, add a comment before it to document why it's needed and when it can be removed replaces: diff --git a/test/canaries/templates/nr-otel-collector-agent.yml.j2 b/test/canaries/templates/nr-otel-collector-agent.yml.j2 index 072db01..14ff425 100644 --- a/test/canaries/templates/nr-otel-collector-agent.yml.j2 +++ b/test/canaries/templates/nr-otel-collector-agent.yml.j2 @@ -189,7 +189,7 @@ processors: enabled: false exporters: - logging: + debug: otlp: endpoint: https://staging-otlp.nr-data.net:4317 headers: @@ -215,14 +215,14 @@ service: - resourcedetection - resourcedetection/cloud - resource - exporters: [logging,otlp] + exporters: [debug,otlp] traces: receivers: [otlp] processors: [transform, resourcedetection, resourcedetection/cloud, resource, batch] - exporters: [logging, otlp] + exporters: [debug, otlp] logs: receivers: [otlp, filelog] processors: [transform, resourcedetection, resourcedetection/cloud, resource, batch] - exporters: [logging, otlp] + exporters: [debug, otlp] extensions: [health_check]