open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update agent logger prefix (#3007)

This commit is contained in:
Trask Stalnaker 2021-05-16 20:06:39 -07:00 committed by GitHub
parent c24949eea9
commit d6141dddc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/LoggingConfigurer.java
View File

@ -14,7 +14,7 @@ class LoggingConfigurer {
private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY =
"io.opentelemetry.javaagent.slf4j.simpleLogger.dateTimeFormat";
private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT =
"'[opentelemetry.auto.trace 'yyyy-MM-dd HH:mm:ss:SSS Z']'";
"'[otel.javaagent 'yyyy-MM-dd HH:mm:ss:SSS Z']'";
private static final String SIMPLE_LOGGER_DEFAULT_LOG_LEVEL_PROPERTY =
"io.opentelemetry.javaagent.slf4j.simpleLogger.defaultLogLevel";
private static final String SIMPLE_LOGGER_PREFIX =

4
javaagent/src/test/groovy/io/opentelemetry/javaagent/AgentLoadedIntoBootstrapTest.groovy
View File

@ -20,8 +20,8 @@ class AgentLoadedIntoBootstrapTest extends Specification {
, true) == 0
}
// this tests the case where someone adds the contents of opentelemetry-auto.jar by mistake to
// their application's "uber.jar"
// this tests the case where someone adds the contents of opentelemetry-javaagent.jar by mistake
// to their application's "uber.jar"
//
// the reason this can cause issues is because we locate the agent jar based on the CodeSource of
// the AgentBootstrap class, and then we add that jar file to the bootstrap class path