Commit 4122805
Fix failing upstream test in PR build (#1239)
*Issue #, if available:*
*Description of changes:*
PR builds have been failing for the last 2+ weeks on the `Test patches
applied to dependencies` job:
https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18328141549/job/52275908381
This was due to a failing `jmx-metrics` test in the upstream
opentelemetry-java-instrumentation repo that we clone and patch, where
several metrics seem to be delayed and thus missing when being verified.
```
java.lang.AssertionError: Metrics expected but not received: [tomcat.session.active.count, tomcat.session.active.limit]
Received only: [tomcat.network.io, tomcat.thread.busy.count, tomcat.request.duration.sum, tomcat.thread.count, tomcat.request.count, tomcat.error.count, tomcat.thread.limit, tomcat.request.duration.max]
```
I tried to build the upstream repo standalone on the release/2.18.x
branch and got the same issue, confirming that our patches don't affect
this. This test seems to depend on a [floating tag
version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/083d8639c634d9fb5803efd984956d870a572654/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java#L27)
of the Tomcat docker image which new changes can be pushed to.
Add a temporary patch fix to skip the old Tomcat 9.0 dependency where
the test failure is happening. **We can remove this after bumping the
opentelemetry-java-instrumentation dependency**, as the error is fixed
in future versions.
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
---------
Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com>1 parent ba49eef commit 4122805
1 file changed
+14
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
14 | 28 | | |
15 | 29 | | |
16 | 30 | | |
| |||
25 | 39 | | |
26 | 40 | | |
27 | 41 | | |
28 | | - | |
| |||
0 commit comments