Skip to content

Commit 567fce4

Browse files
:instrumentation:logback:logback-appender-1.0:library:spotlessApply
1 parent 5c340b0 commit 567fce4

File tree

2 files changed

+14
-13
lines changed
  • instrumentation/logback/logback-appender-1.0/library/src

2 files changed

+14
-13
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,10 @@ private void mapLoggingEvent(
170170
captureLoggerContext(attributes, loggingEvent.getLoggerContextVO().getPropertyMap());
171171
}
172172

173-
if (captureArguments &&
174-
loggingEvent.getArgumentArray()!=null && loggingEvent.getArgumentArray().length > 0) {
175-
captureArguments(attributes, loggingEvent.getMessage(), loggingEvent.getArgumentArray());
173+
if (captureArguments
174+
&& loggingEvent.getArgumentArray() != null
175+
&& loggingEvent.getArgumentArray().length > 0) {
176+
captureArguments(attributes, loggingEvent.getMessage(), loggingEvent.getArgumentArray());
176177
}
177178

178179
builder.setAllAttributes(attributes.build());
@@ -198,12 +199,12 @@ void captureMdcAttributes(AttributesBuilder attributes, Map<String, String> mdcP
198199
}
199200
}
200201

201-
void captureArguments(AttributesBuilder attributes, String message, Object[] arguments){
202+
void captureArguments(AttributesBuilder attributes, String message, Object[] arguments) {
202203
attributes.put("src_msg_", message);
203-
for (int idx = 0; idx < arguments.length; idx++) {
204-
Object argument = arguments[idx];
205-
attributes.put("log_arg_" + idx, String.valueOf(argument));
206-
}
204+
for (int idx = 0; idx < arguments.length; idx++) {
205+
Object argument = arguments[idx];
206+
attributes.put("log_arg_" + idx, String.valueOf(argument));
207+
}
207208
}
208209

209210
public static AttributeKey<String> getMdcAttributeKey(String key) {

instrumentation/logback/logback-appender-1.0/library/src/slf4j2ApiTest/java/io/opentelemetry/instrumentation/logback/appender/v1_0/Slf4j2Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ void multipleMarkers() {
117117
void arguments() {
118118
logger
119119
.atInfo()
120-
.setMessage("log message {} and {}").addArgument("'world'").addArgument(Math.PI)
120+
.setMessage("log message {} and {}")
121+
.addArgument("'world'")
122+
.addArgument(Math.PI)
121123
.log();
122124

123125
List<LogRecordData> logDataList = logRecordExporter.getFinishedLogRecordItems();
@@ -127,13 +129,11 @@ void arguments() {
127129
assertThat(logData.getResource()).isEqualTo(resource);
128130
assertThat(logData.getInstrumentationScopeInfo()).isEqualTo(instrumentationScopeInfo);
129131
assertThat(logData.getBody().asString()).isEqualTo("log message 'world' and 3.141592653589793");
130-
assertThat(logData.getAttributes().size())
131-
.isEqualTo(7);
132+
assertThat(logData.getAttributes().size()).isEqualTo(7);
132133
assertThat(logData)
133134
.hasAttributesSatisfying(
134135
equalTo(AttributeKey.stringKey("log_arg_0"), "'world'"),
135136
equalTo(AttributeKey.stringKey("log_arg_1"), "3.141592653589793"),
136-
equalTo(AttributeKey.stringKey("src_msg_"), "log message {} and {}")
137-
);
137+
equalTo(AttributeKey.stringKey("src_msg_"), "log message {} and {}"));
138138
}
139139
}

0 commit comments

Comments
 (0)