From 086c36744bd2dbbc7df7b650375e14d28973611f Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Mon, 11 Apr 2022 21:31:19 +0900 Subject: [PATCH] Update to OTel 1.13 (#287) --- dependencyManagement/build.gradle.kts | 4 ++-- .../contrib/jmxmetrics/GroovyMetricEnvironment.java | 4 ++-- .../contrib/jmxmetrics/InstrumentDescriptor.java | 4 ++-- maven-extension/build.gradle.kts | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 5a554b75..8160087e 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -18,8 +18,8 @@ val DEPENDENCY_BOMS = listOf( "org.junit:junit-bom:5.8.2", "com.linecorp.armeria:armeria-bom:1.9.1", "io.grpc:grpc-bom:1.42.1", - "io.opentelemetry:opentelemetry-bom:1.12.0", - "io.opentelemetry:opentelemetry-bom-alpha:1.12.0-alpha", + "io.opentelemetry:opentelemetry-bom:1.13.0", + "io.opentelemetry:opentelemetry-bom-alpha:1.13.0-alpha", "org.testcontainers:testcontainers-bom:1.16.3" ) diff --git a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyMetricEnvironment.java b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyMetricEnvironment.java index a903b4d0..0e868e9d 100644 --- a/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyMetricEnvironment.java +++ b/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/GroovyMetricEnvironment.java @@ -17,9 +17,9 @@ import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; +import io.opentelemetry.sdk.metrics.InstrumentType; +import io.opentelemetry.sdk.metrics.InstrumentValueType; import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.opentelemetry.sdk.metrics.common.InstrumentType; -import io.opentelemetry.sdk.metrics.common.InstrumentValueType; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/jmx-metrics/src/main/java/io/opentelemetry/contrib/jmxmetrics/InstrumentDescriptor.java b/jmx-metrics/src/main/java/io/opentelemetry/contrib/jmxmetrics/InstrumentDescriptor.java index 98661a5c..1745c8d1 100644 --- a/jmx-metrics/src/main/java/io/opentelemetry/contrib/jmxmetrics/InstrumentDescriptor.java +++ b/jmx-metrics/src/main/java/io/opentelemetry/contrib/jmxmetrics/InstrumentDescriptor.java @@ -6,8 +6,8 @@ package io.opentelemetry.contrib.jmxmetrics; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.metrics.common.InstrumentType; -import io.opentelemetry.sdk.metrics.common.InstrumentValueType; +import io.opentelemetry.sdk.metrics.InstrumentType; +import io.opentelemetry.sdk.metrics.InstrumentValueType; @AutoValue abstract class InstrumentDescriptor { diff --git a/maven-extension/build.gradle.kts b/maven-extension/build.gradle.kts index e0d058d2..86432325 100644 --- a/maven-extension/build.gradle.kts +++ b/maven-extension/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") implementation("io.opentelemetry:opentelemetry-semconv") implementation("io.opentelemetry:opentelemetry-exporter-otlp") + implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics") implementation("io.opentelemetry:opentelemetry-exporter-otlp-trace") implementation("io.grpc:grpc-netty-shaded")