Skip to content

Commit 20c5e98

Browse files
authored
Remove unneeded util class (#15157)
1 parent 53df247 commit 20c5e98

File tree

6 files changed

+5
-30
lines changed
  • instrumentation
    • jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1
    • log4j
      • log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2
      • log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17
    • spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item
  • testing-common/src/main/java

6 files changed

+5
-30
lines changed

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
2020
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2121
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
22-
import io.opentelemetry.sdk.logs.data.LogRecordData;
2322
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2423
import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
2524
import java.time.Instant;
2625
import java.util.ArrayList;
2726
import java.util.Arrays;
2827
import java.util.List;
2928
import java.util.stream.Stream;
30-
import org.assertj.core.api.AssertAccess;
3129
import org.jboss.logmanager.Level;
3230
import org.jboss.logmanager.LogContext;
3331
import org.jboss.logmanager.Logger;
@@ -166,8 +164,7 @@ private static void test(
166164
}
167165
logRecord.hasAttributesSatisfyingExactly(attributeAsserts);
168166

169-
LogRecordData logRecordData = AssertAccess.getActual(logRecord);
170-
assertThat(logRecordData.getTimestampEpochNanos())
167+
assertThat(logRecord.actual().getTimestampEpochNanos())
171168
.isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli()))
172169
.isLessThanOrEqualTo(MILLISECONDS.toNanos(Instant.now().toEpochMilli()));
173170
});

instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2323
import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil;
2424
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
25-
import io.opentelemetry.sdk.logs.data.LogRecordData;
2625
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2726
import java.lang.reflect.Field;
2827
import java.time.Instant;
@@ -33,7 +32,6 @@
3332
import org.apache.log4j.Logger;
3433
import org.apache.log4j.MDC;
3534
import org.apache.log4j.helpers.Loader;
36-
import org.assertj.core.api.AssertAccess;
3735
import org.junit.jupiter.api.Test;
3836
import org.junit.jupiter.api.extension.RegisterExtension;
3937
import org.junit.jupiter.params.ParameterizedTest;
@@ -161,8 +159,7 @@ private static void test(
161159
SemconvCodeStabilityUtil.codeFileAndLineAssertions("Log4j1Test.java"));
162160
logRecord.hasAttributesSatisfyingExactly(attributeAsserts);
163161

164-
LogRecordData logRecordData = AssertAccess.getActual(logRecord);
165-
assertThat(logRecordData.getTimestampEpochNanos())
162+
assertThat(logRecord.actual().getTimestampEpochNanos())
166163
.isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli()))
167164
.isLessThanOrEqualTo(MILLISECONDS.toNanos(Instant.now().toEpochMilli()));
168165
});

instrumentation/log4j/log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.opentelemetry.api.trace.SpanContext;
2525
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2626
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
27-
import io.opentelemetry.sdk.logs.data.LogRecordData;
2827
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2928
import java.time.Instant;
3029
import java.util.ArrayList;
@@ -37,7 +36,6 @@
3736
import org.apache.logging.log4j.ThreadContext;
3837
import org.apache.logging.log4j.message.StringMapMessage;
3938
import org.apache.logging.log4j.message.StructuredDataMessage;
40-
import org.assertj.core.api.AssertAccess;
4139
import org.junit.jupiter.api.Test;
4240
import org.junit.jupiter.params.ParameterizedTest;
4341
import org.junit.jupiter.params.provider.Arguments;
@@ -132,8 +130,7 @@ private void test(
132130
}
133131
logRecord.hasAttributesSatisfyingExactly(attributeAsserts);
134132

135-
LogRecordData logRecordData = AssertAccess.getActual(logRecord);
136-
assertThat(logRecordData.getTimestampEpochNanos())
133+
assertThat(logRecord.actual().getTimestampEpochNanos())
137134
.isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli()))
138135
.isLessThanOrEqualTo(MILLISECONDS.toNanos(Instant.now().toEpochMilli()));
139136
});

instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/item/ItemLevelSpanTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.List;
1919
import java.util.Map;
2020
import java.util.function.Consumer;
21-
import org.assertj.core.api.AssertAccess;
2221
import org.junit.jupiter.api.Test;
2322
import org.junit.jupiter.api.extension.RegisterExtension;
2423
import org.springframework.batch.core.Job;
@@ -161,7 +160,7 @@ void shouldTraceAllItemOperationsOnAparallelItemsJob() {
161160
// firstly compute child span count for each chunk, we'll sort chunks from larger to
162161
// smaller based on child count
163162

164-
List<SpanData> spans = AssertAccess.getActual(trace);
163+
List<SpanData> spans = trace.actual();
165164
Map<SpanData, Long> childCount = new HashMap<>();
166165

167166
for (SpanData span : spans) {

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
import java.util.function.Consumer;
8383
import java.util.stream.Stream;
8484
import javax.annotation.Nullable;
85-
import org.assertj.core.api.AssertAccess;
8685
import org.awaitility.Awaitility;
8786
import org.junit.jupiter.api.AfterAll;
8887
import org.junit.jupiter.api.BeforeAll;
@@ -754,7 +753,7 @@ protected void assertTheTraces(
754753
trace.hasSpansSatisfyingExactly(spanAssertions);
755754

756755
if (options.verifyServerSpanEndTime) {
757-
List<SpanData> spanData = AssertAccess.getActual(trace);
756+
List<SpanData> spanData = trace.actual();
758757
if (spanData.size() > 1) {
759758
SpanData rootSpan = spanData.get(0);
760759
for (int j = 1; j < spanData.size(); j++) {

testing-common/src/main/java/org/assertj/core/api/AssertAccess.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)