Skip to content

Revert merges with missing CI#1443

Merged
MrAlias merged 3 commits into
open-telemetry:mainfrom
MrAlias:revert-missing-ci
Mar 3, 2026
Merged

Revert merges with missing CI#1443
MrAlias merged 3 commits into
open-telemetry:mainfrom
MrAlias:revert-missing-ci

Conversation

@MrAlias
Copy link
Copy Markdown
Contributor

@MrAlias MrAlias commented Mar 3, 2026

@MrAlias MrAlias requested a review from a team as a code owner March 3, 2026 22:12
Copilot AI review requested due to automatic review settings March 3, 2026 22:12
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR reverts multiple base image upgrades that were merged without passing CI. The reversal brings Go, Node.js, Ruby, Java (Temurin), .NET, Alpine, Debian, MySQL, Redis, and Kafka images back to previously validated versions, aligning them with the go 1.25.7 directive in go.mod.

Changes:

  • Downgrades all Go builder images from golang:1.26.0 back to golang:1.25.7 across the entire codebase.
  • Reverts non-Go base images (Node.js, Ruby, Java/Temurin, .NET, Alpine, Debian, MySQL, Redis, Kafka) from versions that did not have CI coverage to previously validated versions.
  • Replaces pinned sha256 digests to match the reverted image versions throughout all Dockerfiles.

Reviewed changes

Copilot reviewed 65 out of 65 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
k8scache.Dockerfile Reverts Go builder from 1.26.0 to 1.25.7
generator.Dockerfile Reverts Go alpine builder from 1.26.0 to 1.25.7
debug.Dockerfile Reverts Go alpine builder from 1.26.0 to 1.25.7
examples/otel-collector/Dockerfile Reverts Go builder and final Alpine image (3.23 → 3.19)
internal/test/vm/Dockerfile Reverts Alpine base from 3.23 to 3.20
internal/test/integration/components/nodejsdist/Dockerfile_b Reverts Node.js from 24 to 18 (inconsistent with other Node Dockerfiles)
internal/test/integration/components/nodejsdist/Dockerfile_r Reverts Node.js from 24 to 18 (inconsistent with other Node Dockerfiles)
internal/test/integration/components/nodejsserver/Dockerfile Reverts Node.js from 24 to 20
internal/test/integration/components/nodeclient/Dockerfile Reverts Node.js from 24 to 20
internal/test/integration/components/nodemultiproc/Dockerfile Reverts Node.js from 24 to 20
internal/test/integration/components/tpclient/Dockerfile Reverts Node.js from 24 to 20
internal/test/integration/components/rubytestserver/testapi/Dockerfile Reverts Ruby from 4.0.1 to 3.4.8
internal/test/integration/components/rubytestserver/testapi/Dockerfile_tls Reverts Ruby from 4.0.1 to 3.4.8
internal/test/integration/components/nginx-rails-sql/testapi/Dockerfile Reverts Ruby from 4.0.1 to 3.4.8
internal/test/integration/components/javatestserver/Dockerfile_jar Reverts Temurin from 25 to 17
internal/test/integration/components/javakafka-tls/Dockerfile Reverts Temurin JRE from 25 to 21
internal/test/integration/components/java_tls/*/Dockerfile Reverts Temurin JRE from 25 to 21
internal/test/integration/components/dotnetserver/Dockerfile Reverts .NET from 10.0 to 7.0
internal/test/integration/components/testserver/Dockerfile_static Reverts Debian from 13 to 12
internal/test/integration/components/rustssltestserver/Dockerfile Reverts Debian from trixie to bookworm
internal/test/integration/components/mysqldb/Dockerfile Reverts MySQL from 9 to 8
internal/test/integration/components/redis/Dockerfile Reverts Redis from 8.6.1 to 7.4.8
Multiple kafka docker-compose files Reverts bitnamilegacy/kafka from 4.0 to 3.9
Multiple Go component Dockerfiles Reverts Go builder from 1.26.0 to 1.25.7

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread internal/test/integration/components/nodejsdist/Dockerfile_b
Comment thread internal/test/integration/components/nodejsdist/Dockerfile_r
Comment thread examples/otel-collector/Dockerfile
Copy link
Copy Markdown
Member

@skl skl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You would need to merge this to get the VM workflows to pass again

Comment thread internal/test/vm/Dockerfile
@MrAlias MrAlias merged commit 0e24aab into open-telemetry:main Mar 3, 2026
19 checks passed
@MrAlias MrAlias deleted the revert-missing-ci branch March 3, 2026 22:28
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 3, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 44.89%. Comparing base (b659d73) to head (cdd6bdc).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1443      +/-   ##
==========================================
- Coverage   44.89%   44.89%   -0.01%     
==========================================
  Files         312      312              
  Lines       28901    28901              
==========================================
- Hits        12976    12974       -2     
- Misses      15133    15136       +3     
+ Partials      792      791       -1     
Flag Coverage Δ
unittests 44.89% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@MrAlias MrAlias added this to the v0.6.0 milestone Mar 5, 2026
@MrAlias MrAlias mentioned this pull request Mar 5, 2026
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.

4 participants