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.

Sign up for GitHub

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

Jump to bottom

chore: Update to collector version 0.111.0 #130

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: Update to collector version 0.111.0 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 6 additions & 6 deletions configs/nr-otel-collector-agent-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ processors:
override: true

exporters:
logging:
debug:
otlphttp:
endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT}
headers:
Expand Down Expand Up @@ -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]
6 changes: 3 additions & 3 deletions configs/nr-otel-collector-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ processors:
limit_mib: ${NEW_RELIC_MEMORY_LIMIT_MIB}

exporters:
logging:
debug:
verbosity: detailed
otlp:
endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT}
Expand All @@ -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]
10 changes: 1 addition & 9 deletions distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down Expand Up @@ -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):
Expand Down
57 changes: 28 additions & 29 deletions distributions/nr-otel-collector/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions test/canaries/templates/nr-otel-collector-agent.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ processors:
enabled: false

exporters:
logging:
debug:
otlp:
endpoint: https://staging-otlp.nr-data.net:4317
headers:
Expand All @@ -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]
Loading