Skip to content

Commit cf7643f

Browse files
committed
remove redundant
1 parent dd476de commit cf7643f

File tree

1 file changed

+0
-103
lines changed

1 file changed

+0
-103
lines changed

instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,21 @@
66
package io.opentelemetry.instrumentation.logback.appender.v1_0;
77

88
import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeAttributesLogCount;
9-
import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFileAndLineAssertions;
10-
import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
11-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
129
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
13-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
14-
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
15-
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
16-
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
1710

1811
import ch.qos.logback.classic.LoggerContext;
1912
import ch.qos.logback.core.ContextBase;
2013
import io.opentelemetry.api.common.AttributeKey;
21-
import io.opentelemetry.api.logs.Severity;
2214
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2315
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
24-
import io.opentelemetry.sdk.logs.data.LogRecordData;
2516
import io.opentelemetry.sdk.resources.Resource;
26-
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2717
import java.lang.reflect.Field;
2818
import java.lang.reflect.Method;
29-
import java.time.Instant;
30-
import java.util.Collections;
31-
import java.util.List;
3219
import java.util.Map;
33-
import java.util.concurrent.TimeUnit;
34-
import org.assertj.core.api.AssertAccess;
3520
import org.junit.jupiter.api.BeforeAll;
3621
import org.junit.jupiter.api.Test;
3722
import org.slf4j.Logger;
3823
import org.slf4j.LoggerFactory;
39-
import org.slf4j.MDC;
40-
import org.slf4j.Marker;
41-
import org.slf4j.MarkerFactory;
4224

4325
abstract class AbstractOpenTelemetryAppenderTest {
4426

@@ -80,91 +62,6 @@ static void resetLoggerContext() {
8062

8163
protected abstract InstrumentationExtension getTesting();
8264

83-
@Test
84-
void logNoSpan() {
85-
logger.info("log message 1");
86-
87-
executeAfterLogsExecution();
88-
89-
getTesting()
90-
.waitAndAssertLogRecords(
91-
logRecord ->
92-
logRecord
93-
.hasResource(resource)
94-
.hasInstrumentationScope(instrumentationScopeInfo)
95-
.hasBody("log message 1")
96-
.hasTotalAttributeCount(codeAttributesLogCount()));
97-
}
98-
99-
@Test
100-
void logWithExtras() {
101-
Instant start = Instant.now();
102-
String markerName = "aMarker";
103-
Marker marker = MarkerFactory.getMarker(markerName);
104-
logger.info(marker, "log message 1", new IllegalStateException("Error!"));
105-
106-
executeAfterLogsExecution();
107-
108-
List<AttributeAssertion> assertions =
109-
codeFunctionAssertions(AbstractOpenTelemetryAppenderTest.class, "logWithExtras");
110-
assertions.addAll(
111-
codeFileAndLineAssertions(
112-
AbstractOpenTelemetryAppenderTest.class.getSimpleName() + ".java"));
113-
assertions.add(equalTo(EXCEPTION_TYPE, IllegalStateException.class.getName()));
114-
assertions.add(equalTo(EXCEPTION_MESSAGE, "Error!"));
115-
assertions.add(
116-
satisfies(EXCEPTION_STACKTRACE, stackTrace -> stackTrace.contains("logWithExtras")));
117-
assertions.add(
118-
equalTo(
119-
AttributeKey.stringArrayKey("logback.marker"), Collections.singletonList(markerName)));
120-
121-
Instant now = Instant.now();
122-
getTesting()
123-
.waitAndAssertLogRecords(
124-
logRecord -> {
125-
logRecord
126-
.hasResource(resource)
127-
.hasInstrumentationScope(instrumentationScopeInfo)
128-
.hasBody("log message 1")
129-
.hasSeverity(Severity.INFO)
130-
.hasSeverityText("INFO")
131-
.hasAttributesSatisfyingExactly(assertions);
132-
133-
LogRecordData logRecordData = AssertAccess.getActual(logRecord);
134-
assertThat(logRecordData.getTimestampEpochNanos())
135-
.isGreaterThanOrEqualTo(TimeUnit.MILLISECONDS.toNanos(start.toEpochMilli()))
136-
.isLessThanOrEqualTo(
137-
TimeUnit.SECONDS.toNanos(now.getEpochSecond()) + now.getNano());
138-
});
139-
}
140-
141-
@Test
142-
void logContextData() {
143-
MDC.put("key1", "val1");
144-
MDC.put("key2", "val2");
145-
MDC.put("event.name", "MyEventName");
146-
try {
147-
logger.info("log message 1");
148-
} finally {
149-
MDC.clear();
150-
}
151-
152-
executeAfterLogsExecution();
153-
154-
getTesting()
155-
.waitAndAssertLogRecords(
156-
logRecord ->
157-
logRecord
158-
.hasResource(resource)
159-
.hasInstrumentationScope(instrumentationScopeInfo)
160-
.hasBody("log message 1")
161-
.hasTotalAttributeCount(2 + codeAttributesLogCount()) // code attributes
162-
.hasEventName("MyEventName")
163-
.hasAttributesSatisfying(
164-
equalTo(AttributeKey.stringKey("key1"), "val1"),
165-
equalTo(AttributeKey.stringKey("key2"), "val2")));
166-
}
167-
16865
@Test
16966
void logLoggerContext() {
17067
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();

0 commit comments

Comments
 (0)