From 18f72b3fd85538750fba64fbd923f48e369cb3f0 Mon Sep 17 00:00:00 2001 From: jasonjkeller Date: Thu, 19 May 2022 14:28:34 -0700 Subject: [PATCH] Refactor log.level attribute to level --- .../java/com/nr/agent/instrumentation/log4j1/AgentUtil.java | 2 +- .../java/com/nr/agent/instrumentation/log4j2/AgentUtil.java | 6 +++--- .../src/main/java/com/nr/instrumentation/jul/AgentUtil.java | 2 +- .../agent/instrumentation/logbackclassic12/AgentUtil.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instrumentation/apache-log4j-1/src/main/java/com/nr/agent/instrumentation/log4j1/AgentUtil.java b/instrumentation/apache-log4j-1/src/main/java/com/nr/agent/instrumentation/log4j1/AgentUtil.java index 930758209b..7e0ebcd48b 100644 --- a/instrumentation/apache-log4j-1/src/main/java/com/nr/agent/instrumentation/log4j1/AgentUtil.java +++ b/instrumentation/apache-log4j-1/src/main/java/com/nr/agent/instrumentation/log4j1/AgentUtil.java @@ -20,7 +20,7 @@ public class AgentUtil { // Log message attributes public static final String MESSAGE = "message"; public static final String TIMESTAMP = "timestamp"; - public static final String LOG_LEVEL = "log.level"; + public static final String LEVEL = "level"; public static final String UNKNOWN = "UNKNOWN"; // Linking metadata attributes used in blob private static final String BLOB_PREFIX = "NR-LINKING"; diff --git a/instrumentation/apache-log4j-2/src/main/java/com/nr/agent/instrumentation/log4j2/AgentUtil.java b/instrumentation/apache-log4j-2/src/main/java/com/nr/agent/instrumentation/log4j2/AgentUtil.java index 0fafa310c1..72c244a1da 100644 --- a/instrumentation/apache-log4j-2/src/main/java/com/nr/agent/instrumentation/log4j2/AgentUtil.java +++ b/instrumentation/apache-log4j-2/src/main/java/com/nr/agent/instrumentation/log4j2/AgentUtil.java @@ -24,7 +24,7 @@ public class AgentUtil { // Log message attributes public static final String MESSAGE = "message"; public static final String TIMESTAMP = "timestamp"; - public static final String LOG_LEVEL = "log.level"; + public static final String LEVEL = "level"; public static final String UNKNOWN = "UNKNOWN"; // Linking metadata attributes used in blob private static final String BLOB_PREFIX = "NR-LINKING"; @@ -61,9 +61,9 @@ public static void recordNewRelicLogEvent(LogEvent event) { if (level != null) { String levelName = level.name(); if (levelName.isEmpty()) { - logEventMap.put(LOG_LEVEL, UNKNOWN); + logEventMap.put(LEVEL, UNKNOWN); } else { - logEventMap.put(LOG_LEVEL, levelName); + logEventMap.put(LEVEL, levelName); } } diff --git a/instrumentation/java.logging-jdk8/src/main/java/com/nr/instrumentation/jul/AgentUtil.java b/instrumentation/java.logging-jdk8/src/main/java/com/nr/instrumentation/jul/AgentUtil.java index 24e0e34c42..ff03df5b5a 100644 --- a/instrumentation/java.logging-jdk8/src/main/java/com/nr/instrumentation/jul/AgentUtil.java +++ b/instrumentation/java.logging-jdk8/src/main/java/com/nr/instrumentation/jul/AgentUtil.java @@ -20,7 +20,7 @@ public class AgentUtil { // Log message attributes public static final String MESSAGE = "message"; public static final String TIMESTAMP = "timestamp"; - public static final String LOG_LEVEL = "log.level"; + public static final String LEVEL = "level"; public static final String UNKNOWN = "UNKNOWN"; // Linking metadata attributes used in blob private static final String BLOB_PREFIX = "NR-LINKING"; diff --git a/instrumentation/logback-classic-1.2/src/main/java/com/nr/agent/instrumentation/logbackclassic12/AgentUtil.java b/instrumentation/logback-classic-1.2/src/main/java/com/nr/agent/instrumentation/logbackclassic12/AgentUtil.java index bdb4f3fd3d..67c7faddbf 100644 --- a/instrumentation/logback-classic-1.2/src/main/java/com/nr/agent/instrumentation/logbackclassic12/AgentUtil.java +++ b/instrumentation/logback-classic-1.2/src/main/java/com/nr/agent/instrumentation/logbackclassic12/AgentUtil.java @@ -22,7 +22,7 @@ public class AgentUtil { // Log message attributes public static final String MESSAGE = "message"; public static final String TIMESTAMP = "timestamp"; - public static final String LOG_LEVEL = "log.level"; + public static final String LEVEL = "level"; public static final String UNKNOWN = "UNKNOWN"; // Linking metadata attributes used in blob private static final String BLOB_PREFIX = "NR-LINKING"; @@ -53,9 +53,9 @@ public static void recordNewRelicLogEvent(String message, long timeStampMillis, logEventMap.put(TIMESTAMP, timeStampMillis); if (level.toString().isEmpty()) { - logEventMap.put(LOG_LEVEL, UNKNOWN); + logEventMap.put(LEVEL, UNKNOWN); } else { - logEventMap.put(LOG_LEVEL, level); + logEventMap.put(LEVEL, level); } AgentBridge.getAgent().getLogSender().recordLogEvent(logEventMap);