Merge pull request #858 from newrelic/refactor-log-level

Refactor log.level attribute to level
newrelic · May 19, 2022 · bbd4210 · bbd4210
2 parents 103d81c + 18f72b3
commit bbd4210
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...mentation/apache-log4j-1/src/main/java/com/nr/agent/instrumentation/log4j1/AgentUtil.java b/...mentation/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/...mentation/apache-log4j-2/src/main/java/com/nr/agent/instrumentation/log4j2/AgentUtil.java b/...mentation/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
@@ -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/...ck-classic-1.2/src/main/java/com/nr/agent/instrumentation/logbackclassic12/AgentUtil.java b/...ck-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);