Skip to content

fix(gboc): regenerate distribution on gboc-experiment-policy and drop stale ottl pin - #737

Open
dashpole wants to merge 1 commit into
GoogleCloudPlatform:gboc-experiment-policyfrom
dashpole:fix-gboc-experiment-policy-regen
Open

dashpole wants to merge 1 commit into
GoogleCloudPlatform:gboc-experiment-policyfrom
dashpole:fix-gboc-experiment-policy-regen

Conversation

@dashpole

Copy link
Copy Markdown
Contributor

Summary

Restores the gboc-experiment-policy components in google-built-opentelemetry-collector/ that were dropped when manifest.yaml and generated_collector/ were overwritten during a branch merge from master (99cddace), fixes collector regeneration after the v0.162.0 upgrade, and enables Presubmit and Proto CI workflows on PRs targeting gboc-experiment-policy.

Changes

  1. Remove stale pkg/ottl v0.160.0 replace (specs/google-built-opentelemetry-collector.yaml): The v0.160.0 pin was added when opentelemetry_contrib_version was 0.160.0. Now that opentelemetry_contrib_version is 0.162.0, the pin downgraded pkg/ottl below what v0.162.0 contrib packages require. Removing the replace lets Go module resolution select v0.162.0.
  2. Regenerate google-built-opentelemetry-collector (make regen-google-built-otel): Restores nginx, filestats, udplog, googlepolicy, queuebatch, geoip, kafka, the googlecontrolplane extension and provider, and the local module replaces (pkg/googlepolicy, pkg/event, and root module ../..) in manifest.yaml and generated_collector/.
  3. Run CI on PRs targeting gboc-experiment-policy (.github/workflows/presubmit.yaml, .github/workflows/proto.yaml): Adds gboc-experiment-policy to on.pull_request.branches so branch-sync PRs run make presubmit and make compare-all.

@dashpole
dashpole marked this pull request as ready for review October 17, 2026 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant