Skip to content

Commit c545a79

Browse files
authored
Misc logging improvements (#1828)
* Add clearer timezone in logs * Add PID to startup message * Add testing config
1 parent 8349df0 commit c545a79

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ private void configureAppSvcs() {
113113

114114
// App Services windows environments use ETW to consume internal diagnostics logging events and
115115
// to send those logging events to an internal kusto store for internal alerting and diagnostics
116-
if (DiagnosticsHelper.isOsWindows()) {
116+
//
117+
// applicationinsights.testing.etw.disabled setting is useful for local testing of app services
118+
// diagnostic logging without building the etw dll locally
119+
if (DiagnosticsHelper.isOsWindows()
120+
&& !Boolean.getBoolean("applicationinsights.testing.etw.disabled")) {
117121
rootLogger.addAppender(configureEtwAppender());
118122
}
119123

@@ -269,7 +273,7 @@ private Appender<ILoggingEvent> configureEtwAppender() {
269273
private Encoder<ILoggingEvent> createEncoder() {
270274
PatternLayoutEncoder encoder = new PatternLayoutEncoder();
271275
encoder.setContext(loggerContext);
272-
encoder.setPattern("%d{yyyy-MM-dd HH:mm:ss.SSSX} %-5level %logger{36} - %msg%n");
276+
encoder.setPattern("%d{yyyy-MM-dd HH:mm:ss.SSSXXX} %-5level %logger{36} - %msg%n");
273277
encoder.start();
274278
return encoder;
275279
}

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/MainEntryPoint.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
package com.microsoft.applicationinsights.agent.internal.init;
2323

2424
import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper;
25+
import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.PidFinder;
2526
import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.SdkVersionFinder;
2627
import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.status.StatusFile;
2728
import com.microsoft.applicationinsights.agent.internal.common.FriendlyException;
@@ -89,7 +90,10 @@ public static void start(Instrumentation instrumentation, File javaagentFile) {
8990
AiComponentInstaller.setInstrumentation(instrumentation);
9091
AgentInstaller.installBytebuddyAgent(
9192
instrumentation, ConfigOverride.getConfig(configuration), false);
92-
startupLogger.info("ApplicationInsights Java Agent {} started successfully", version);
93+
startupLogger.info(
94+
"ApplicationInsights Java Agent {} started successfully (PID {})",
95+
version,
96+
new PidFinder().getValue());
9397
success = true;
9498
LoggerFactory.getLogger(DiagnosticsHelper.DIAGNOSTICS_LOGGER_NAME)
9599
.info("Application Insights Codeless Agent {} Attach Successful", version);

0 commit comments

Comments
 (0)