From 6e293c63f76638901a8a97cf3cc6a53f9f3f1ca3 Mon Sep 17 00:00:00 2001
From: Andre Onuki <aonuki@newrelic.com>
Date: Mon, 4 Nov 2024 16:54:00 -0500
Subject: [PATCH] SpanEventFactory - adding null check on server port

---
 .../newrelic/agent/service/analytics/SpanEventFactory.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/SpanEventFactory.java b/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/SpanEventFactory.java
index 1d96aa63ff..61efd37791 100644
--- a/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/SpanEventFactory.java
+++ b/newrelic-agent/src/main/java/com/newrelic/agent/service/analytics/SpanEventFactory.java
@@ -320,8 +320,10 @@ public SpanEventFactory setMessagingDestination(String messagingDestination) {
         return this;
     }
 
-    public SpanEventFactory setServerPort(int port) {
-        builder.putAgentAttribute(AttributeNames.SERVER_PORT, port);
+    public SpanEventFactory setServerPort(Integer port) {
+        if (port != null) {
+            builder.putAgentAttribute(AttributeNames.SERVER_PORT, port);
+        }
         return this;
     }