Skip to content

[9.0] Switch to fork of opentelemetry-collector-contrib and restore beat receivers #7411

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

Merged
cmacknz merged 9 commits into from
Mar 18, 2025
Merged

[9.0] Switch to fork of opentelemetry-collector-contrib and restore beat receivers #7411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ba7add
Use local contrib replace.
cmacknz Mar 13, 2025
a9400dd
Revert "Remove filebeatreceiver and metricbeatreceiver. (#7023)"
cmacknz Mar 13, 2025
c7f9a09
Downgrade prometheus to v0.54.1
cmacknz Mar 13, 2025
a2196d8
Use cmacknz fork instead of local replace.
cmacknz Mar 13, 2025
e2d743f
Point to the elastic fork.
cmacknz Mar 17, 2025
42531db
Run check-ci
cmacknz Mar 17, 2025
91a3053
Replace only the prometheus receiver.
cmacknz Mar 17, 2025
09cb57a
Update golangci-lint
cmacknz Mar 17, 2025
ffd0be7
Merge branch '9.0' into cmacknz/9.0-use-otel-contrib-fork
cmacknz Mar 17, 2025
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
1 change: 1 addition & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ linters-settings:
- github.com/dop251/goja_nodejs
- github.com/fsnotify/fsnotify
- github.com/openshift/api
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver

nolintlint:
# Enable to ensure that nolint directives are all used. Default is true.
Expand Down
31,911 changes: 24,791 additions & 7,120 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

111 changes: 107 additions & 4 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

328 changes: 314 additions & 14 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions internal/pkg/agent/cmd/testdata/otel/components-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ buildinfo:
description: Elastic opentelemetry-collector distribution
version: 9.0.0
receivers:
- name: filebeatreceiver
stability:
logs: Alpha
metrics: Undefined
traces: Undefined
- name: filelog
stability:
logs: Beta
Expand Down Expand Up @@ -38,6 +43,11 @@ receivers:
logs: Undefined
metrics: Beta
traces: Undefined
- name: metricbeatreceiver
stability:
logs: Alpha
metrics: Undefined
traces: Undefined
- name: otlp
stability:
logs: Beta
Expand Down
1 change: 1 addition & 0 deletions internal/pkg/otel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ This section provides a summary of components included in the Elastic Distributi
| [nopreceiver](https://github.com/open-telemetry/opentelemetry-collector/blob/receiver/nopreceiver/v0.119.0/receiver/nopreceiver/README.md) | v0.119.0 |
| [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/blob/receiver/otlpreceiver/v0.120.0/receiver/otlpreceiver/README.md) | v0.120.0 |
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.120.1/receiver/prometheusreceiver/README.md) | v0.120.1 |
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/=> github.com/elastic/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250317163643-19cd4e80024f/receiver/prometheusreceiver/README.md) | => github.com/elastic/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250317163643-19cd4e80024f |
| [receivercreator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/receivercreator/v0.120.1/receiver/receivercreator/README.md) | v0.120.1 |
| [redisreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/redisreceiver/v0.120.1/receiver/redisreceiver/README.md) | v0.120.1 |
| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.120.1/receiver/zipkinreceiver/README.md) | v0.120.1 |
Expand Down
5 changes: 5 additions & 0 deletions internal/pkg/otel/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import (
nopreceiver "go.opentelemetry.io/collector/receiver/nopreceiver"
otlpreceiver "go.opentelemetry.io/collector/receiver/otlpreceiver"

fbreceiver "github.com/elastic/beats/v7/x-pack/filebeat/fbreceiver"
mbreceiver "github.com/elastic/beats/v7/x-pack/metricbeat/mbreceiver"

// Processors:
attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" // for modifying signal attributes
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
Expand Down Expand Up @@ -84,6 +87,8 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
nginxreceiver.NewFactory(),
jaegerreceiver.NewFactory(),
zipkinreceiver.NewFactory(),
fbreceiver.NewFactory(),
mbreceiver.NewFactory(),
jmxreceiver.NewFactory(),
kafkareceiver.NewFactory(),
nopreceiver.NewFactory(),
Expand Down
Loading
Loading