Do not hard code JVM system property for trace id.

Author: phipag

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsFactoryTest.java

@@ -29,6 +29,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import software.amazon.lambda.powertools.common.internal.LambdaConstants;
 import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
 import software.amazon.lambda.powertools.metrics.internal.RequestScopedMetricsProxy;
 import software.amazon.lambda.powertools.metrics.model.MetricUnit;
@@ -62,7 +63,7 @@ void setUp() throws Exception {
     @AfterEach
     void tearDown() throws Exception {
         System.setOut(standardOut);
-        System.clearProperty("com.amazonaws.xray.traceHeader");
+        System.clearProperty(LambdaConstants.XRAY_TRACE_HEADER);
 
         // Reset the singleton state between tests
         java.lang.reflect.Field field = MetricsFactory.class.getDeclaredField("metricsProxy");
@@ -177,14 +178,14 @@ void shouldIsolateMetricsByTraceId() throws Exception {
         Metrics metrics = MetricsFactory.getMetricsInstance();
 
         // WHEN - Simulate Lambda invocation 1 with trace ID 1
-        System.setProperty("com.amazonaws.xray.traceHeader", "Root=1-trace-id-1");
+        System.setProperty(LambdaConstants.XRAY_TRACE_HEADER, "Root=1-trace-id-1");
         metrics.setNamespace("TestNamespace");
         metrics.addDimension("userId", "user123");
         metrics.addMetric("ProcessedOrder", 1, MetricUnit.COUNT);
         metrics.flush();
 
         // WHEN - Simulate Lambda invocation 2 with trace ID 2
-        System.setProperty("com.amazonaws.xray.traceHeader", "Root=1-trace-id-2");
+        System.setProperty(LambdaConstants.XRAY_TRACE_HEADER, "Root=1-trace-id-2");
         metrics.setNamespace("TestNamespace");
         metrics.addDimension("userId", "user456");
         metrics.addMetric("ProcessedOrder", 1, MetricUnit.COUNT);
@@ -205,7 +206,7 @@ void shouldIsolateMetricsByTraceId() throws Exception {
     @Test
     void shouldUseDefaultKeyWhenNoTraceId() throws Exception {
         // GIVEN - No trace ID set
-        System.clearProperty("com.amazonaws.xray.traceHeader");
+        System.clearProperty(LambdaConstants.XRAY_TRACE_HEADER);
 
         // WHEN
         Metrics metrics = MetricsFactory.getMetricsInstance();

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/EmfMetricsLoggerTest.java

@@ -73,7 +73,7 @@ void setUp() throws Exception {
     }
 
     @AfterEach
-    void tearDown() throws Exception {
+    void tearDown() {
         System.setOut(standardOut);
     }
 

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/RequestScopedMetricsProxyTest.java

@@ -18,6 +18,7 @@
 import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import software.amazon.lambda.powertools.common.internal.LambdaConstants;
 import software.amazon.lambda.powertools.metrics.Metrics;
 import software.amazon.lambda.powertools.metrics.model.DimensionSet;
 import software.amazon.lambda.powertools.metrics.model.MetricResolution;
@@ -50,7 +51,7 @@ void setUp() {
 
     @AfterEach
     void tearDown() {
-        System.clearProperty("com.amazonaws.xray.traceHeader");
+        System.clearProperty(LambdaConstants.XRAY_TRACE_HEADER);
     }
 
     // ========== LAZY INITIALIZATION TESTS (Configuration Methods) ==========
@@ -158,7 +159,7 @@ void firstMetricsOperation_shouldApplyStoredConfiguration() {
     @Test
     void shouldShareInstanceAcrossThreadsWithSameTraceId() throws Exception {
         // GIVEN - Set trace ID
-        System.setProperty("com.amazonaws.xray.traceHeader", "Root=1-test-trace-id");
+        System.setProperty(LambdaConstants.XRAY_TRACE_HEADER, "Root=1-test-trace-id");
 
         // WHEN - Parent thread adds metric
         proxy.addMetric("metric1", 1, MetricUnit.COUNT);