diff --git a/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/collectors/GcCollectionSample.java b/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/collectors/GcCollectionSample.java index ae2e2f93878..0506d067208 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/collectors/GcCollectionSample.java +++ b/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/collectors/GcCollectionSample.java @@ -21,7 +21,7 @@ /** Implementation of a single GCCollectionEvent formed from data from an MxBean. */ class GcCollectionSample implements GcCollectionEvent { - private static final Logger LOGGER = LoggerFactory.getLogger(GcCollectionSample.class); + private static final Logger logger = LoggerFactory.getLogger(GcCollectionSample.class); private static final String ID = "id"; @@ -77,7 +77,7 @@ private static Map groupMemoryUsageByPoolName( } } } catch (RuntimeException e) { - LOGGER.error("Failed to group pool data", e); + logger.error("Failed to group pool data", e); } return Collections.unmodifiableMap(byIdentifier); } diff --git a/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/notifications/NotificationObserver.java b/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/notifications/NotificationObserver.java index 2375e0bff9e..502d15a3151 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/notifications/NotificationObserver.java +++ b/agent/agent-gc-monitor/gc-monitor-core/src/main/java/com/microsoft/gcmonitor/notifications/NotificationObserver.java @@ -18,7 +18,7 @@ * thread. */ public class NotificationObserver implements NotificationListener { - private static final Logger LOGGER = LoggerFactory.getLogger(NotificationObserver.class); + private static final Logger logger = LoggerFactory.getLogger(NotificationObserver.class); private static final int MAX_QUEUE_SIZE = 1000; private final LinkedBlockingQueue workQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE); @@ -46,7 +46,7 @@ public void handleNotification(@Nullable Notification notification, Object handb workQueue.offer(new NotificationJob((JmxGarbageCollectorStats) handback, notification)); } } catch (RuntimeException e) { - LOGGER.error("Failed to process gc notification", e); + logger.error("Failed to process gc notification", e); } } @@ -63,7 +63,7 @@ public void watchGcNotificationEvents() { sample.collector.update(sample.notification); } } catch (RuntimeException e) { - LOGGER.error("Error while reading GC notification data", e); + logger.error("Error while reading GC notification data", e); } } } catch (InterruptedException e) { diff --git a/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/AlertingSubsystem.java b/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/AlertingSubsystem.java index 2ac7add383d..f45719c797b 100644 --- a/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/AlertingSubsystem.java +++ b/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/AlertingSubsystem.java @@ -32,7 +32,7 @@ */ public class AlertingSubsystem { - private static final Logger LOGGER = LoggerFactory.getLogger(AlertingSubsystem.class); + private static final Logger logger = LoggerFactory.getLogger(AlertingSubsystem.class); // Downstream observer of alerts produced by the alerting system private final Consumer alertHandler; @@ -100,7 +100,7 @@ public void trackTelemetryDataPoint(@Nullable TelemetryDataPoint telemetryDataPo if (telemetryDataPoint == null) { return; } - LOGGER.trace( + logger.trace( "Tracking " + telemetryDataPoint.getType().name() + " " + telemetryDataPoint.getValue()); alertPipelines.process(telemetryDataPoint); } diff --git a/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/AlertPipelines.java b/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/AlertPipelines.java index 812b81f03cf..9258209a2a6 100644 --- a/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/AlertPipelines.java +++ b/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/AlertPipelines.java @@ -23,7 +23,7 @@ /** Contains analysis pipelines for all metric types. */ public class AlertPipelines { - private static final Logger LOGGER = LoggerFactory.getLogger(AlertPipelines.class); + private static final Logger logger = LoggerFactory.getLogger(AlertPipelines.class); // List of alert analysis pipelines for each metric type, entrypoint // for the pipeline is a rolling average @@ -59,7 +59,7 @@ public void updateAlertConfig(AlertConfiguration newAlertConfig, TimeSource time pipeline.updateConfig(newAlertConfig); } - LOGGER.debug( + logger.debug( "Set alert configuration for {}: {}", newAlertConfig.getType(), newAlertConfig.toString()); } @@ -86,7 +86,7 @@ public void updateRequestAlertConfig( alertPipelines.put(AlertMetricType.REQUEST, new AlertPipelineMultiplexer(requestPipelines)); - LOGGER.debug( + logger.debug( "Set alert configuration for {}: {} pipelines updated", AlertMetricType.REQUEST, newAlertConfig.size()); diff --git a/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/SingleAlertPipeline.java b/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/SingleAlertPipeline.java index f23576e032a..711754d9bb7 100644 --- a/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/SingleAlertPipeline.java +++ b/agent/agent-profiler/agent-alerting/src/main/java/com/microsoft/applicationinsights/alerting/analysis/pipelines/SingleAlertPipeline.java @@ -21,7 +21,7 @@ /** Contains a pipeline that receives telemetry, feeds it into the analysis pipeline. */ public class SingleAlertPipeline implements AlertPipeline, AlertPipelineMXBean { - private static final Logger LOGGER = LoggerFactory.getLogger(SingleAlertPipeline.class); + private static final Logger logger = LoggerFactory.getLogger(SingleAlertPipeline.class); private static final String JMX_KEY = "com.microsoft:type=AI-alert,name="; private final Aggregation aggregation; @@ -71,7 +71,7 @@ private void registerMbean() { ManagementFactory.getPlatformMBeanServer().registerMBean(this, objectName); } catch (Exception e) { - LOGGER.error("Failed to register MBEAN", e); + logger.error("Failed to register MBEAN", e); } } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/appinsights/CodeOptimizerDiagnosticEngineJfr.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/appinsights/CodeOptimizerDiagnosticEngineJfr.java index d3fd13487a1..8334272398a 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/appinsights/CodeOptimizerDiagnosticEngineJfr.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/appinsights/CodeOptimizerDiagnosticEngineJfr.java @@ -27,7 +27,7 @@ * coordinate emitting diagnostics on a breach. */ public class CodeOptimizerDiagnosticEngineJfr implements DiagnosticEngine { - private static final Logger LOGGER = + private static final Logger logger = LoggerFactory.getLogger(CodeOptimizerDiagnosticEngineJfr.class); public static final int SEMAPHORE_TIMEOUT_IN_SEC = 10; public static final long TIME_BEFORE_END_OF_PROFILE_TO_EMIT_EVENT = 10L; @@ -42,25 +42,25 @@ public CodeOptimizerDiagnosticEngineJfr(ScheduledExecutorService executorService @Override public void init(int thisPid) { if (!CodeOptimizerDiagnosticsJfrInit.isOsSupported()) { - LOGGER.warn("Code Optimizer diagnostics is not supported on this operating system"); + logger.warn("Code Optimizer diagnostics is not supported on this operating system"); return; } this.thisPid = thisPid; - LOGGER.debug("Initialising Code Optimizer Diagnostic Engine"); + logger.debug("Initialising Code Optimizer Diagnostic Engine"); CodeOptimizerDiagnosticsJfrInit.initFeature(thisPid); - LOGGER.debug("Code Optimizer Diagnostic Engine Initialised"); + logger.debug("Code Optimizer Diagnostic Engine Initialised"); } private static void startDiagnosticCycle(int thisPid) { - LOGGER.debug("Starting Code Optimizer Diagnostic Cycle"); + logger.debug("Starting Code Optimizer Diagnostic Cycle"); CodeOptimizerDiagnosticsJfrInit.initFeature(thisPid); CodeOptimizerDiagnosticsJfrInit.start(thisPid); } private static void endDiagnosticCycle() { - LOGGER.debug("Ending Code Optimizer Diagnostic Cycle"); + logger.debug("Ending Code Optimizer Diagnostic Cycle"); CodeOptimizerDiagnosticsJfrInit.stop(); } @@ -106,10 +106,10 @@ private void scheduleShutdown( // We do not return a result atm diagnosisResultCompletableFuture.complete(null); - LOGGER.debug("Shutting down diagnostic cycle"); + logger.debug("Shutting down diagnostic cycle"); endDiagnosticCycle(); } catch (RuntimeException e) { - LOGGER.error("Failed to shutdown cleanly", e); + logger.error("Failed to shutdown cleanly", e); } finally { semaphore.release(); } @@ -125,7 +125,7 @@ private void scheduleEmittingAlertBreachEvent(AlertBreach alert, long end) { try { emitInfo(alert); } catch (RuntimeException e) { - LOGGER.error("Failed to emit breach", e); + logger.error("Failed to emit breach", e); } }, end / 2, @@ -133,7 +133,7 @@ private void scheduleEmittingAlertBreachEvent(AlertBreach alert, long end) { } private static void emitInfo(AlertBreach alert) { - LOGGER.debug("Emitting Code Optimizer Diagnostic Event"); + logger.debug("Emitting Code Optimizer Diagnostic Event"); emitAlertBreachJfrEvent(alert); CodeOptimizerDiagnosticsJfrInit.emitCGroupData(); emitMachineStats(); @@ -150,9 +150,9 @@ private static void emitAlertBreachJfrEvent(AlertBreach alert) { alert.toJson(writer).flush(); AlertBreachJfrEvent event = new AlertBreachJfrEvent().setAlertBreach(stringWriter.toString()); event.commit(); - LOGGER.debug("Emitted Code Optimizer Diagnostic Event"); + logger.debug("Emitted Code Optimizer Diagnostic Event"); } catch (IOException e) { - LOGGER.error("Failed to create breach JFR event", e); + logger.error("Failed to create breach JFR event", e); } } } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/calibration/CalibratorDefault.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/calibration/CalibratorDefault.java index 7a79ed3ec65..7045adb6edc 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/calibration/CalibratorDefault.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/calibration/CalibratorDefault.java @@ -15,7 +15,7 @@ public class CalibratorDefault implements Calibrator { - private static final Logger LOGGER = LoggerFactory.getLogger(ContextSwitchingRunner.class); + private static final Logger logger = LoggerFactory.getLogger(ContextSwitchingRunner.class); private final ContextSwitchingRunner contextSwitching; private final KernelMonitorDeviceDriver kernel; @@ -69,7 +69,7 @@ public Calibration calibrate() { double contextSwitchingRate = safeDiv(maxContextSwitches, timeDiagnosticsHadAvailable); return new Calibration(contextSwitchingRate); } catch (Throwable e) { - LOGGER.debug("Completing exceptionally", e); + logger.debug("Completing exceptionally", e); } return new Calibration(Calibration.UNKNOWN); } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/OperatingSystemDetector.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/OperatingSystemDetector.java index 112d1542382..6107a4326d8 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/OperatingSystemDetector.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/OperatingSystemDetector.java @@ -11,7 +11,7 @@ /** Util to identify the host operating system */ public class OperatingSystemDetector { - private static final Logger LOGGER = LoggerFactory.getLogger(OperatingSystemDetector.class); + private static final Logger logger = LoggerFactory.getLogger(OperatingSystemDetector.class); private static final String OS_NAME_PROPERTY = "os.name"; private static final String MAC = "mac"; @@ -25,7 +25,7 @@ public class OperatingSystemDetector { OperatingSystem detectedOs = OperatingSystem.UNKNOWN; try { String operatingSystemString = System.getProperty(OS_NAME_PROPERTY).toLowerCase(Locale.ROOT); - LOGGER.debug("Detected OS " + operatingSystemString); + logger.debug("Detected OS " + operatingSystemString); if (operatingSystemString.contains(MAC)) { detectedOs = OperatingSystem.MAC_OS; } else if (operatingSystemString.contains(LINUX)) { @@ -38,7 +38,7 @@ public class OperatingSystemDetector { detectedOs = OperatingSystem.UNKNOWN; } } catch (RuntimeException e) { - LOGGER.warn("Failed to detect operating system", e); + logger.warn("Failed to detect operating system", e); } operatingSystem = detectedOs; } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessCpuStats.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessCpuStats.java index 5dd916411f5..3ff976a4c9a 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessCpuStats.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessCpuStats.java @@ -20,7 +20,7 @@ public class LinuxProcessCpuStats extends TwoStepProcReader implements ProcessCp private static final int VM_SIZE_OFFSET_FROM_NAME = 21; private static final int RSS_OFFSET_FROM_NAME = 22; private static final int N_SWAPPED_OFFSET_FROM_NAME = 34; - private static final Logger LOGGER = LoggerFactory.getLogger(LinuxProcessCpuStats.class); + private static final Logger logger = LoggerFactory.getLogger(LinuxProcessCpuStats.class); private final BigIncrementalCounter userTime; private final BigIncrementalCounter systemTime; @@ -72,7 +72,7 @@ private static void setValue(BigIncrementalCounter userTime, String userTime1) { try { userTime.newValue(new BigInteger(userTime1)); } catch (NumberFormatException e) { - LOGGER.trace("Failed to parse {}", userTime1); + logger.trace("Failed to parse {}", userTime1); } } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessDumper.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessDumper.java index 4b4e4036be1..c9a930df9a4 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessDumper.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessDumper.java @@ -19,7 +19,7 @@ /** Detects running processes on the host. */ public class LinuxProcessDumper implements ProcessDumper, Closeable { - private static final Logger LOGGER = LoggerFactory.getLogger(LinuxProcessDumper.class); + private static final Logger logger = LoggerFactory.getLogger(LinuxProcessDumper.class); private final boolean isDaemon; private Map usage = new HashMap<>(); @@ -76,7 +76,7 @@ public void closeProcesses(List exclusions) { try { removed.close(); } catch (IOException e) { - LOGGER.error("Failed to close process", e); + logger.error("Failed to close process", e); } }); } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessIoStats.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessIoStats.java index c18d70bc607..e7e6e0c8b24 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessIoStats.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/LinuxProcessIoStats.java @@ -14,7 +14,7 @@ /** Obtains per-process IO statistics. */ public class LinuxProcessIoStats extends TwoStepProcReader implements ProcessIoStats { - private static final Logger LOGGER = LoggerFactory.getLogger(LinuxProcessIoStats.class); + private static final Logger logger = LoggerFactory.getLogger(LinuxProcessIoStats.class); private static final Pattern IO_READ_PATTERN = Pattern.compile("^rchar: (\\d+)$", Pattern.MULTILINE); @@ -54,7 +54,7 @@ private static boolean findBigIntegerValue( try { counter.newValue(new BigInteger(matcher.group(1))); } catch (NumberFormatException e) { - LOGGER.trace("Failed to parse {}", matcher.group(1)); + logger.trace("Failed to parse {}", matcher.group(1)); } return true; } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/TwoStepProcReader.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/TwoStepProcReader.java index 9d66fcb15e5..5a05a0a9dff 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/TwoStepProcReader.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/collection/libos/os/linux/TwoStepProcReader.java @@ -14,7 +14,7 @@ public abstract class TwoStepProcReader implements TwoStepUpdatable, Closeable { - private static final Logger LOGGER = LoggerFactory.getLogger(TwoStepProcReader.class); + private static final Logger logger = LoggerFactory.getLogger(TwoStepProcReader.class); protected RandomAccessFile file; protected String contents; @@ -33,7 +33,7 @@ public TwoStepProcReader(File candidate, boolean supressError) { file = new RandomAccessFile(candidate, "r"); } catch (FileNotFoundException e) { if (!supressError) { - LOGGER.error("Failed to open proc net file", e); + logger.error("Failed to open proc net file", e); } } } @@ -54,7 +54,7 @@ public void poll() { contents = Proc.read(file); } } catch (IOException e) { - LOGGER.error("Failed to read stats for file", e); + logger.error("Failed to read stats for file", e); } } diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/CodeOptimizerDiagnosticsJfrInit.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/CodeOptimizerDiagnosticsJfrInit.java index c24a3728bfc..1646755c552 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/CodeOptimizerDiagnosticsJfrInit.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/CodeOptimizerDiagnosticsJfrInit.java @@ -20,7 +20,7 @@ @SuppressWarnings("Java8ApiChecker") public class CodeOptimizerDiagnosticsJfrInit { - private static final Logger LOGGER = + private static final Logger logger = LoggerFactory.getLogger(CodeOptimizerDiagnosticsJfrInit.class); private static final AtomicBoolean running = new AtomicBoolean(false); private static final AtomicInteger exceptionLogCount = new AtomicInteger(0); @@ -56,9 +56,9 @@ private static Runnable emitTelemetry(SystemStatsReader statsReader) { private static void logFailure(String logLine, @Nullable Exception e, AtomicInteger count) { if ((count.get() % 100) == 0) { if (e != null) { - LOGGER.warn(logLine, e); + logger.warn(logLine, e); } else { - LOGGER.warn(logLine); + logger.warn(logLine); } count.set(0); @@ -76,7 +76,7 @@ public static void emitCGroupData() { cgroupData.commit(); } } catch (RuntimeException e) { - LOGGER.warn("Reading Cgroup Data Failed", e); + logger.warn("Reading Cgroup Data Failed", e); } } @@ -107,7 +107,7 @@ public static void start(int thisPidSupplier) { try { statsReader.close(); } catch (IOException e) { - LOGGER.error("Failed to init stats reader", e); + logger.error("Failed to init stats reader", e); } } FlightRecorder.addPeriodicEvent(CGroupData.class, readCGroupData); diff --git a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/SystemStatsProvider.java b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/SystemStatsProvider.java index 38a361a617a..4fdd942cb14 100644 --- a/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/SystemStatsProvider.java +++ b/agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/jfr/SystemStatsProvider.java @@ -45,7 +45,7 @@ */ @SuppressWarnings("Java8ApiChecker") public class SystemStatsProvider { - private static final Logger LOGGER = LoggerFactory.getLogger(SystemStatsProvider.class); + private static final Logger logger = LoggerFactory.getLogger(SystemStatsProvider.class); private static final AtomicBoolean initialised = new AtomicBoolean(false); @@ -67,7 +67,7 @@ public static void init(int thisPid) { // Close until needed close(); } catch (RuntimeException e) { - LOGGER.error("Failed to initialise Code Optimizer", e); + logger.error("Failed to initialise Code Optimizer", e); } } } @@ -95,7 +95,7 @@ private static T getSingleton(Class clazz, Supplier supplier) { try { ((Closeable) instance).close(); } catch (IOException e) { - LOGGER.error("Failed to close", e); + logger.error("Failed to close", e); } } } @@ -120,7 +120,7 @@ public static CGroupData getCGroupData() { .setCpuPeriod(reader.getCpuPeriod()); } catch (RuntimeException | OperatingSystemInteractionException e) { - LOGGER.warn("No CGroup data present"); + logger.warn("No CGroup data present"); return null; } }); @@ -227,7 +227,7 @@ private static SystemStatsReader buildSystemStatsReader() { ssr.readTelemetry(); ssr.readTelemetry(); } catch (OperatingSystemInteractionException | SystemStatsReader.ReaderClosedException e) { - LOGGER.warn("Failed to read telemetry", e); + logger.warn("Failed to read telemetry", e); } return ssr; } @@ -262,7 +262,7 @@ public static void close() { try { ((Closeable) instance).close(); } catch (IOException e) { - LOGGER.error("Failed to close reader", e); + logger.error("Failed to close reader", e); } singletons.get(clazz).set(null); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/SnippetConfiguration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/SnippetConfiguration.java index 959db2f7329..d18db96c86e 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/SnippetConfiguration.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/SnippetConfiguration.java @@ -16,7 +16,7 @@ // preview Configuration public class SnippetConfiguration { private static final String snippet = readSnippet(); - private static final Logger LOGGER = LoggerFactory.getLogger(SnippetConfiguration.class); + private static final Logger logger = LoggerFactory.getLogger(SnippetConfiguration.class); // visible for testing static String readSnippet() { @@ -24,14 +24,14 @@ static String readSnippet() { String resourceName = "browser-sdk-loader-snippet.txt"; InputStream inputStream = classLoader.getResourceAsStream(resourceName); if (inputStream == null) { - LOGGER.error("Resource not found: " + resourceName); + logger.error("Resource not found: " + resourceName); return ""; } try { return toString(inputStream); } catch (IOException e) { // Handle any IO exceptions that occur - LOGGER.error("Failed to read javascript-snippet file", e); + logger.error("Failed to read javascript-snippet file", e); } return ""; } diff --git a/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java b/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java index a47539446a4..54b9c1c699b 100644 --- a/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java +++ b/agent/agent/src/devtest/java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/etw/DiagnosticsLoggerProxy.java @@ -11,311 +11,311 @@ public class DiagnosticsLoggerProxy implements Logger { // Hardcoded to avoid dependency: // com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper.DIAGNOSTICS_LOGGER_NAME - private static final Logger LOGGER = + private static final Logger logger = LoggerFactory.getLogger("applicationinsights.extension.diagnostics"); @Override public String getName() { - return LOGGER.getName(); + return logger.getName(); } @Override public boolean isTraceEnabled() { - return LOGGER.isTraceEnabled(); + return logger.isTraceEnabled(); } @Override public void trace(String msg) { - LOGGER.trace(msg); + logger.trace(msg); } @Override public void trace(String format, Object arg) { - LOGGER.trace(format, arg); + logger.trace(format, arg); } @Override public void trace(String format, Object arg1, Object arg2) { - LOGGER.trace(format, arg1, arg2); + logger.trace(format, arg1, arg2); } @Override public void trace(String format, Object... arguments) { - LOGGER.trace(format, arguments); + logger.trace(format, arguments); } @Override public void trace(String msg, Throwable t) { - LOGGER.trace(msg, t); + logger.trace(msg, t); } @Override public boolean isTraceEnabled(Marker marker) { - return LOGGER.isTraceEnabled(marker); + return logger.isTraceEnabled(marker); } @Override public void trace(Marker marker, String msg) { - LOGGER.trace(marker, msg); + logger.trace(marker, msg); } @Override public void trace(Marker marker, String format, Object arg) { - LOGGER.trace(marker, format, arg); + logger.trace(marker, format, arg); } @Override public void trace(Marker marker, String format, Object arg1, Object arg2) { - LOGGER.trace(marker, format, arg1, arg2); + logger.trace(marker, format, arg1, arg2); } @Override public void trace(Marker marker, String format, Object... argArray) { - LOGGER.trace(marker, format, argArray); + logger.trace(marker, format, argArray); } @Override public void trace(Marker marker, String msg, Throwable t) { - LOGGER.trace(marker, msg, t); + logger.trace(marker, msg, t); } @Override public boolean isDebugEnabled() { - return LOGGER.isDebugEnabled(); + return logger.isDebugEnabled(); } @Override public void debug(String msg) { - LOGGER.debug(msg); + logger.debug(msg); } @Override public void debug(String format, Object arg) { - LOGGER.debug(format, arg); + logger.debug(format, arg); } @Override public void debug(String format, Object arg1, Object arg2) { - LOGGER.debug(format, arg1, arg2); + logger.debug(format, arg1, arg2); } @Override public void debug(String format, Object... arguments) { - LOGGER.debug(format, arguments); + logger.debug(format, arguments); } @Override public void debug(String msg, Throwable t) { - LOGGER.debug(msg, t); + logger.debug(msg, t); } @Override public boolean isDebugEnabled(Marker marker) { - return LOGGER.isDebugEnabled(marker); + return logger.isDebugEnabled(marker); } @Override public void debug(Marker marker, String msg) { - LOGGER.debug(marker, msg); + logger.debug(marker, msg); } @Override public void debug(Marker marker, String format, Object arg) { - LOGGER.debug(marker, format, arg); + logger.debug(marker, format, arg); } @Override public void debug(Marker marker, String format, Object arg1, Object arg2) { - LOGGER.debug(marker, format, arg1, arg2); + logger.debug(marker, format, arg1, arg2); } @Override public void debug(Marker marker, String format, Object... arguments) { - LOGGER.debug(marker, format, arguments); + logger.debug(marker, format, arguments); } @Override public void debug(Marker marker, String msg, Throwable t) { - LOGGER.debug(marker, msg, t); + logger.debug(marker, msg, t); } @Override public boolean isInfoEnabled() { - return LOGGER.isInfoEnabled(); + return logger.isInfoEnabled(); } @Override public void info(String msg) { - LOGGER.info(msg); + logger.info(msg); } @Override public void info(String format, Object arg) { - LOGGER.info(format, arg); + logger.info(format, arg); } @Override public void info(String format, Object arg1, Object arg2) { - LOGGER.info(format, arg1, arg2); + logger.info(format, arg1, arg2); } @Override public void info(String format, Object... arguments) { - LOGGER.info(format, arguments); + logger.info(format, arguments); } @Override public void info(String msg, Throwable t) { - LOGGER.info(msg, t); + logger.info(msg, t); } @Override public boolean isInfoEnabled(Marker marker) { - return LOGGER.isInfoEnabled(marker); + return logger.isInfoEnabled(marker); } @Override public void info(Marker marker, String msg) { - LOGGER.info(marker, msg); + logger.info(marker, msg); } @Override public void info(Marker marker, String format, Object arg) { - LOGGER.info(marker, format, arg); + logger.info(marker, format, arg); } @Override public void info(Marker marker, String format, Object arg1, Object arg2) { - LOGGER.info(marker, format, arg1, arg2); + logger.info(marker, format, arg1, arg2); } @Override public void info(Marker marker, String format, Object... arguments) { - LOGGER.info(marker, format, arguments); + logger.info(marker, format, arguments); } @Override public void info(Marker marker, String msg, Throwable t) { - LOGGER.info(marker, msg, t); + logger.info(marker, msg, t); } @Override public boolean isWarnEnabled() { - return LOGGER.isWarnEnabled(); + return logger.isWarnEnabled(); } @Override public void warn(String msg) { - LOGGER.warn(msg); + logger.warn(msg); } @Override public void warn(String format, Object arg) { - LOGGER.warn(format, arg); + logger.warn(format, arg); } @Override public void warn(String format, Object... arguments) { - LOGGER.warn(format, arguments); + logger.warn(format, arguments); } @Override public void warn(String format, Object arg1, Object arg2) { - LOGGER.warn(format, arg1, arg2); + logger.warn(format, arg1, arg2); } @Override public void warn(String msg, Throwable t) { - LOGGER.warn(msg, t); + logger.warn(msg, t); } @Override public boolean isWarnEnabled(Marker marker) { - return LOGGER.isWarnEnabled(marker); + return logger.isWarnEnabled(marker); } @Override public void warn(Marker marker, String msg) { - LOGGER.warn(marker, msg); + logger.warn(marker, msg); } @Override public void warn(Marker marker, String format, Object arg) { - LOGGER.warn(marker, format, arg); + logger.warn(marker, format, arg); } @Override public void warn(Marker marker, String format, Object arg1, Object arg2) { - LOGGER.warn(marker, format, arg1, arg2); + logger.warn(marker, format, arg1, arg2); } @Override public void warn(Marker marker, String format, Object... arguments) { - LOGGER.warn(marker, format, arguments); + logger.warn(marker, format, arguments); } @Override public void warn(Marker marker, String msg, Throwable t) { - LOGGER.warn(marker, msg, t); + logger.warn(marker, msg, t); } @Override public boolean isErrorEnabled() { - return LOGGER.isErrorEnabled(); + return logger.isErrorEnabled(); } @Override public void error(String msg) { - LOGGER.error(msg); + logger.error(msg); } @Override public void error(String format, Object arg) { - LOGGER.error(format, arg); + logger.error(format, arg); } @Override public void error(String format, Object arg1, Object arg2) { - LOGGER.error(format, arg1, arg2); + logger.error(format, arg1, arg2); } @Override public void error(String format, Object... arguments) { - LOGGER.error(format, arguments); + logger.error(format, arguments); } @Override public void error(String msg, Throwable t) { - LOGGER.error(msg, t); + logger.error(msg, t); } @Override public boolean isErrorEnabled(Marker marker) { - return LOGGER.isErrorEnabled(marker); + return logger.isErrorEnabled(marker); } @Override public void error(Marker marker, String msg) { - LOGGER.error(marker, msg); + logger.error(marker, msg); } @Override public void error(Marker marker, String format, Object arg) { - LOGGER.error(marker, format, arg); + logger.error(marker, format, arg); } @Override public void error(Marker marker, String format, Object arg1, Object arg2) { - LOGGER.error(marker, format, arg1, arg2); + logger.error(marker, format, arg1, arg2); } @Override public void error(Marker marker, String format, Object... arguments) { - LOGGER.error(marker, format, arguments); + logger.error(marker, format, arguments); } @Override public void error(Marker marker, String msg, Throwable t) { - LOGGER.error(marker, msg, t); + logger.error(marker, msg, t); } } diff --git a/buildscripts/checkstyle.xml b/buildscripts/checkstyle.xml index 4921e53e767..7cb3b384c2c 100644 --- a/buildscripts/checkstyle.xml +++ b/buildscripts/checkstyle.xml @@ -50,6 +50,18 @@ --> + + + + + + + + @@ -77,30 +89,8 @@ - - - - - - - - - - - - - + @@ -190,6 +180,11 @@ + + + + - + @@ -259,6 +254,7 @@ --> + - - + - + + + + + + + + + + + - + + diff --git a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java index 5556df72f97..3f85a5e0365 100644 --- a/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java +++ b/etw/java/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/DllFileUtils.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; class DllFileUtils { - private static final Logger LOGGER = LoggerFactory.getLogger(DllFileUtils.class); + private static final Logger logger = LoggerFactory.getLogger(DllFileUtils.class); private DllFileUtils() {} @@ -52,7 +52,7 @@ public static File buildDllLocalPath(@Nullable String versionDirectory) { if (!dllPath.exists() || !dllPath.canRead() || !dllPath.canWrite()) { throw new IllegalStateException("Failed to create a read/write folder for the native dll."); } - LOGGER.trace("{} folder exists", dllPath); + logger.trace("{} folder exists", dllPath); return dllPath; } @@ -87,7 +87,7 @@ public static void extractToLocalFolder(File dllOnDisk, String libraryToLoad) th } } } - LOGGER.debug("Successfully extracted '{}' to local folder", libraryToLoad); + logger.debug("Successfully extracted '{}' to local folder", libraryToLoad); } private static final List CANDIDATE_USERNAME_ENVIRONMENT_VARIABLES = diff --git a/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java b/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java index d3d311b27c4..da53b96873d 100644 --- a/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java +++ b/etw/java/src/main/jni/com/microsoft/applicationinsights/agent/internal/diagnostics/etw/EtwProvider.java @@ -14,7 +14,7 @@ public class EtwProvider { private static final String LIB_FILENAME_64_BIT = "applicationinsights-java-etw-provider-x86-64.dll"; - private static final Logger LOGGER = LoggerFactory.getLogger(EtwProvider.class); + private static final Logger logger = LoggerFactory.getLogger(EtwProvider.class); public EtwProvider(String sdkVersion) { String osname = System.getProperty("os.name"); @@ -22,10 +22,10 @@ public EtwProvider(String sdkVersion) { File dllPath = null; try { dllPath = loadLibrary(sdkVersion); - LOGGER.debug("EtwProvider initialized. Lib path={}", dllPath.getAbsolutePath()); + logger.debug("EtwProvider initialized. Lib path={}", dllPath.getAbsolutePath()); } catch (Throwable t) { try { - LOGGER.debug("Error initializing EtwProvider", t); + logger.debug("Error initializing EtwProvider", t); if (dllPath != null) { dllPath.deleteOnExit(); }