From c2ea6096c65a9dfe91b4e9af92f6701b43ed032d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:40:08 -0700 Subject: [PATCH] Update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v1.31.0-alpha (#1072) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker --- dependencyManagement/build.gradle.kts | 2 +- .../prometheus/clientbridge/PrometheusCollector.java | 11 +++-------- .../clientbridge/PrometheusCollectorTest.java | 8 ++++---- .../plugin/maven/ZipEntryCreator.java | 8 ++++++++ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 0cb0683d7..4532cd917 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -13,7 +13,7 @@ val DEPENDENCY_BOMS = listOf( "com.linecorp.armeria:armeria-bom:1.25.2", "org.junit:junit-bom:5.10.0", "io.grpc:grpc-bom:1.58.0", - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha", + "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.31.0-alpha", "org.testcontainers:testcontainers-bom:1.19.1" ) diff --git a/prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollector.java b/prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollector.java index c5aff3bb8..3acc1096a 100644 --- a/prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollector.java +++ b/prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollector.java @@ -11,7 +11,6 @@ import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.export.CollectionRegistration; import io.opentelemetry.sdk.metrics.export.MetricReader; -import io.opentelemetry.sdk.metrics.internal.export.MetricProducer; import io.prometheus.client.Collector; import io.prometheus.client.CollectorRegistry; import java.util.ArrayList; @@ -28,10 +27,10 @@ public final class PrometheusCollector implements MetricReader { private final Collector collector; - private volatile MetricProducer metricProducer = MetricProducer.noop(); + private volatile CollectionRegistration collectionRegistration = CollectionRegistration.noop(); PrometheusCollector() { - this.collector = new CollectorImpl(() -> getMetricProducer().collectAllMetrics()); + this.collector = new CollectorImpl(() -> collectionRegistration.collectAllMetrics()); this.collector.register(); } @@ -43,13 +42,9 @@ public static PrometheusCollector create() { return new PrometheusCollector(); } - private MetricProducer getMetricProducer() { - return metricProducer; - } - @Override public void register(CollectionRegistration registration) { - this.metricProducer = MetricProducer.asMetricProducer(registration); + this.collectionRegistration = registration; } @Override diff --git a/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollectorTest.java b/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollectorTest.java index b1e77a321..ebc011752 100644 --- a/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollectorTest.java +++ b/prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollectorTest.java @@ -16,11 +16,11 @@ import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.MetricData; +import io.opentelemetry.sdk.metrics.export.CollectionRegistration; import io.opentelemetry.sdk.metrics.internal.data.ImmutableDoublePointData; import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData; import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData; import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData; -import io.opentelemetry.sdk.metrics.internal.export.MetricProducer; import io.opentelemetry.sdk.resources.Resource; import io.prometheus.client.CollectorRegistry; import io.prometheus.client.exporter.common.TextFormat; @@ -36,14 +36,14 @@ @ExtendWith(MockitoExtension.class) class PrometheusCollectorTest { - @Mock MetricProducer metricProducer; + @Mock CollectionRegistration collectionRegistration; PrometheusCollector prometheusCollector; @BeforeEach void setUp() { // Apply the SDK metric producer registers with prometheus. prometheusCollector = new PrometheusCollector(); - prometheusCollector.register(metricProducer); + prometheusCollector.register(collectionRegistration); } @Test @@ -60,7 +60,7 @@ void registerWithSdkMeterProvider() { @Test void registerToDefault() throws IOException { - when(metricProducer.collectAllMetrics()).thenReturn(generateTestData()); + when(collectionRegistration.collectAllMetrics()).thenReturn(generateTestData()); StringWriter stringWriter = new StringWriter(); TextFormat.write004(stringWriter, CollectorRegistry.defaultRegistry.metricFamilySamples()); assertThat(stringWriter.toString()) diff --git a/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/ZipEntryCreator.java b/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/ZipEntryCreator.java index aee90eb75..52e81104a 100644 --- a/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/ZipEntryCreator.java +++ b/static-instrumenter/maven-plugin/src/main/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/ZipEntryCreator.java @@ -24,6 +24,14 @@ static void moveEntryUpdating( FileSystem targetFs, String targetPath, JarEntry sourceEntry, JarFile sourceJar) throws IOException { + if (targetPath.equals( + "META-INF/services/io.opentelemetry.javaagent.tooling.BeforeAgentListener")) { + // TEMPORARY hack to make things pass after a BeforeAgentListener was added in the agent + // in https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/9301 + // which then causes conflict with the BeforeAgentListener in this module + return; + } + Path entry = targetFs.getPath("/", targetPath); Files.createDirectories(entry.getParent()); try (InputStream sourceInput = sourceJar.getInputStream(sourceEntry)) {