Skip to content

Commit

Permalink
[#9893] Merge agent log4j2 profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@intr3p1d
intr3p1d committed May 12, 2023
1 parent 0c19180 commit d9ef155
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 103 deletions.
72 changes: 60 additions & 12 deletions .../main/resources/profiles/local/log4j2.xml → agent/src/main/resources/log4j2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,44 @@
<Property name="rolling-date-format">%d{yyyy-MM-dd}</Property>

<Property name="backupsize">100m</Property>
<Property name="default-rollover-strategy-max">5</Property>
<Property name="lastmodified">7d</Property>

<!-- message_pattern -->
<Property name="line_message_pattern">%d{MM-dd HH:mm:ss.sss} [%15.15t] %-5level %-40.40logger{1.}:%-3L -- %msg{nolookups}%n</Property>
<Property name="simple_message_pattern">%d{MM-dd HH:mm:ss.sss} [%15.15t] %-5level %-40.40logger{1.} -- %msg{nolookups}%n</Property>
<Property name="console_message_pattern">${simple_message_pattern}</Property>
<Property name="file_message_pattern">${simple_message_pattern}</Property>

<Select>
<SystemPropertyArbiter propertyName="pinpoint.profiler.profiles.active" propertyValue="local">
<Property name="default-rollover-strategy-max">5</Property>
</SystemPropertyArbiter>
<SystemPropertyArbiter propertyName="pinpoint.profiler.profiles.active" propertyValue="release">
<Property name="default-rollover-strategy-max">10</Property>
</SystemPropertyArbiter>

<DefaultArbiter>
<Property name="default-rollover-strategy-max">5</Property>
</DefaultArbiter>
</Select>
</Properties>

<Appenders>
<Console name="console" target="system_out">
<PatternLayout>
<Pattern>${console_message_pattern}</Pattern>
</PatternLayout>
<Select>
<SystemPropertyArbiter propertyName="pinpoint.profiler.profiles.active" propertyValue="local">
</SystemPropertyArbiter>
<SystemPropertyArbiter propertyName="pinpoint.profiler.profiles.active" propertyValue="release">
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
</SystemPropertyArbiter>

<DefaultArbiter>
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
</DefaultArbiter>
</Select>
</Console>

<RollingFile name="rollingFile" filename="${logging_dir}/pinpoint.log"
Expand Down Expand Up @@ -61,18 +84,44 @@
<Loggers>
<Logger name="com.navercorp.pinpoint.metric" level="INFO" additivity="false">
<AppenderRef ref="statRollingFile"/>
<!-- <AppenderRef ref="console"/>-->
<!-- <AppenderRef ref="rollingFile"/>-->
</Logger>
<Logger name="com.navercorp.pinpoint" level="DEBUG" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
<Logger name="io.grpc" level="DEBUG" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
<!-- <AppenderRef ref="console"/>-->
<!-- <AppenderRef ref="rollingFile"/>-->
</Logger>


<Select>
<SystemPropertyArbiter propertyName="pinpoint.profiler.profiles.active" propertyValue="local">
<Logger name="com.navercorp.pinpoint" level="DEBUG" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
<Logger name="io.grpc" level="DEBUG" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
</SystemPropertyArbiter>
<SystemPropertyArbiter propertyName="pinpoint.profiler.profiles.active" propertyValue="release">
<Logger name="com.navercorp.pinpoint" level="INFO" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
<Logger name="io.grpc" level="INFO" additivity="false">
<AppenderRef ref="rollingFile"/>
</Logger>
</SystemPropertyArbiter>

<DefaultArbiter>
<Logger name="com.navercorp.pinpoint" level="DEBUG" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
<Logger name="io.grpc" level="DEBUG" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
</DefaultArbiter>
</Select>

<Logger name="io.grpc.Context" level="INFO" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
Expand All @@ -82,7 +131,6 @@
<AppenderRef ref="rollingFile"/>
</Logger>


<Root level="INFO">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
Expand Down
90 changes: 0 additions & 90 deletions agent/src/main/resources/profiles/release/log4j2.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...er-logging/src/main/java/com/navercorp/pinpoint/profiler/logging/Log4j2LoggingSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Log4j2LoggingSystem implements LoggingSystem {
public static final String FACTORY_PROPERTY_NAME = "log4j2.loggerContextFactory";
public static final String NOLOOKUPS = "log4j2.formatMsgNoLookups";

private static final String[] LOOKUP = {"log4j2-test.xml", "log4j2.xml", "log4j2.properties"};
private static final String[] LOOKUP = {"log4j2-test.xml", "log4j2.xml", "log4j2.properties", "../../log4j2.xml"};

private LoggerContext loggerContext;
private final Path profilePath;
Expand Down

0 comments on commit d9ef155

Please # to comment.