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

fluentforwardreceiver: remove replace from builder config since changes were merged upstream #346

Merged
Merged
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
8 changes: 0 additions & 8 deletions otelcolbuilder/.otelcol-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,3 @@ replaces:
# - routing on resource attributes for all signals is merged upstream and available in released version
# branch: https://github.com/SumoLogic/opentelemetry-collector-contrib/tree/v0.37.1-routingprocessor-allow-routing-on-all-signals
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor => github.com/SumoLogic/opentelemetry-collector-contrib/processor/routingprocessor 6dc23bb08e41f434ec4cae5aea8e380d0766e455

# TODO: remove this when:
# - fluentforwardreceiver support for complex object is accepted, merged and released upstream
# PR: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/5676
#
# This includes changes from this branch:
# https://github.com/SumoLogic/opentelemetry-collector-contrib/tree/v0.37.1-fluentforwardreceiver-complex-objects
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver => github.com/SumoLogic/opentelemetry-collector-contrib/receiver/fluentforwardreceiver a1c5ea6f4e5eca13543e7b4aea7da034b9a1fa0e