From 9204a6f4c15929970d15909296fe364a908696c3 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Wed, 14 Apr 2021 16:16:24 +0200 Subject: [PATCH] Update otel version to 1.1.0 --- .../micrometer/MicrometerInstaller.java | 4 ++-- .../ResourceAttributesToSystemProperties.java | 5 +++-- .../jaeger/JaegerThriftSpanExporterFactoryTest.java | 2 +- gradle/dependencies.gradle | 8 ++++---- .../CommonsDbcp2InstrumentationModule.java | 2 +- .../GlassfishAttributesInstrumentationModule.java | 2 +- .../JettyAttributesInstrumentationModule.java | 2 +- .../jvmmetrics/JvmMetricsInstaller.java | 4 ++-- .../LibertyAttributesInstrumentationModule.java | 6 ++++-- .../netty/v3_8/NettyInstrumentationModule.java | 3 ++- .../netty/v3_8/NettyInstrumentationTest.java | 2 +- .../netty/v4_0/NettyInstrumentationTest.java | 2 +- .../servlet/Servlet3InstrumentationTest.java | 2 +- .../servlet/ServletInstrumentationModule.java | 2 +- .../servlet/ServletInstrumentationTest.java | 2 +- .../TomcatAttributesInstrumentationModule.java | 2 +- .../TomeeAttributesInstrumentationModule.java | 2 +- .../weblogic/WebLogicInstrumentationModule.java | 2 +- .../WildFlyAttributesInstrumentationModule.java | 2 +- .../com/splunk/opentelemetry/JBossEapSmokeTest.java | 13 ------------- .../com/splunk/opentelemetry/WildFlySmokeTest.java | 13 ------------- testing/agent-metrics/build.gradle | 1 + .../testing/TestMicrometerInstaller.java | 3 ++- 23 files changed, 33 insertions(+), 53 deletions(-) diff --git a/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java b/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java index 755a9a3c2..db8b48c0e 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java +++ b/custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java @@ -30,9 +30,9 @@ @AutoService(ComponentInstaller.class) public class MicrometerInstaller implements ComponentInstaller { @Override - public void beforeByteBuddyAgent() { + public void beforeByteBuddyAgent(Config config) { Resource resource = OpenTelemetrySdkAutoConfiguration.getResource(); - SplunkMetricsConfig splunkMetricsConfig = new SplunkMetricsConfig(Config.get(), resource); + SplunkMetricsConfig splunkMetricsConfig = new SplunkMetricsConfig(config, resource); if (splunkMetricsConfig.enabled()) { GlobalMetricsTags.set(new GlobalTagsBuilder(resource).build()); diff --git a/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java b/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java index d9906e62e..a47704a2f 100644 --- a/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java +++ b/custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java @@ -19,6 +19,7 @@ import com.google.auto.service.AutoService; import io.opentelemetry.api.common.AttributeType; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.instrumentation.api.config.Config; import io.opentelemetry.javaagent.spi.ComponentInstaller; import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration; @@ -32,10 +33,10 @@ public class ResourceAttributesToSystemProperties implements ComponentInstaller { @Override - public void beforeByteBuddyAgent() {} + public void beforeByteBuddyAgent(Config config) {} @Override - public void afterByteBuddyAgent() { + public void afterByteBuddyAgent(Config config) { Attributes attributes = OpenTelemetrySdkAutoConfiguration.getResource().getAttributes(); attributes.forEach( (k, v) -> { diff --git a/custom/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java b/custom/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java index 65e697dc3..20386a434 100644 --- a/custom/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java +++ b/custom/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java @@ -49,7 +49,7 @@ class JaegerThriftSpanExporterFactoryTest { @BeforeAll static void startServer() throws Exception { - port = PortUtils.randomOpenPort(); + port = PortUtils.findOpenPort(); server = new Server(port); for (var connector : server.getConnectors()) { connector.setHost("localhost"); diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index a9f7c602e..5a5f07fe8 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -2,10 +2,10 @@ boolean snapshot = findProperty("snapshot") == 'yes' ext { versions = [ - opentelemetry : snapshot ? "1.1.0-SNAPSHOT" : "1.0.0", - opentelemetryAlpha : snapshot ? "1.1.0-alpha-SNAPSHOT" : "1.0.0-alpha", - opentelemetryJavaagent : snapshot ? "1.1.0-SNAPSHOT" : '1.0.0', - opentelemetryJavaagentAlpha: snapshot ? "1.1.0-alpha-SNAPSHOT" : '1.0.0-alpha', + opentelemetry : snapshot ? "1.2.0-SNAPSHOT" : "1.1.0", + opentelemetryAlpha : snapshot ? "1.2.0-alpha-SNAPSHOT" : "1.1.0-alpha", + opentelemetryJavaagent : snapshot ? "1.2.0-SNAPSHOT" : '1.1.0', + opentelemetryJavaagentAlpha: snapshot ? "1.2.0-alpha-SNAPSHOT" : '1.1.0-alpha', mockito : '3.8.0', jupiter : '5.7.1', micrometer : '1.6.4' diff --git a/instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java b/instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java index fadd8432f..f264d1e07 100644 --- a/instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java +++ b/instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java @@ -62,7 +62,7 @@ public List typeInstrumentations() { private static class BasicDataSourceInstrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("org.apache.commons.dbcp2.BasicDataSource"); } diff --git a/instrumentation/glassfish/src/main/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java b/instrumentation/glassfish/src/main/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java index 7e7a77cba..094f5f6df 100644 --- a/instrumentation/glassfish/src/main/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java +++ b/instrumentation/glassfish/src/main/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java @@ -53,7 +53,7 @@ public List typeInstrumentations() { public static class Instrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("com.sun.appserv.server.util.Version"); } diff --git a/instrumentation/jetty/src/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java b/instrumentation/jetty/src/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java index c207b2f91..fd2dc4c9c 100644 --- a/instrumentation/jetty/src/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java +++ b/instrumentation/jetty/src/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java @@ -54,7 +54,7 @@ public List typeInstrumentations() { public static class Instrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("org.eclipse.jetty.server.Server"); } diff --git a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/jvmmetrics/JvmMetricsInstaller.java b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/jvmmetrics/JvmMetricsInstaller.java index 514bc44b5..d36e6d2a8 100644 --- a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/jvmmetrics/JvmMetricsInstaller.java +++ b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/jvmmetrics/JvmMetricsInstaller.java @@ -32,9 +32,9 @@ @AutoService(ComponentInstaller.class) public class JvmMetricsInstaller implements ComponentInstaller { @Override - public void afterByteBuddyAgent() { + public void afterByteBuddyAgent(Config config) { boolean metricsRegistryPresent = !Metrics.globalRegistry.getRegistries().isEmpty(); - if (!Config.get().isInstrumentationEnabled(singleton("jvm-metrics"), metricsRegistryPresent)) { + if (!config.isInstrumentationEnabled(singleton("jvm-metrics"), metricsRegistryPresent)) { return; } diff --git a/instrumentation/liberty/src/main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java b/instrumentation/liberty/src/main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java index a90ab5532..0afb82580 100644 --- a/instrumentation/liberty/src/main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java +++ b/instrumentation/liberty/src/main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java @@ -17,7 +17,9 @@ package com.splunk.opentelemetry.middleware; import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.named; import com.google.auto.service.AutoService; import com.ibm.ws.kernel.productinfo.ProductInfo; @@ -52,7 +54,7 @@ public List typeInstrumentations() { public static class Instrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("com.ibm.ws.kernel.boot.internal.KernelBootstrap"); } diff --git a/instrumentation/netty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java b/instrumentation/netty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java index 611faf306..74e156dbf 100644 --- a/instrumentation/netty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java +++ b/instrumentation/netty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java @@ -61,8 +61,9 @@ protected boolean defaultEnabled() { return super.defaultEnabled() && ServerTimingHeader.shouldEmitServerTimingHeader(); } + // we don't have muzzle in our distro @Override - public Map contextStore() { + public Map getMuzzleContextStoreClasses() { return Collections.singletonMap( "org.jboss.netty.channel.Channel", ChannelTraceContext.class.getName()); } diff --git a/instrumentation/netty-3.8/src/test/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationTest.java b/instrumentation/netty-3.8/src/test/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationTest.java index 07a4f4a89..dbca24fb6 100644 --- a/instrumentation/netty-3.8/src/test/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationTest.java +++ b/instrumentation/netty-3.8/src/test/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationTest.java @@ -64,7 +64,7 @@ class NettyInstrumentationTest { @BeforeAll static void startServer() { - port = PortUtils.randomOpenPort(); + port = PortUtils.findOpenPort(); server = new ServerBootstrap(new NioServerSocketChannelFactory()); server.setPipelineFactory( diff --git a/instrumentation/netty-4.0/src/test/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationTest.java b/instrumentation/netty-4.0/src/test/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationTest.java index edefa297d..83ee280ee 100644 --- a/instrumentation/netty-4.0/src/test/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationTest.java +++ b/instrumentation/netty-4.0/src/test/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationTest.java @@ -64,7 +64,7 @@ public class NettyInstrumentationTest { @BeforeAll static void startServer() throws InterruptedException { - port = PortUtils.randomOpenPort(); + port = PortUtils.findOpenPort(); server = new NioEventLoopGroup(); new ServerBootstrap() diff --git a/instrumentation/servlet-3-testing/src/test/java/com/splunk/opentelemetry/servlet/Servlet3InstrumentationTest.java b/instrumentation/servlet-3-testing/src/test/java/com/splunk/opentelemetry/servlet/Servlet3InstrumentationTest.java index f29b696f2..9ad0491c0 100644 --- a/instrumentation/servlet-3-testing/src/test/java/com/splunk/opentelemetry/servlet/Servlet3InstrumentationTest.java +++ b/instrumentation/servlet-3-testing/src/test/java/com/splunk/opentelemetry/servlet/Servlet3InstrumentationTest.java @@ -61,7 +61,7 @@ class Servlet3InstrumentationTest { @BeforeAll static void startServer() throws Exception { - port = PortUtils.randomOpenPort(); + port = PortUtils.findOpenPort(); server = new Server(port); for (var connector : server.getConnectors()) { connector.setHost("localhost"); diff --git a/instrumentation/servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java b/instrumentation/servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java index 5d30384a3..0bcf22da8 100644 --- a/instrumentation/servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java +++ b/instrumentation/servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java @@ -76,7 +76,7 @@ public List typeInstrumentations() { private static final class ServletAndFilterInstrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return safeHasSuperType(namedOneOf("javax.servlet.Filter", "javax.servlet.http.HttpServlet")); } diff --git a/instrumentation/servlet/src/test/java/com/splunk/opentelemetry/servlet/ServletInstrumentationTest.java b/instrumentation/servlet/src/test/java/com/splunk/opentelemetry/servlet/ServletInstrumentationTest.java index 1dd3d68c3..ac80974e6 100644 --- a/instrumentation/servlet/src/test/java/com/splunk/opentelemetry/servlet/ServletInstrumentationTest.java +++ b/instrumentation/servlet/src/test/java/com/splunk/opentelemetry/servlet/ServletInstrumentationTest.java @@ -60,7 +60,7 @@ class ServletInstrumentationTest { @BeforeAll static void startServer() throws Exception { - port = PortUtils.randomOpenPort(); + port = PortUtils.findOpenPort(); server = new Server(port); for (var connector : server.getConnectors()) { connector.setHost("localhost"); diff --git a/instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java b/instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java index 0425e02bf..a4e803dd6 100644 --- a/instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java +++ b/instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java @@ -55,7 +55,7 @@ public List typeInstrumentations() { public static class Instrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("org.apache.catalina.startup.Catalina"); } diff --git a/instrumentation/tomee/src/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java b/instrumentation/tomee/src/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java index 9c3fa4afa..7598c94cd 100644 --- a/instrumentation/tomee/src/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java +++ b/instrumentation/tomee/src/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java @@ -47,7 +47,7 @@ public List typeInstrumentations() { public static class Instrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("org.apache.tomee.catalina.ServerListener"); } diff --git a/instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java b/instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java index 131bc2c63..2f9352cce 100644 --- a/instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java +++ b/instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java @@ -66,7 +66,7 @@ public List typeInstrumentations() { private static class MiddlewareInstrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("weblogic.servlet.internal.WebAppServletContext$ServletInvocationAction"); } diff --git a/instrumentation/wildfly/src/main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java b/instrumentation/wildfly/src/main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java index 42a90c031..b3581cf17 100644 --- a/instrumentation/wildfly/src/main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java +++ b/instrumentation/wildfly/src/main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java @@ -54,7 +54,7 @@ public List typeInstrumentations() { public static class Instrumentation implements TypeInstrumentation { @Override - public ElementMatcher typeMatcher() { + public ElementMatcher typeMatcher() { return named("org.jboss.as.server.ServerEnvironment"); } diff --git a/smoke-tests/src/test/java/com/splunk/opentelemetry/JBossEapSmokeTest.java b/smoke-tests/src/test/java/com/splunk/opentelemetry/JBossEapSmokeTest.java index 070f39bf3..a4089ddac 100644 --- a/smoke-tests/src/test/java/com/splunk/opentelemetry/JBossEapSmokeTest.java +++ b/smoke-tests/src/test/java/com/splunk/opentelemetry/JBossEapSmokeTest.java @@ -18,7 +18,6 @@ import com.splunk.opentelemetry.helper.TestImage; import java.io.IOException; -import java.util.Map; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -43,18 +42,6 @@ private static Stream jboss() { .stream(); } - // TODO: this method can be removed after upstream javaagent 1.1.0 release - // openj9 JDK8 does not have JFR classes, which causes all ComponentInstallers to run - // synchronously, not after LogManager is loaded - see - // AgentInstaller#installComponentsAfterByteBuddy() - // micrometer's JvmGcMetrics references (indirectly) NotificationBroadcasterSupport which uses - // ClassLogger which uses JUL and this causes JVM LogManager to load before the JBoss one - // AFAIK only openj9 (IBM) JDK 8 has this problem, all other JDKs don't use JUL in MBeans - @Override - protected Map getExtraEnv() { - return Map.of("SPLUNK_METRICS_ENABLED", "false"); - } - @ParameterizedTest(name = "[{index}] {0}") @MethodSource("jboss") void jbossSmokeTest(TestImage image, ExpectedServerAttributes expectedServerAttributes) diff --git a/smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java b/smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java index 264705016..a470dfbac 100644 --- a/smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java +++ b/smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java @@ -18,7 +18,6 @@ import com.splunk.opentelemetry.helper.TestImage; import java.io.IOException; -import java.util.Map; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -44,18 +43,6 @@ private static Stream supportedConfigurations() { .stream(); } - // TODO: this method can be removed after upstream javaagent 1.1.0 release - // openj9 JDK8 does not have JFR classes, which causes all ComponentInstallers to run - // synchronously, not after LogManager is loaded - see - // AgentInstaller#installComponentsAfterByteBuddy() - // micrometer's JvmGcMetrics references (indirectly) NotificationBroadcasterSupport which uses - // ClassLogger which uses JUL and this causes JVM LogManager to load before the JBoss one - // AFAIK only openj9 (IBM) JDK 8 has this problem, all other JDKs don't use JUL in MBeans - @Override - protected Map getExtraEnv() { - return Map.of("SPLUNK_METRICS_ENABLED", "false"); - } - @ParameterizedTest(name = "[{index}] {0}") @MethodSource("supportedConfigurations") void wildflySmokeTest(TestImage image, ExpectedServerAttributes expectedServerAttributes) diff --git a/testing/agent-metrics/build.gradle b/testing/agent-metrics/build.gradle index 835966ff6..547c1374a 100644 --- a/testing/agent-metrics/build.gradle +++ b/testing/agent-metrics/build.gradle @@ -12,6 +12,7 @@ dependencies { annotationProcessor deps.autoservice compileOnly deps.autoservice + compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagentAlpha}") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagentAlpha}") compileOnly("io.micrometer:micrometer-core:${versions.micrometer}") } diff --git a/testing/agent-metrics/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java b/testing/agent-metrics/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java index 5f0a5cdab..32f93447e 100644 --- a/testing/agent-metrics/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java +++ b/testing/agent-metrics/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java @@ -19,12 +19,13 @@ import com.google.auto.service.AutoService; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import io.opentelemetry.instrumentation.api.config.Config; import io.opentelemetry.javaagent.spi.ComponentInstaller; @AutoService(ComponentInstaller.class) public class TestMicrometerInstaller implements ComponentInstaller { @Override - public void beforeByteBuddyAgent() { + public void beforeByteBuddyAgent(Config config) { Metrics.addRegistry(new SimpleMeterRegistry()); } }