Skip to content

Commit 7dcc32b

Browse files
authored
Bump otel SDK to 1.62.0 for CVE-2026-45292 (#149610)
* Bump otel SDK to 1.62.0 for CVE-2026-45292 * Implement newly ambiguous isEnabled method * Use runtimeOnly for opentelemetry-common
1 parent 9611ca9 commit 7dcc32b

3 files changed

Lines changed: 41 additions & 11 deletions

File tree

gradle/verification-metadata.xml

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,11 +1809,21 @@
18091809
<sha256 value="1991903b9fc76b27f1e6a70a5a97131668fb5f3ac9026178c450d510cbb1bef2" origin="Generated by Gradle"/>
18101810
</artifact>
18111811
</component>
1812+
<component group="io.opentelemetry" name="opentelemetry-api" version="1.62.0">
1813+
<artifact name="opentelemetry-api-1.62.0.jar">
1814+
<sha256 value="d58143928c049233653e6bf1282ff8a767ebdd5e6a82b3f336158c30e40b431d" origin="Generated by Gradle"/>
1815+
</artifact>
1816+
</component>
18121817
<component group="io.opentelemetry" name="opentelemetry-common" version="1.53.0">
18131818
<artifact name="opentelemetry-common-1.53.0.jar">
18141819
<sha256 value="73a5181dd07e72c4312fadafc8328ad1046a32c050030e3a7b8c16113daad359" origin="Generated by Gradle"/>
18151820
</artifact>
18161821
</component>
1822+
<component group="io.opentelemetry" name="opentelemetry-common" version="1.62.0">
1823+
<artifact name="opentelemetry-common-1.62.0.jar">
1824+
<sha256 value="d6310bebde67d65c1519696728d8604005315ed08ab14071956fc0826fd71815" origin="Generated by Gradle"/>
1825+
</artifact>
1826+
</component>
18171827
<component group="io.opentelemetry" name="opentelemetry-context" version="1.31.0">
18181828
<artifact name="opentelemetry-context-1.31.0.jar">
18191829
<sha256 value="664896a5c34bcda20c95c8f45198a95e8f97a1cd5e5c2923978f42dddada787d" origin="Generated by Gradle"/>
@@ -1834,6 +1844,11 @@
18341844
<sha256 value="88a780c5bb7b51e7c07071d61403e34f13277d092bf441a5cb49cf2ce9c756e9" origin="Generated by Gradle"/>
18351845
</artifact>
18361846
</component>
1847+
<component group="io.opentelemetry" name="opentelemetry-context" version="1.62.0">
1848+
<artifact name="opentelemetry-context-1.62.0.jar">
1849+
<sha256 value="8ec86c3609222b9b6307bf40154c1f1c288d1f18ada0155409e7797adbdbe517" origin="Generated by Gradle"/>
1850+
</artifact>
1851+
</component>
18371852
<component group="io.opentelemetry" name="opentelemetry-exporter-common" version="1.53.0">
18381853
<artifact name="opentelemetry-exporter-common-1.53.0.jar">
18391854
<sha256 value="d7f093f987547c9c2c2caa28baf1254507c59b4dbf97b49fee5c9cd1ceb6f8d5" origin="Generated by Gradle"/>
@@ -3733,6 +3748,11 @@
37333748
<sha256 value="a3984ff7fd9518d00094e34f3d3e714a4823f2505ada1c19b35c129e26f63934" origin="Generated by Gradle"/>
37343749
</artifact>
37353750
</component>
3751+
<component group="org.bouncycastle" name="bcpg-jdk18on" version="1.84">
3752+
<artifact name="bcpg-jdk18on-1.84.jar">
3753+
<sha256 value="c0e6303a0d7589040f400950ecee87a14b81312e84ed15e5390ebb0c4566ddab" origin="Generated by Gradle"/>
3754+
</artifact>
3755+
</component>
37363756
<component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.60">
37373757
<artifact name="bcpkix-jdk15on-1.60.jar">
37383758
<sha256 value="a82ac5bc24bcbf6ba9eb70f334d6782e25245c8da36d9848ad553b5b7b68efd1" origin="Generated by Gradle"/>
@@ -3748,21 +3768,16 @@
37483768
<sha256 value="3639a24ddf9ba4b7eba0659b44770e91eba816421888e571f285aadefe532cd6" origin="Generated by Gradle"/>
37493769
</artifact>
37503770
</component>
3751-
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.60">
3752-
<artifact name="bcprov-jdk15on-1.60.jar">
3753-
<sha256 value="7f1a0e6badab38666f8467a9a0ee96656b2f8ec8623867ed34f3cdc173b7ee07" origin="Generated by Gradle"/>
3754-
</artifact>
3755-
</component>
3756-
<component group="org.bouncycastle" name="bcpg-jdk18on" version="1.84">
3757-
<artifact name="bcpg-jdk18on-1.84.jar">
3758-
<sha256 value="c0e6303a0d7589040f400950ecee87a14b81312e84ed15e5390ebb0c4566ddab" origin="Generated by Gradle"/>
3759-
</artifact>
3760-
</component>
37613771
<component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.84">
37623772
<artifact name="bcpkix-jdk18on-1.84.jar">
37633773
<sha256 value="c87f16ed9e5ec61bc94151e9f3646ac44e50cd448121ce84367fa4b7ec7ec1bb" origin="Generated by Gradle"/>
37643774
</artifact>
37653775
</component>
3776+
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.60">
3777+
<artifact name="bcprov-jdk15on-1.60.jar">
3778+
<sha256 value="7f1a0e6badab38666f8467a9a0ee96656b2f8ec8623867ed34f3cdc173b7ee07" origin="Generated by Gradle"/>
3779+
</artifact>
3780+
</component>
37663781
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.69">
37673782
<artifact name="bcprov-jdk15on-1.69.jar">
37683783
<sha256 value="e469bd39f936999f256002631003ff022a22951da9d5bd9789c7abfa9763a292" origin="Generated by Gradle"/>

modules/apm/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ esplugin {
1313
classname ='org.elasticsearch.telemetry.apm.APM'
1414
}
1515

16-
def otelVersion = '1.31.0'
16+
def otelVersion = '1.62.0'
1717
def otelSemconvVersion = '1.21.0-alpha'
1818

1919
dependencies {
2020
implementation "io.opentelemetry:opentelemetry-api:${otelVersion}"
2121
implementation "io.opentelemetry:opentelemetry-context:${otelVersion}"
2222
implementation "io.opentelemetry:opentelemetry-semconv:${otelSemconvVersion}"
23+
runtimeOnly "io.opentelemetry:opentelemetry-common:${otelVersion}"
2324
runtimeOnly "co.elastic.apm:elastic-apm-agent-java8:1.55.6"
2425

2526
javaRestTestImplementation project(':modules:apm')

modules/apm/src/test/java/org/elasticsearch/telemetry/apm/RecordingOtelMeter.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,13 @@ private class LongRecorder extends LongUpDownRecorder implements LongCounter, Ot
147147
super(name, InstrumentType.LONG_COUNTER);
148148
}
149149

150+
@Override
151+
public boolean isEnabled() {
152+
// This is goofy: LongCounter and LongUpDownCounter both offer default isEnabled methods,
153+
// so we're forced to implement this, yet we're not forced to choose one.
154+
return super.isEnabled();
155+
}
156+
150157
@Override
151158
public void add(long value) {
152159
assert value >= 0;
@@ -229,6 +236,13 @@ private class DoubleRecorder extends DoubleUpDownRecorder implements DoubleCount
229236
super(name, InstrumentType.DOUBLE_COUNTER);
230237
}
231238

239+
@Override
240+
public boolean isEnabled() {
241+
// This is goofy: LongCounter and LongUpDownCounter both offer default isEnabled methods,
242+
// so we're forced to implement this, yet we're not forced to choose one.
243+
return super.isEnabled();
244+
}
245+
232246
@Override
233247
public void add(double value) {
234248
assert value >= 0;

0 commit comments

Comments
 (0)