diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java index bbf8ff2ac4bb..6573a4bde2cb 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java @@ -19,7 +19,6 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; @@ -27,7 +26,6 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import org.assertj.core.api.AssertAccess; import org.jboss.logmanager.Level; import org.jboss.logmanager.LogContext; import org.jboss.logmanager.Logger; @@ -166,8 +164,7 @@ private static void test( } logRecord.hasAttributesSatisfyingExactly(attributeAsserts); - LogRecordData logRecordData = AssertAccess.getActual(logRecord); - assertThat(logRecordData.getTimestampEpochNanos()) + assertThat(logRecord.actual().getTimestampEpochNanos()) .isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli())) .isLessThanOrEqualTo(MILLISECONDS.toNanos(Instant.now().toEpochMilli())); }); diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java index 6f088c19d62a..bdc84484182f 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java @@ -22,7 +22,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import java.lang.reflect.Field; import java.time.Instant; @@ -33,7 +32,6 @@ import org.apache.log4j.Logger; import org.apache.log4j.MDC; import org.apache.log4j.helpers.Loader; -import org.assertj.core.api.AssertAccess; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; @@ -161,8 +159,7 @@ private static void test( SemconvCodeStabilityUtil.codeFileAndLineAssertions("Log4j1Test.java")); logRecord.hasAttributesSatisfyingExactly(attributeAsserts); - LogRecordData logRecordData = AssertAccess.getActual(logRecord); - assertThat(logRecordData.getTimestampEpochNanos()) + assertThat(logRecord.actual().getTimestampEpochNanos()) .isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli())) .isLessThanOrEqualTo(MILLISECONDS.toNanos(Instant.now().toEpochMilli())); }); diff --git a/instrumentation/log4j/log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java b/instrumentation/log4j/log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java index 2dd8d3826e57..f7b8f9d06221 100644 --- a/instrumentation/log4j/log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java +++ b/instrumentation/log4j/log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java @@ -24,7 +24,6 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; -import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import java.time.Instant; import java.util.ArrayList; @@ -37,7 +36,6 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.message.StringMapMessage; import org.apache.logging.log4j.message.StructuredDataMessage; -import org.assertj.core.api.AssertAccess; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -132,8 +130,7 @@ private void test( } logRecord.hasAttributesSatisfyingExactly(attributeAsserts); - LogRecordData logRecordData = AssertAccess.getActual(logRecord); - assertThat(logRecordData.getTimestampEpochNanos()) + assertThat(logRecord.actual().getTimestampEpochNanos()) .isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli())) .isLessThanOrEqualTo(MILLISECONDS.toNanos(Instant.now().toEpochMilli())); }); diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item/ItemLevelSpanTest.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item/ItemLevelSpanTest.java index a55715ad1724..05df5544029e 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item/ItemLevelSpanTest.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item/ItemLevelSpanTest.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import org.assertj.core.api.AssertAccess; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.batch.core.Job; @@ -161,7 +160,7 @@ void shouldTraceAllItemOperationsOnAparallelItemsJob() { // firstly compute child span count for each chunk, we'll sort chunks from larger to // smaller based on child count - List spans = AssertAccess.getActual(trace); + List spans = trace.actual(); Map childCount = new HashMap<>(); for (SpanData span : spans) { diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 6b91e4f09c96..505972d81eb7 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -82,7 +82,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.assertj.core.api.AssertAccess; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -754,7 +753,7 @@ protected void assertTheTraces( trace.hasSpansSatisfyingExactly(spanAssertions); if (options.verifyServerSpanEndTime) { - List spanData = AssertAccess.getActual(trace); + List spanData = trace.actual(); if (spanData.size() > 1) { SpanData rootSpan = spanData.get(0); for (int j = 1; j < spanData.size(); j++) { diff --git a/testing-common/src/main/java/org/assertj/core/api/AssertAccess.java b/testing-common/src/main/java/org/assertj/core/api/AssertAccess.java deleted file mode 100644 index f514eee0fa59..000000000000 --- a/testing-common/src/main/java/org/assertj/core/api/AssertAccess.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.assertj.core.api; - -public final class AssertAccess { - private AssertAccess() {} - - public static ACTUAL getActual(AbstractAssert abstractAssert) { - return abstractAssert.actual; - } -}