Skip to content

Commit 294aade

Browse files
authored
Update to OTel 1.9 (#130)
1 parent f3da4c2 commit 294aade

File tree

4 files changed

+39
-4
lines changed

4 files changed

+39
-4
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ val DEPENDENCY_BOMS = listOf(
1818
"org.junit:junit-bom:5.7.2",
1919
"com.linecorp.armeria:armeria-bom:1.9.1",
2020
"io.grpc:grpc-bom:1.39.0",
21-
"io.opentelemetry:opentelemetry-bom:1.7.0",
22-
"io.opentelemetry:opentelemetry-bom-alpha:1.7.0-alpha",
21+
"io.opentelemetry:opentelemetry-bom:1.9.0",
22+
"io.opentelemetry:opentelemetry-bom-alpha:1.9.0-alpha",
2323
"org.testcontainers:testcontainers-bom:1.16.0"
2424
)
2525

jmx-metrics/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ dependencies {
4949
implementation("org.slf4j:slf4j-api")
5050
implementation("org.slf4j:slf4j-simple")
5151

52+
annotationProcessor("com.google.auto.value:auto-value")
53+
compileOnly("com.google.auto.value:auto-value-annotations")
54+
5255
runtimeOnly("org.terracotta:jmxremote_optional-tc:1.0.8")
5356

5457
testImplementation("io.grpc:grpc-api")
@@ -58,7 +61,7 @@ dependencies {
5861
testImplementation("org.junit-pioneer:junit-pioneer")
5962
testImplementation("org.awaitility:awaitility")
6063
testImplementation("org.testcontainers:testcontainers")
61-
testImplementation("io.opentelemetry:opentelemetry-proto")
64+
testImplementation("io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha")
6265

6366
add("integrationTestImplementation", "com.linecorp.armeria:armeria-grpc")
6467
add("integrationTestImplementation", "com.linecorp.armeria:armeria-junit5")

jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyMetricEnvironment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
2020
import io.opentelemetry.api.metrics.ObservableLongMeasurement;
2121
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
22-
import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor;
2322
import io.opentelemetry.sdk.metrics.common.InstrumentType;
2423
import io.opentelemetry.sdk.metrics.common.InstrumentValueType;
2524
import java.util.Map;
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.contrib.jmxmetrics;
7+
8+
import com.google.auto.value.AutoValue;
9+
import io.opentelemetry.sdk.metrics.common.InstrumentType;
10+
import io.opentelemetry.sdk.metrics.common.InstrumentValueType;
11+
12+
@AutoValue
13+
abstract class InstrumentDescriptor {
14+
15+
static InstrumentDescriptor create(
16+
String name,
17+
String description,
18+
String unit,
19+
InstrumentType instrumentType,
20+
InstrumentValueType valueType) {
21+
return new AutoValue_InstrumentDescriptor(name, description, unit, instrumentType, valueType);
22+
}
23+
24+
abstract String getName();
25+
26+
abstract String getDescription();
27+
28+
abstract String getUnit();
29+
30+
abstract InstrumentType getInstrumentType();
31+
32+
abstract InstrumentValueType getValueType();
33+
}

0 commit comments

Comments
 (0)