Skip to content

Commit 4544a29

Browse files
committed
./gradlew spotlessApply
1 parent 2e553f7 commit 4544a29

File tree

5 files changed

+6
-10
lines changed
  • instrumentation
    • java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul
    • jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1
    • log4j
      • log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2
      • log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal
    • logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal

5 files changed

+6
-10
lines changed

instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
import io.opentelemetry.api.logs.Severity;
1414
import io.opentelemetry.context.Context;
1515
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
16-
import io.opentelemetry.semconv.ExceptionAttributes;
1716
import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
18-
import java.io.PrintWriter;
19-
import java.io.StringWriter;
2017
import java.util.concurrent.TimeUnit;
2118
import java.util.logging.Formatter;
2219
import java.util.logging.Level;

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212
import io.opentelemetry.api.common.AttributeKey;
1313
import io.opentelemetry.api.common.Attributes;
1414
import io.opentelemetry.api.common.AttributesBuilder;
15+
import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
1516
import io.opentelemetry.api.logs.LogRecordBuilder;
1617
import io.opentelemetry.api.logs.Severity;
1718
import io.opentelemetry.context.Context;
18-
import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
1919
import io.opentelemetry.instrumentation.api.internal.cache.Cache;
2020
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
21-
import io.opentelemetry.semconv.ExceptionAttributes;
2221
import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
23-
import java.io.PrintWriter;
24-
import java.io.StringWriter;
2522
import java.util.List;
2623
import java.util.Map;
2724
import org.jboss.logmanager.ExtLogRecord;

instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import io.opentelemetry.api.common.AttributeKey;
1212
import io.opentelemetry.api.common.Attributes;
1313
import io.opentelemetry.api.common.AttributesBuilder;
14+
import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
1415
import io.opentelemetry.api.logs.LogRecordBuilder;
1516
import io.opentelemetry.api.logs.Severity;
1617
import io.opentelemetry.context.Context;
17-
import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
1818
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1919
import io.opentelemetry.instrumentation.api.internal.cache.Cache;
2020
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;

instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ public static AttributeKey<String> getMapMessageAttributeKey(String key) {
234234
key, k -> AttributeKey.stringKey("log4j.map_message." + k));
235235
}
236236

237-
private static void setThrowable(LogRecordBuilder builder, AttributesBuilder attributes, Throwable throwable) {
237+
private static void setThrowable(
238+
LogRecordBuilder builder, AttributesBuilder attributes, Throwable throwable) {
238239
if (builder instanceof ExtendedLogRecordBuilder) {
239240
((ExtendedLogRecordBuilder) builder).setException(throwable);
240241
} else {

instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,8 @@ public static AttributeKey<String> getMdcAttributeKey(String key) {
270270
return mdcAttributeKeys.computeIfAbsent(key, AttributeKey::stringKey);
271271
}
272272

273-
private static void setThrowable(LogRecordBuilder builder, AttributesBuilder attributes, Throwable throwable) {
273+
private static void setThrowable(
274+
LogRecordBuilder builder, AttributesBuilder attributes, Throwable throwable) {
274275
if (builder instanceof ExtendedLogRecordBuilder) {
275276
((ExtendedLogRecordBuilder) builder).setException(throwable);
276277
} else {

0 commit comments

Comments
 (0)