Rename apache-log4j-2 module to apache-log4j-2.11

newrelic · Oct 31, 2023 · 02f5527 · 02f5527
1 parent 2ea3563
commit 02f5527
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 22 deletions.
diff --git a/instrumentation/apache-log4j-2.11/build.gradle b/instrumentation/apache-log4j-2.11/build.gradle
@@ -0,0 +1,23 @@
+jar {
+    manifest {
+        attributes 'Implementation-Title': 'com.newrelic.instrumentation.apache-log4j-2.11',
+                // The module was renamed to its current name from the name below. The alias exists so the instrumentation
+                // is still excluded/included for customers who have the old name in their configuration.
+                'Implementation-Title-Alias': 'com.newrelic.instrumentation.apache-log4j-2'
+    }
+}
+
+dependencies {
+    implementation(project(":agent-bridge"))
+    implementation("org.apache.logging.log4j:log4j-core:2.20.0")
+}
+
+verifyInstrumentation {
+    passesOnly("org.apache.logging.log4j:log4j-core:[2.11.0,)")
+    excludeRegex '.*(alpha|beta|rc).*'
+}
+
+site {
+    title 'Log4j2'
+    type 'Framework'
+}
diff --git a/...ent/instrumentation/log4j2/AgentUtil.java → ...ent/instrumentation/log4j2/AgentUtil.java b/...ent/instrumentation/log4j2/AgentUtil.java → ...ent/instrumentation/log4j2/AgentUtil.java
@@ -47,7 +47,7 @@ public static void recordNewRelicLogEvent(LogEvent event) {
             if (shouldCreateLogEvent(message, throwable)) {
                 ReadOnlyStringMap contextData = event.getContextData();
                 Map<LogAttributeKey, Object> logEventMap = new HashMap<>(calculateInitialMapSize(contextData));
-                logEventMap.put(INSTRUMENTATION, "apache-log4j-2");
+                logEventMap.put(INSTRUMENTATION, "apache-log4j-2.11");
                 if (message != null) {
                     String formattedMessage = message.getFormattedMessage();
                     if (formattedMessage != null && !formattedMessage.isEmpty()) {

diff --git a/...instrumentation/log4j2/ExceptionUtil.java → ...instrumentation/log4j2/ExceptionUtil.java b/...instrumentation/log4j2/ExceptionUtil.java → ...instrumentation/log4j2/ExceptionUtil.java
diff --git a/.../log4j/core/LogEvent_Instrumentation.java → .../log4j/core/LogEvent_Instrumentation.java b/.../log4j/core/LogEvent_Instrumentation.java → .../log4j/core/LogEvent_Instrumentation.java
diff --git a/.../config/LoggerConfig_Instrumentation.java → .../config/LoggerConfig_Instrumentation.java b/.../config/LoggerConfig_Instrumentation.java → .../config/LoggerConfig_Instrumentation.java
@@ -31,7 +31,7 @@ public class LoggerConfig_Instrumentation {
     public LoggerConfig_Instrumentation() {
         // Generate the instrumentation module supportability metric only once
         if (!instrumented.getAndSet(true)) {
-            NewRelic.incrementCounter("Supportability/Logging/Java/Log4j2/enabled");
+            NewRelic.incrementCounter("Supportability/Logging/Java/Log4j2.11/enabled");
         }
     }
 

diff --git a/...bstractJacksonLayout_Instrumentation.java → ...bstractJacksonLayout_Instrumentation.java b/...bstractJacksonLayout_Instrumentation.java → ...bstractJacksonLayout_Instrumentation.java
diff --git a/...StringBuilderEncoder_Instrumentation.java → ...StringBuilderEncoder_Instrumentation.java b/...StringBuilderEncoder_Instrumentation.java → ...StringBuilderEncoder_Instrumentation.java
diff --git a/...strumentation/log4j2/ContextDataTest.java → ...strumentation/log4j2/ContextDataTest.java b/...strumentation/log4j2/ContextDataTest.java → ...strumentation/log4j2/ContextDataTest.java
diff --git a/...rumentation/log4j2/ExceptionUtilTest.java → ...rumentation/log4j2/ExceptionUtilTest.java b/...rumentation/log4j2/ExceptionUtilTest.java → ...rumentation/log4j2/ExceptionUtilTest.java
diff --git a/...4j2/LoggerConfig_InstrumentationTest.java → ...4j2/LoggerConfig_InstrumentationTest.java b/...4j2/LoggerConfig_InstrumentationTest.java → ...4j2/LoggerConfig_InstrumentationTest.java
diff --git a/...lication_logging_context_data_enabled.yml → ...lication_logging_context_data_enabled.yml b/...lication_logging_context_data_enabled.yml → ...lication_logging_context_data_enabled.yml
diff --git a/...resources/application_logging_enabled.yml → ...resources/application_logging_enabled.yml b/...resources/application_logging_enabled.yml → ...resources/application_logging_enabled.yml
diff --git a/...-2.6/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig_Instrumentation.java b/...-2.6/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig_Instrumentation.java
@@ -31,7 +31,7 @@ public class LoggerConfig_Instrumentation {
     public LoggerConfig_Instrumentation() {
         // Generate the instrumentation module supportability metric only once
         if (!instrumented.getAndSet(true)) {
-            NewRelic.incrementCounter("Supportability/Logging/Java/Log4j2/enabled");
+            NewRelic.incrementCounter("Supportability/Logging/Java/Log4j2.6/enabled");
         }
     }
 

diff --git a/instrumentation/apache-log4j-2/build.gradle b/instrumentation/apache-log4j-2/build.gradle
diff --git a/settings.gradle b/settings.gradle
@@ -87,7 +87,7 @@ include 'instrumentation:akka-http-core-10.0'
 include 'instrumentation:akka-http-core-10.2.0'
 include 'instrumentation:apache-log4j-1'
 include 'instrumentation:apache-log4j-2.6'
-include 'instrumentation:apache-log4j-2'
+include 'instrumentation:apache-log4j-2.11'
 include 'instrumentation:apache-struts-2.0'
 include 'instrumentation:async-http-client-2.0.0'
 include 'instrumentation:async-http-client-2.1.0'