Fix SonarCube findings.

Author: phipag

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java

@@ -37,6 +37,7 @@
 public class LambdaMetricsAspect {
     public static final String TRACE_ID_PROPERTY = "xray_trace_id";
     public static final String REQUEST_ID_PROPERTY = "function_request_id";
+    private static final String SERVICE_DIMENSION = "Service";
 
     private String functionName(Metrics metrics, Context context) {
         if (!"".equals(metrics.functionName())) {
@@ -76,8 +77,8 @@ public Object around(ProceedingJoinPoint pjp,
             // default dimension.
             if (!"".equals(metrics.service())
                     && logger.getDefaultDimensions().getDimensionKeys().size() <= 1
-                    && logger.getDefaultDimensions().getDimensionKeys().contains("Service")) {
-                logger.setDefaultDimensions(Map.of("Service", metrics.service()));
+                    && logger.getDefaultDimensions().getDimensionKeys().contains(SERVICE_DIMENSION)) {
+                logger.setDefaultDimensions(Map.of(SERVICE_DIMENSION, metrics.service()));
             }
 
             logger.setRaiseOnEmptyMetrics(metrics.raiseOnEmptyMetrics());
@@ -98,8 +99,8 @@ public Object around(ProceedingJoinPoint pjp,
 
                     // Create dimensions with service and function name
                     DimensionSet coldStartDimensions = DimensionSet.of(
-                            "Service",
-                            logger.getDefaultDimensions().getDimensions().getOrDefault("Service",
+                            SERVICE_DIMENSION,
+                            logger.getDefaultDimensions().getDimensions().getOrDefault(SERVICE_DIMENSION,
                                     serviceNameWithFallback(metrics)),
                             "FunctionName", funcName != null ? funcName : extractedContext.getFunctionName());
 

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

@@ -45,7 +45,7 @@ class MetricsLoggerFactoryTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         System.setOut(new PrintStream(outputStreamCaptor));
 
         // Reset LambdaHandlerProcessor's SERVICE_NAME
@@ -60,7 +60,7 @@ public void setUp() throws Exception {
     }
 
     @AfterEach
-    public void tearDown() throws Exception {
+    void tearDown() throws Exception {
         System.setOut(standardOut);
 
         // Reset the singleton state between tests
@@ -74,7 +74,7 @@ public void tearDown() throws Exception {
     }
 
     @Test
-    public void shouldGetMetricsLoggerInstance() {
+    void shouldGetMetricsLoggerInstance() {
         // When
         MetricsLogger metricsLogger = MetricsLoggerFactory.getMetricsLogger();
 
@@ -83,7 +83,7 @@ public void shouldGetMetricsLoggerInstance() {
     }
 
     @Test
-    public void shouldReturnSameInstanceOnMultipleCalls() {
+    void shouldReturnSameInstanceOnMultipleCalls() {
         // When
         MetricsLogger firstInstance = MetricsLoggerFactory.getMetricsLogger();
         MetricsLogger secondInstance = MetricsLoggerFactory.getMetricsLogger();
@@ -94,7 +94,7 @@ public void shouldReturnSameInstanceOnMultipleCalls() {
 
     @Test
     @SetEnvironmentVariable(key = "POWERTOOLS_METRICS_NAMESPACE", value = TEST_NAMESPACE)
-    public void shouldUseNamespaceFromEnvironmentVariable() throws Exception {
+    void shouldUseNamespaceFromEnvironmentVariable() throws Exception {
         // When
         MetricsLogger metricsLogger = MetricsLoggerFactory.getMetricsLogger();
         metricsLogger.addMetric("test-metric", 100, MetricUnit.COUNT);
@@ -110,7 +110,7 @@ public void shouldUseNamespaceFromEnvironmentVariable() throws Exception {
 
     @Test
     @SetEnvironmentVariable(key = "POWERTOOLS_SERVICE_NAME", value = TEST_SERVICE)
-    public void shouldUseServiceNameFromEnvironmentVariable() throws Exception {
+    void shouldUseServiceNameFromEnvironmentVariable() throws Exception {
         // When
         MetricsLogger metricsLogger = MetricsLoggerFactory.getMetricsLogger();
         metricsLogger.addMetric("test-metric", 100, MetricUnit.COUNT);
@@ -125,7 +125,7 @@ public void shouldUseServiceNameFromEnvironmentVariable() throws Exception {
     }
 
     @Test
-    public void shouldSetCustomMetricsProvider() {
+    void shouldSetCustomMetricsProvider() {
         // Given
         MetricsProvider testProvider = new TestMetricsProvider();
 
@@ -138,7 +138,7 @@ public void shouldSetCustomMetricsProvider() {
     }
 
     @Test
-    public void shouldThrowExceptionWhenSettingNullProvider() {
+    void shouldThrowExceptionWhenSettingNullProvider() {
         // When/Then
         assertThatThrownBy(() -> MetricsLoggerFactory.setMetricsProvider(null))
                 .isInstanceOf(IllegalArgumentException.class)

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

@@ -16,8 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;