updates explicit x-merge-overrides handling to handle generic extensions #2573
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jack-edmonds-dd
approved these changes
Jul 16, 2024
mx-psi
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
Jul 23, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/DataDog/agent-payload/v5](https://github.com/DataDog/agent-payload) | `v5.0.124` -> `v5.0.125` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/core/config](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/core/log](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/config/model](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/config/setup](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/proto](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/util/hostname/validate](https://github.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-api-client-go/v2](https://github.com/DataDog/datadog-api-client-go) | `v2.27.0` -> `v2.28.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>DataDog/agent-payload (github.com/DataDog/agent-payload/v5)</summary> ### [`v5.0.125`](https://github.com/DataDog/agent-payload/releases/tag/v5.0.125) [Compare Source](https://github.com/DataDog/agent-payload/compare/v5.0.124...v5.0.125) #### What's Changed - \[USM]: add placeholder Redis stats by [@​Yumasi](https://github.com/Yumasi) in [DataDog/agent-payload#325 **Full Changelog**: DataDog/agent-payload@v5.0.124...v5.0.125 </details> <details> <summary>DataDog/datadog-api-client-go (github.com/DataDog/datadog-api-client-go/v2)</summary> ### [`v2.28.0`](https://github.com/DataDog/datadog-api-client-go/releases/tag/v2.28.0) [Compare Source](https://github.com/DataDog/datadog-api-client-go/compare/v2.27.0...v2.28.0) <!-- Release notes generated using configuration in .github/release.yml at v2.28.0 --> ##### What's Changed ##### Fixed - fix monitor enum by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2569 - dashboards add support for time-slice SLOs by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2570 - Make modified by field nullable for get all API keys by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2576 ##### Added - add cross org uuids to timeseries query by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2535 - Add network performance monitor type to API spec by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2546 - Document `force_delete_dependencies` for synthetics test deletion by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2540 - Support metric filtering in integration azure GET, PUT APIs by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2551 - add enableProfiling and enableSecurityTesting options by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2562 - Add convert rule JSON to terraform to Datadog API Spec. by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2537 - add changes for datadog partner program to estimated cost and billable usage APIs by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2542 - Add type as a required field for the different basic auth types by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2553 - Adding Network Device Monitoring API Documentation by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2548 - Security Monitoring - Support anomaly threshold detection method by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2567 - update hourly usage API docs for partner program by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2577 - Add resource_type query param to authn mapping spec by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2515 - Add rum stream to API definition by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2581 ##### Deprecated - Deprecate `ListAWSRelatedAccounts` by [@​api-clients-generation-pipeline](https://github.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#2585 ##### New Contributors - [@​amaskara-dd](https://github.com/amaskara-dd) made their first contribution in [DataDog/datadog-api-client-go#2573 **Full Changelog**: DataDog/datadog-api-client-go@v2.27.0...v2.28.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MzguMCIsInVwZGF0ZWRJblZlciI6IjM3LjQzOC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Additional Notes
Review checklist
Please check relevant items below:
This PR includes all newly recorded cassettes for any modified tests.
This PR does not rely on API client schema changes.
Or, this PR relies on API schema changes and this is a Draft PR to include tests for that new functionality.