From 2eec8ef99d8d5ec6e4b068b3da0f0dd9f7de9a5a Mon Sep 17 00:00:00 2001
From: Jerry Duffy <jduffy@newrelic.com>
Date: Wed, 16 Nov 2022 13:28:37 -0500
Subject: [PATCH] recordCustomEvent log pattern now includes event type, key
 and value

---
 .../agent/service/analytics/InsightsServiceImpl.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/InsightsServiceImpl.java b/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/InsightsServiceImpl.java
index 134a9cf6ca..8893a79c23 100644
--- a/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/InsightsServiceImpl.java
+++ b/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/InsightsServiceImpl.java
@@ -383,8 +383,9 @@ private static CustomInsightsEvent createValidatedEvent(String eventType, Map<St
 
             // key or value is null, skip it with a log message and iterate to next entry in attributes.entrySet()
             if (key == null || value == null) {
-                Agent.LOG.log(Level.WARNING, "Custom event with invalid attributes key or value of null was reported for a transaction but ignored."
-                        + " Each key should be a String and each value should be a String, Number, or Boolean.");
+                Agent.LOG.log(Level.WARNING, "Custom event [{0}] with invalid attributes key or value of null was reported for a transaction but ignored."
+                        + " Each key should be a String and each value should be a String, Number, or Boolean. Key: {1} / Value: {2}",
+                        eventType, (key == null ? "[null]" : key), (value == null ? "[null]" : value.toString()));
                 continue;
             }