Adjust constants in rakefile #339
Merged
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
sgnn7
approved these changes
Sep 3, 2024
This PR renames: * protoc_binary/protoc_version -> protoc_legacy_binary/protoc_legacy_version * protoc_binary_2/protoc_version_2 -> protoc_binary/protoc_version For background, protobuf has two major versions: 2 and 3. The suffix for protoc_binary_2 implies that a 2.x series protobuf compiler is being used. But actually, protoc_binary_2 points to a 22.04 release, which is fairly new. Contrast with protoc_binary which is pointing to protoc 3.5.1 which has been deprecated for several years (it's not even listed as deprecated in the public list of [releases](https://protobuf.dev/support/version-support/)) This PR also initializes protoc_binary and protoc_legacy_binary to their ultimate values from the get go. Compare this to before where they were both being set to `protoc` and then getting updated in setup_proto This PR is purely a refactor, and does not change any generated code (this is proved by CI). After this PR, we should excise the legacy compiler, but that can be done in a separate PR. Make it clearer what's happening
leeavital
force-pushed
the
lee.avital/refactor_rakefile
branch
from
00b3937 to
9dc090c
Compare
|
/merge |
|
🚂 MergeQueue: pull request added to the queue The median merge time in Use |
dd-devflow
bot
added
mergequeue-status: queued
mergequeue-status: in_progress
and removed
mergequeue-status: queued
labels
dd-devflow
bot
added
mergequeue-status: done
and removed
mergequeue-status: in_progress
labels
mx-psi
referenced
this pull request
in open-telemetry/opentelemetry-collector-contrib
Sep 11, 2024
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/DataDog/agent-payload/v5](https://redirect.github.com/DataDog/agent-payload) | `v5.0.131` -> `v5.0.132` | [](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://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/logs/agent/config](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/config/model](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/config/setup](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/logs/sources](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/obfuscate](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/proto](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/trace](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-agent/pkg/util/hostname/validate](https://redirect.github.com/DataDog/datadog-agent) | `v0.56.2` -> `v0.57.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/) | | [github.com/DataDog/datadog-api-client-go/v2](https://redirect.github.com/DataDog/datadog-api-client-go) | `v2.29.0` -> `v2.30.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/) | | [github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata](https://redirect.github.com/DataDog/opentelemetry-mapping-go) | `v0.19.0` -> `v0.20.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/) | | [github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes](https://redirect.github.com/DataDog/opentelemetry-mapping-go) | `v0.19.0` -> `v0.20.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/) | | [github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs](https://redirect.github.com/DataDog/opentelemetry-mapping-go) | `v0.19.0` -> `v0.20.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/) | | [github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics](https://redirect.github.com/DataDog/opentelemetry-mapping-go) | `v0.19.0` -> `v0.20.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/) | | [github.com/DataDog/opentelemetry-mapping-go/pkg/quantile](https://redirect.github.com/DataDog/opentelemetry-mapping-go) | `v0.19.0` -> `v0.20.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.132`](https://redirect.github.com/DataDog/agent-payload/releases/tag/v5.0.132) [Compare Source](https://redirect.github.com/DataDog/agent-payload/compare/v5.0.131...v5.0.132) ##### What's Changed - \[NPM-3609] add docs to connections.proto by [@​leeavital](https://redirect.github.com/leeavital) in [https://github.com/DataDog/agent-payload/pull/336](https://redirect.github.com/DataDog/agent-payload/pull/336) - Adjust constants in rakefile by [@​leeavital](https://redirect.github.com/leeavital) in [https://github.com/DataDog/agent-payload/pull/339](https://redirect.github.com/DataDog/agent-payload/pull/339) - Avoid redownloading all dependencies (protoc, gogo) by [@​leeavital](https://redirect.github.com/leeavital) in [https://github.com/DataDog/agent-payload/pull/337](https://redirect.github.com/DataDog/agent-payload/pull/337) - Update CWS payloads off deprecated protobuf types by [@​leeavital](https://redirect.github.com/leeavital) in [https://github.com/DataDog/agent-payload/pull/342](https://redirect.github.com/DataDog/agent-payload/pull/342) **Full Changelog**: DataDog/agent-payload@v5.0.131...v5.0.132 </details> <details> <summary>DataDog/datadog-api-client-go (github.com/DataDog/datadog-api-client-go/v2)</summary> ### [`v2.30.0`](https://redirect.github.com/DataDog/datadog-api-client-go/releases/tag/v2.30.0) [Compare Source](https://redirect.github.com/DataDog/datadog-api-client-go/compare/v2.29.0...v2.30.0) <!-- Release notes generated using configuration in .github/release.yml at v2.30.0 --> ##### What's Changed ##### Fixed - Add `is_totp` and `is_fido` to Synthetic global variables by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2582](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2582) ##### Added - Add `api_key` and `name` to `CloudflareAccountResponseAttributes`. by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2631](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2631) - Add `api_key` and `name` to `FastlyAccountUpdateRequestAttributes`. by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2632](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2632) - Add `opsgenie_api_key` to `OpsgenieServiceResponseAttributes`. by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2633](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2633) - Add `category` and `remote_config_read_enabled` to `APIKeyCreateAttributes`, and add `LeakedKey`. by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2634](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2634) - Allow 4 group-bys for pattern viz by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2642](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2642) - add url attribute to metrics assets v2 api by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2644](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2644) - Add editable field to suppression rule by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2545](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2545) - Add `num_flex_logs_retention_days` field to logs_indexes api spec by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2645](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2645) - Software catalog openapi spec by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2641](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2641) ##### Changed - allow variables in port by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2624](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2624) - Fix VFTs and extracted local variables enum types by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2604](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2604) - Changed Widget time schema to add support for new fixed_span and live_span object by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2629](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2629) ##### Deprecated - mark groupby_simple_monitor as deprecated by [@​api-clients-generation-pipeline](https://redirect.github.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2658](https://redirect.github.com/DataDog/datadog-api-client-go/pull/2658) **Full Changelog**: DataDog/datadog-api-client-go@v2.29.0...v2.30.0 </details> <details> <summary>DataDog/opentelemetry-mapping-go (github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata)</summary> ### [`v0.20.0`](https://redirect.github.com/DataDog/opentelemetry-mapping-go/blob/HEAD/CHANGELOG.md#v0200) ##### 💡 Enhancements 💡 - `pkg/otlp/attributes`: Map the new OTel semantic convention `deployment.environment.name` to `env` ([#​400](https://redirect.github.com/DataDog/opentelemetry-mapping-go/issues/400)) Mapping of the old convention `deployment.environment` stays the same </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://redirect.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://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song <songy23@users.noreply.github.com>
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?
This PR was a refactor that I wound up pulling out as a precursor to #337
This PR renames:
For background, protobuf has two major versions: 2 and 3.
The suffix for protoc_binary_2 implies that a 2.x series protobuf compiler is being used. But actually, protoc_binary_2 points to a 22.04 release, which is fairly new.
Contrast with protoc_binary which is pointing to protoc 3.5.1 which has been deprecated for several years (it's not even listed as deprecated in the public list of releases)
This PR also initializes protoc_binary and protoc_legacy_binary to their ultimate values from the get go. Compare this to before where they were both being set to
protocand then getting updated in setup_protoThis PR is purely a refactor, and does not change any generated code (this is proved by CI). After this PR, we should excise the legacy compiler, but that can be done in a separate PR.
Motivation
This PR will make it a bit easier to write and review changes to the build scripting, namely:
Additional Notes
Possible Drawbacks / Trade-offs
Describe how to test/QA your changes
Reviewer's Checklist
Reviewers: please see the review guidelines.