From ffe23ea164b6601678231af1ac49b331ba01af1b Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Mon, 30 Dec 2024 06:13:09 -0500 Subject: [PATCH] Remove unnecessary AgentInstrumentationSpecification extend (#12973) Co-authored-by: Lauri Tulmin --- .../instrumentation/hibernate/v3_3/AbstractHibernateTest.java | 3 +-- .../jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java index ea780b6cb6c1..871be36ae01a 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java @@ -19,7 +19,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; @@ -34,7 +33,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.RegisterExtension; -abstract class AbstractHibernateTest extends AgentInstrumentationSpecification { +abstract class AbstractHibernateTest { @RegisterExtension protected static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java index 53d013dbe051..05822dace6fa 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java @@ -8,7 +8,6 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import io.opentelemetry.api.trace.Span; -import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import java.lang.reflect.InvocationTargetException; @@ -25,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -public class JbossLogmanagerMdcTest extends AgentInstrumentationSpecification { +public class JbossLogmanagerMdcTest { @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create();