From e8300bc94e55aefd8fe84f6221ce37144fbcbed6 Mon Sep 17 00:00:00 2001
From: Andre Onuki <aonuki@newrelic.com>
Date: Mon, 25 Sep 2023 10:05:43 -0400
Subject: [PATCH] Moving attribute name constants to AttributeNames

---
 .../com/newrelic/agent/attributes/AttributeNames.java  |  3 +++
 .../agent/service/analytics/SpanEventFactory.java      |  5 ++---
 .../java/com/newrelic/agent/tracers/DefaultTracer.java | 10 +++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/attributes/AttributeNames.java b/newrelic-agent/src/main/java/com/newrelic/agent/attributes/AttributeNames.java
index 6d921c3a53..6aae781be2 100644
--- a/newrelic-agent/src/main/java/com/newrelic/agent/attributes/AttributeNames.java
+++ b/newrelic-agent/src/main/java/com/newrelic/agent/attributes/AttributeNames.java
@@ -28,11 +28,14 @@ public final class AttributeNames {
     public static final String TIMEOUT_CAUSE = "nr.timeoutCause";
     public static final String ERROR_EXPECTED = "error.expected";
 
+    public static final String COMPONENT = "component";
+    public static final String HTTP_METHOD = "http.method";
     public static final String HTTP_STATUS_CODE = "http.statusCode";
     public static final String HTTP_STATUS_TEXT = "http.statusText";
 
     public static final String LOCK_THREAD_NAME = "jvm.lock_thread_name";
     public static final String THREAD_NAME = "jvm.thread_name";
+    public static final String THREAD_ID = "thread.id";
 
     public static final String MESSAGE_REQUEST_PREFIX = "message.parameters.";
 
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 f8497621a7..b8c44cd962 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
@@ -17,7 +17,6 @@
 import com.newrelic.agent.model.SpanError;
 import com.newrelic.agent.model.SpanEvent;
 import com.newrelic.agent.service.ServiceFactory;
-import com.newrelic.agent.tracers.DefaultTracer;
 import com.newrelic.agent.util.ExternalsUtil;
 import com.newrelic.api.agent.DatastoreParameters;
 import com.newrelic.api.agent.ExternalParameters;
@@ -120,9 +119,9 @@ public SpanEventFactory setClmAttributes(Map<String, Object> agentAttributes) {
         if (agentAttributes == null || agentAttributes.isEmpty()) {
             return this;
         }
-        final Object threadId = agentAttributes.get(DefaultTracer.THREAD_ID_PARAMETER_NAME);
+        final Object threadId = agentAttributes.get(AttributeNames.THREAD_ID);
         if (threadId != null) {
-            builder.putAgentAttribute(DefaultTracer.THREAD_ID_PARAMETER_NAME, threadId);
+            builder.putAgentAttribute(AttributeNames.THREAD_ID, threadId);
         }
         if (agentAttributes.containsKey(AttributeNames.CLM_NAMESPACE) && agentAttributes.containsKey(AttributeNames.CLM_FUNCTION)) {
             builder.putAgentAttribute(AttributeNames.CLM_NAMESPACE, agentAttributes.get(AttributeNames.CLM_NAMESPACE));
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
index 74026e567c..19278de084 100644
--- a/newrelic-agent/src/main/java/com/newrelic/agent/tracers/DefaultTracer.java
+++ b/newrelic-agent/src/main/java/com/newrelic/agent/tracers/DefaultTracer.java
@@ -67,10 +67,6 @@ public class DefaultTracer extends AbstractTracer {
     public static final int DEFAULT_TRACER_FLAGS = TracerFlags.TRANSACTION_TRACER_SEGMENT
             | TracerFlags.GENERATE_SCOPED_METRIC;
 
-    private static final String COMPONENT_PARAMETER_NAME = "component";
-    private static final String HTTP_METHOD_PARAMETER_NAME = "http.method";
-    public static final String THREAD_ID_PARAMETER_NAME = "thread.id";
-
     private final long startTime;
     private final long timestamp;
     private long duration;
@@ -291,7 +287,7 @@ public void performFinishWork(long finishTime, int opcode, Object returnValue) {
             }
 
             try {
-                setAgentAttribute(THREAD_ID_PARAMETER_NAME, getTransactionActivity().getThreadId());
+                setAgentAttribute(AttributeNames.THREAD_ID, getTransactionActivity().getThreadId());
                 if (classMethodSignature != null && getTransaction() != null &&
                         ServiceFactory.getConfigService().getDefaultAgentConfig().getCodeLevelMetricsConfig().isEnabled()) {
                     String className = classMethodSignature.getClassName();
@@ -714,9 +710,9 @@ private void recordExternalMetricsHttp(HttpParameters externalParameters) {
         String uriStr = uri == null ? ExternalMetrics.UNKNOWN_HOST : uri.toString();
 
         String library = externalParameters.getLibrary();
-        setAgentAttribute(COMPONENT_PARAMETER_NAME, library);
+        setAgentAttribute(AttributeNames.COMPONENT, library);
         String procedure = externalParameters.getProcedure();
-        setAgentAttribute(HTTP_METHOD_PARAMETER_NAME, procedure);
+        setAgentAttribute(AttributeNames.HTTP_METHOD, procedure);
 
         ExternalMetrics.makeExternalComponentTrace(transaction.isWebTransaction(), this, host, library, true,
                 uriStr, procedure);