Merge pull request #2052 from newrelic/fix/kinesis-npe

Fix an issue where the Kinesis instrumentation is generating ERROR logs due to a NullPointerException
newrelic · Sep 19, 2024 · b3669bc · b3669bc
2 parents 857433f + bbb433f
commit b3669bc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/tracers/DefaultTracer.java b/newrelic-agent/src/main/java/com/newrelic/agent/tracers/DefaultTracer.java
@@ -853,8 +853,12 @@ private void recordMessageBrokerMetrics(MessageConsumeParameters messageConsumeP
     }
 
     private void recordFaasAttributes(CloudParameters cloudParameters) {
-        setAgentAttribute(AttributeNames.CLOUD_PLATFORM, cloudParameters.getPlatform());
-        setAgentAttribute(AttributeNames.CLOUD_RESOURCE_ID, cloudParameters.getResourceId());
+        if (cloudParameters.getPlatform() != null) {
+            setAgentAttribute(AttributeNames.CLOUD_PLATFORM, cloudParameters.getPlatform());
+        }
+        if (cloudParameters.getResourceId() != null) {
+            setAgentAttribute(AttributeNames.CLOUD_RESOURCE_ID, cloudParameters.getResourceId());
+        }
     }
 
     private <T> void recordSlowQueryData(SlowQueryDatastoreParameters<T> slowQueryDatastoreParameters) {