Skip to content

Commit 07d7343

Browse files
anuraagaanuraaga
authored
Update to OTel 1.14 (#331)
* Update to OTel 1.14
1 parent 8fe8458 commit 07d7343

File tree

10 files changed

+731
-707
lines changed

10 files changed

+731
-707
lines changed

‎dependencyManagement/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ val DEPENDENCY_BOMS = listOf(
1818
"org.junit:junit-bom:5.8.2",
1919
"com.linecorp.armeria:armeria-bom:1.9.1",
2020
"io.grpc:grpc-bom:1.42.1",
21-
"io.opentelemetry:opentelemetry-bom:1.13.0",
22-
"io.opentelemetry:opentelemetry-bom-alpha:1.13.0-alpha",
23-
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha-SNAPSHOT",
21+
"io.opentelemetry:opentelemetry-bom:1.14.0",
22+
"io.opentelemetry:opentelemetry-bom-alpha:1.14.0-alpha",
23+
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.14.0-alpha",
2424
"org.testcontainers:testcontainers-bom:1.16.3"
2525
)
2626

‎jfr-streaming/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
dependencies {
66
implementation("io.opentelemetry:opentelemetry-api")
77

8-
testImplementation("io.opentelemetry:opentelemetry-sdk-metrics-testing")
98
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
109
}
1110

‎jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/AbstractMetricsTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55

66
package io.opentelemetry.contrib.jfr.metrics;
77

8-
import static org.assertj.core.api.Assertions.assertThat;
8+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
99
import static org.awaitility.Awaitility.await;
1010

1111
import io.opentelemetry.api.GlobalOpenTelemetry;
1212
import io.opentelemetry.sdk.OpenTelemetrySdk;
1313
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
1414
import io.opentelemetry.sdk.metrics.data.MetricData;
15-
import io.opentelemetry.sdk.testing.assertj.MetricAssertions;
16-
import io.opentelemetry.sdk.testing.assertj.MetricDataAssert;
15+
import io.opentelemetry.sdk.testing.assertj.MetricAssert;
1716
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
1817
import java.util.Collection;
1918
import java.util.function.Consumer;
@@ -33,17 +32,16 @@ static void initializeOpenTelemetry() {
3332
}
3433

3534
@SafeVarargs
36-
protected final void waitAndAssertMetrics(Consumer<MetricDataAssert>... assertions) {
35+
protected final void waitAndAssertMetrics(Consumer<MetricAssert>... assertions) {
3736
await()
3837
.untilAsserted(
3938
() -> {
4039
Collection<MetricData> metrics = metricReader.collectAllMetrics();
4140

4241
assertThat(metrics).isNotEmpty();
4342

44-
for (Consumer<MetricDataAssert> assertion : assertions) {
45-
assertThat(metrics)
46-
.anySatisfy(metric -> assertion.accept(MetricAssertions.assertThat(metric)));
43+
for (Consumer<MetricAssert> assertion : assertions) {
44+
assertThat(metrics).anySatisfy(metric -> assertion.accept(assertThat(metric)));
4745
}
4846
});
4947
}

‎jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPUTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.contrib.jfr.metrics;
77

88
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS;
9-
import static org.assertj.core.api.Assertions.assertThat;
109

1110
import org.junit.jupiter.api.Test;
1211

@@ -25,13 +24,11 @@ public void shouldHaveGcAndLockEvents() throws Exception {
2524
metric
2625
.hasName("process.runtime.jvm.cpu.longlock")
2726
.hasUnit(MILLISECONDS)
28-
.hasDoubleHistogram(),
27+
.hasHistogramSatisfying(histogram -> {}),
2928
metric ->
3029
metric
3130
.hasName("process.runtime.jvm.gc.time")
3231
.hasUnit(MILLISECONDS)
33-
.hasDoubleHistogram()
34-
.points()
35-
.anySatisfy(point -> assertThat(point.getCount()).isPositive()));
32+
.hasHistogramSatisfying(histogram -> {}));
3633
}
3734
}

‎jmx-metrics/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
implementation("io.opentelemetry:opentelemetry-sdk")
3939
implementation("io.opentelemetry:opentelemetry-sdk-metrics")
4040
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
41-
implementation("io.opentelemetry:opentelemetry-sdk-metrics-testing")
4241
implementation("io.opentelemetry:opentelemetry-sdk-testing")
4342
implementation("io.opentelemetry:opentelemetry-exporter-logging")
4443
implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics")

‎jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/CassandraIntegrationTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,55 +32,55 @@ void endToEnd() {
3232
metric,
3333
"cassandra.client.request.range_slice.latency.50p",
3434
"Token range read request latency - 50th percentile",
35-
"µs"),
35+
"us"),
3636
metric ->
3737
assertGauge(
3838
metric,
3939
"cassandra.client.request.range_slice.latency.99p",
4040
"Token range read request latency - 99th percentile",
41-
"µs"),
41+
"us"),
4242
metric ->
4343
assertGauge(
4444
metric,
4545
"cassandra.client.request.range_slice.latency.max",
4646
"Maximum token range read request latency",
47-
"µs"),
47+
"us"),
4848
metric ->
4949
assertGauge(
5050
metric,
5151
"cassandra.client.request.read.latency.50p",
5252
"Standard read request latency - 50th percentile",
53-
"µs"),
53+
"us"),
5454
metric ->
5555
assertGauge(
5656
metric,
5757
"cassandra.client.request.read.latency.99p",
5858
"Standard read request latency - 99th percentile",
59-
"µs"),
59+
"us"),
6060
metric ->
6161
assertGauge(
6262
metric,
6363
"cassandra.client.request.read.latency.max",
6464
"Maximum standard read request latency",
65-
"µs"),
65+
"us"),
6666
metric ->
6767
assertGauge(
6868
metric,
6969
"cassandra.client.request.write.latency.50p",
7070
"Regular write request latency - 50th percentile",
71-
"µs"),
71+
"us"),
7272
metric ->
7373
assertGauge(
7474
metric,
7575
"cassandra.client.request.write.latency.99p",
7676
"Regular write request latency - 99th percentile",
77-
"µs"),
77+
"us"),
7878
metric ->
7979
assertGauge(
8080
metric,
8181
"cassandra.client.request.write.latency.max",
8282
"Maximum regular write request latency",
83-
"µs"),
83+
"us"),
8484
metric ->
8585
assertSum(
8686
metric,

‎jmx-metrics/src/main/resources/target-systems/cassandra.groovy‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,51 +21,51 @@ def clientRequestRangeSlice = "${clientRequest},scope=RangeSlice"
2121
def clientRequestRangeSliceLatency = otel.mbean("${clientRequestRangeSlice},name=Latency")
2222
otel.instrument(clientRequestRangeSliceLatency,
2323
"cassandra.client.request.range_slice.latency.50p",
24-
"Token range read request latency - 50th percentile", "µs", "50thPercentile",
24+
"Token range read request latency - 50th percentile", "us", "50thPercentile",
2525
otel.&doubleValueCallback)
2626

2727
otel.instrument(clientRequestRangeSliceLatency,
2828
"cassandra.client.request.range_slice.latency.99p",
29-
"Token range read request latency - 99th percentile", "µs", "99thPercentile",
29+
"Token range read request latency - 99th percentile", "us", "99thPercentile",
3030
otel.&doubleValueCallback)
3131

3232
otel.instrument(clientRequestRangeSliceLatency,
3333
"cassandra.client.request.range_slice.latency.max",
34-
"Maximum token range read request latency", "µs", "Max",
34+
"Maximum token range read request latency", "us", "Max",
3535
otel.&doubleValueCallback)
3636

3737
def clientRequestRead = "${clientRequest},scope=Read"
3838
def clientRequestReadLatency = otel.mbean("${clientRequestRead},name=Latency")
3939
otel.instrument(clientRequestReadLatency,
4040
"cassandra.client.request.read.latency.50p",
41-
"Standard read request latency - 50th percentile", "µs", "50thPercentile",
41+
"Standard read request latency - 50th percentile", "us", "50thPercentile",
4242
otel.&doubleValueCallback)
4343

4444
otel.instrument(clientRequestReadLatency,
4545
"cassandra.client.request.read.latency.99p",
46-
"Standard read request latency - 99th percentile", "µs", "99thPercentile",
46+
"Standard read request latency - 99th percentile", "us", "99thPercentile",
4747
otel.&doubleValueCallback)
4848

4949
otel.instrument(clientRequestReadLatency,
5050
"cassandra.client.request.read.latency.max",
51-
"Maximum standard read request latency", "µs", "Max",
51+
"Maximum standard read request latency", "us", "Max",
5252
otel.&doubleValueCallback)
5353

5454
def clientRequestWrite = "${clientRequest},scope=Write"
5555
def clientRequestWriteLatency = otel.mbean("${clientRequestWrite},name=Latency")
5656
otel.instrument(clientRequestWriteLatency,
5757
"cassandra.client.request.write.latency.50p",
58-
"Regular write request latency - 50th percentile", "µs", "50thPercentile",
58+
"Regular write request latency - 50th percentile", "us", "50thPercentile",
5959
otel.&doubleValueCallback)
6060

6161
otel.instrument(clientRequestWriteLatency,
6262
"cassandra.client.request.write.latency.99p",
63-
"Regular write request latency - 99th percentile", "µs", "99thPercentile",
63+
"Regular write request latency - 99th percentile", "us", "99thPercentile",
6464
otel.&doubleValueCallback)
6565

6666
otel.instrument(clientRequestWriteLatency,
6767
"cassandra.client.request.write.latency.max",
68-
"Maximum regular write request latency", "µs", "Max",
68+
"Maximum regular write request latency", "us", "Max",
6969
otel.&doubleValueCallback)
7070

7171
def storage = "${cassandraMetrics}:type=Storage"

0 commit comments

Comments
 (0)