open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove micrometer dependency on incubator (#13642)

This commit is contained in:
jack-berg 2025-04-02 13:18:22 -05:00 committed by GitHub
parent a6d2a78347
commit b3233c4203
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/micrometer/micrometer-1.5/library/build.gradle.kts
View File

@ -3,8 +3,6 @@ plugins {
} }
dependencies { dependencies {
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
library("io.micrometer:micrometer-core:1.5.0") library("io.micrometer:micrometer-core:1.5.0")
testImplementation(project(":instrumentation:micrometer:micrometer-1.5:testing")) testImplementation(project(":instrumentation:micrometer:micrometer-1.5:testing"))

7
instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/HistogramAdviceUtil.java
View File

@ -9,7 +9,6 @@ import static java.util.Collections.emptyList;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.core.instrument.util.TimeUtils; import io.micrometer.core.instrument.util.TimeUtils;
import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -28,12 +27,8 @@ final class HistogramAdviceUtil {
DoubleHistogramBuilder builder, DoubleHistogramBuilder builder,
DistributionStatisticConfig config, DistributionStatisticConfig config,
@Nullable TimeUnit timeUnit) { @Nullable TimeUnit timeUnit) {
if (!(builder instanceof ExtendedDoubleHistogramBuilder)) {
return;
}
NavigableSet<Double> buckets = config.getHistogramBuckets(false); NavigableSet<Double> buckets = config.getHistogramBuckets(false);
ExtendedDoubleHistogramBuilder extendedBuilder = (ExtendedDoubleHistogramBuilder) builder; builder.setExplicitBucketBoundariesAdvice(computeBuckets(buckets, timeUnit));
extendedBuilder.setExplicitBucketBoundariesAdvice(computeBuckets(buckets, timeUnit));
} }
private static List<Double> computeBuckets( private static List<Double> computeBuckets(