Skip to content

Update OBI submodule to 14950c5#2568

Merged
marctc merged 4 commits intomainfrom
update-obi-submodule-22564211139
Mar 2, 2026
Merged

Update OBI submodule to 14950c5#2568
marctc merged 4 commits intomainfrom
update-obi-submodule-22564211139

Conversation

@grafana-beyla-bot
Copy link
Contributor

Automated update of the OBI (OpenTelemetry eBPF Instrumentation) submodule to the latest commit from grafana/opentelemetry-ebpf-instrumentation main.

OBI commit: 14950c5

If CI fails due to upstream breaking changes, add the agent/fix-obi label to this PR to run the agentic workflow and get suggested fixes.

@grafana-beyla-bot grafana-beyla-bot bot requested a review from a team as a code owner March 2, 2026 06:30
@codecov-commenter
Copy link

codecov-commenter commented Mar 2, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 10.87%. Comparing base (ab5ca7d) to head (476b72f).
⚠️ Report is 9 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2568   +/-   ##
=======================================
  Coverage   10.87%   10.87%           
=======================================
  Files          43       43           
  Lines        4130     4130           
=======================================
  Hits          449      449           
  Misses       3604     3604           
  Partials       77       77           
Flag Coverage Δ
beyla-integration-test 0.00% <ø> (?)
integration-test 12.86% <ø> (ø)
integration-test-arm 0.00% <ø> (ø)
integration-test-vm-${ARCH}-${KERNEL_VERSION} 0.00% <ø> (?)
k8s-integration-test 1.83% <ø> (ø)
oats-test 0.00% <ø> (ø)

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.

@marctc marctc added the agent/fix-obi Trigger agentic workflow to fix obi's breaking changes label Mar 2, 2026
@marctc marctc added agent/fix-obi Trigger agentic workflow to fix obi's breaking changes and removed agent/fix-obi Trigger agentic workflow to fix obi's breaking changes labels Mar 2, 2026
The new OBI version uses //go:embed exclusively to load the Java agent JAR
at startup. The test Dockerfile was building Go first (embedding the
placeholder), then copying the real JAR to /obi-java-agent.jar — a path
the new runtime never reads — causing 'embedded OBI java agent artifact is
missing' warnings and no Java TLS spans in all Java-agent tests.

Fix mirrors OBI's own Dockerfile-with-javaagent:
- Move javaagent-builder stage before the Go builder stage
- COPY the Gradle-built JAR into
  vendor/go.opentelemetry.io/obi/pkg/internal/java/embedded/obi-java-agent.jar
  before make compile-for-coverage runs, so the real JAR is embedded at
  compile time
- Remove the now-redundant final-stage COPY of the JAR to /obi-java-agent.jar

Also update Makefile java-build / java-docker-build targets to output the
JAR to the same vendor embed path (JAVA_AGENT_EMBED_DIR), matching OBI's
Makefile convention, so local builds embed the real agent correctly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ marctc
❌ Beyla Bot


Beyla Bot seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@grafana-beyla-bot
Copy link
Contributor Author

Fix: embed Java agent JAR at compile time

Root cause

The new OBI version (14950c5) uses //go:embed embedded/obi-java-agent.jar exclusively to load the Java agent at startup. The Beyla test Dockerfile (Dockerfile-with-javaagent) was building the Go binary first (embedding the placeholder bytes), then copying the real JAR to /obi-java-agent.jar in the final image — a path the new OBI runtime no longer reads. This caused the embedded OBI java agent artifact is missing warning at startup, disabling all Java TLS instrumentation.

Files changed

internal/test/beyla_extensions/components/beyla/Dockerfile-with-javaagent (primary fix)

  • Moved javaagent-builder stage before the Go builder stage (matching OBI's own Dockerfile)
  • Added COPY --from=javaagent-builder to overwrite the vendor placeholder JAR at vendor/go.opentelemetry.io/obi/pkg/internal/java/embedded/obi-java-agent.jar before make compile-for-coverage runs — so the binary embeds the real agent at compile time
  • Removed the now-dead final-stage COPY ... /obi-java-agent.jar line

Makefile (secondary fix — local dev parity)

  • Added JAVA_AGENT_EMBED_DIR := vendor/go.opentelemetry.io/obi/pkg/internal/java/embedded
  • Updated java-build and java-docker-build targets to output the JAR to $(JAVA_AGENT_EMBED_DIR) instead of bin/, matching OBI's own Makefile convention

Expected CI outcome

  • shard-9 TestSuite_JavaKafkaTLS — should produce Kafka TLS spans
  • shard-13 TestJavaNestedTraces — should produce outgoing client spans
  • run-oats_java_tls_jdk_8, run-oats_java_tls_netty, run-oats_java_tls_sync_async — should find spans in Tempo within timeout
  • run-oats_python_outgoing_unresolved — should complete (no longer starved by the 3 Java TLS timeouts)

Upstream note

The OBI Dockerfile-with-javaagent is already correct as of this submodule bump (14950c5). No upstream OBI changes are required.

@marctc marctc merged commit 76f9b42 into main Mar 2, 2026
92 of 94 checks passed
@marctc marctc deleted the update-obi-submodule-22564211139 branch March 2, 2026 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent/fix-obi Trigger agentic workflow to fix obi's breaking changes automated-pr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants