Small cosmetic changes.

Author: phipag

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

@@ -14,7 +14,16 @@
 
 package software.amazon.lambda.powertools.metrics.internal;
 
+import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.getXrayTraceId;
+import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.isColdStart;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import com.amazonaws.services.lambda.runtime.Context;
+
 import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider;
 import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
 import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
@@ -24,18 +33,11 @@
 import software.amazon.lambda.powertools.metrics.model.MetricResolution;
 import software.amazon.lambda.powertools.metrics.model.MetricUnit;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.getXrayTraceId;
-import static software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor.isColdStart;
-
 /**
- * Implementation of MetricsLogger that uses the EMF library
+ * Implementation of MetricsLogger that uses the EMF library. Proxies MetricsLogger interface calls to underlying
+ * library {@link software.amazon.cloudwatchlogs.emf.logger.MetricsLogger}.
  */
 public class EmfMetricsLogger implements MetricsLogger {
-
     private static final String TRACE_ID_PROPERTY = "xray_trace_id";
     private static final String REQUEST_ID_PROPERTY = "function_request_id";
     private static final String COLD_START_METRIC = "ColdStart";
@@ -91,7 +93,7 @@ public void setDefaultDimensions(Map<String, String> defaultDimensions) {
         });
         emfLogger.setDimensions(dimensionSet);
         // Store a copy of the default dimensions
-        this.defaultDimensions = new HashMap<>(defaultDimensions);
+        this.defaultDimensions = new LinkedHashMap<>(defaultDimensions);
     }
 
     @Override

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/model/DimensionSet.java

@@ -23,7 +23,7 @@
  */
 public class DimensionSet {
     private static final int MAX_DIMENSION_SET_SIZE = 9;
-    
+
     private final Map<String, String> dimensions = new LinkedHashMap<>();
 
     /**
@@ -54,7 +54,7 @@ public static DimensionSet of(String key1, String value1, String key2, String va
         dimensionSet.addDimension(key2, value2);
         return dimensionSet;
     }
-    
+
     /**
      * Create a dimension set with three key-value pairs
      *
@@ -73,7 +73,7 @@ public static DimensionSet of(String key1, String value1, String key2, String va
         dimensionSet.addDimension(key3, value3);
         return dimensionSet;
     }
-    
+
     /**
      * Create a dimension set with four key-value pairs
      *
@@ -87,16 +87,16 @@ public static DimensionSet of(String key1, String value1, String key2, String va
      * @param value4 fourth dimension value
      * @return a new DimensionSet
      */
-    public static DimensionSet of(String key1, String value1, String key2, String value2, 
-                                 String key3, String value3, String key4, String value4) {
+    public static DimensionSet of(String key1, String value1, String key2, String value2,
+            String key3, String value3, String key4, String value4) {
         DimensionSet dimensionSet = new DimensionSet();
         dimensionSet.addDimension(key1, value1);
         dimensionSet.addDimension(key2, value2);
         dimensionSet.addDimension(key3, value3);
         dimensionSet.addDimension(key4, value4);
         return dimensionSet;
     }
-    
+
     /**
      * Create a dimension set with five key-value pairs
      *
@@ -112,9 +112,9 @@ public static DimensionSet of(String key1, String value1, String key2, String va
      * @param value5 fifth dimension value
      * @return a new DimensionSet
      */
-    public static DimensionSet of(String key1, String value1, String key2, String value2, 
-                                 String key3, String value3, String key4, String value4,
-                                 String key5, String value5) {
+    public static DimensionSet of(String key1, String value1, String key2, String value2,
+            String key3, String value3, String key4, String value4,
+            String key5, String value5) {
         DimensionSet dimensionSet = new DimensionSet();
         dimensionSet.addDimension(key1, value1);
         dimensionSet.addDimension(key2, value2);
@@ -135,7 +135,7 @@ public static DimensionSet of(Map<String, String> dimensions) {
         dimensions.forEach(dimensionSet::addDimension);
         return dimensionSet;
     }
-    
+
     /**
      * Add a dimension to this dimension set
      *
@@ -147,15 +147,16 @@ public static DimensionSet of(Map<String, String> dimensions) {
      */
     public DimensionSet addDimension(String key, String value) {
         validateDimension(key, value);
-        
+
         if (dimensions.size() >= MAX_DIMENSION_SET_SIZE) {
-            throw new IllegalStateException("Cannot exceed " + MAX_DIMENSION_SET_SIZE + " dimensions per dimension set");
+            throw new IllegalStateException(
+                    "Cannot exceed " + MAX_DIMENSION_SET_SIZE + " dimensions per dimension set");
         }
-        
+
         dimensions.put(key, value);
         return this;
     }
-    
+
     /**
      * Get the dimension keys in this dimension set
      *
@@ -164,7 +165,7 @@ public DimensionSet addDimension(String key, String value) {
     public Set<String> getDimensionKeys() {
         return dimensions.keySet();
     }
-    
+
     /**
      * Get the value for a dimension key
      *
@@ -176,21 +177,21 @@ public String getDimensionValue(String key) {
     }
 
     /**
-     * Get the dimensions as a map
+     * Get the dimensions as a map. Creates a shallow copy
      *
      * @return map of dimensions
      */
     public Map<String, String> getDimensions() {
         return new LinkedHashMap<>(dimensions);
     }
-    
+
     private void validateDimension(String key, String value) {
         if (key == null || key.isEmpty()) {
             throw new IllegalArgumentException("Dimension key cannot be null or empty");
         }
-        
+
         if (value == null) {
             throw new IllegalArgumentException("Dimension value cannot be null");
         }
     }
-}
+}

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/model/MetricResolution.java

@@ -18,8 +18,7 @@
  * Resolution for metrics
  */
 public enum MetricResolution {
-    STANDARD(60),
-    HIGH(1);
+    STANDARD(60), HIGH(1);
 
     private final int seconds;
 
@@ -30,4 +29,4 @@ public enum MetricResolution {
     public int getSeconds() {
         return seconds;
     }
-}
+}

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/model/MetricUnit.java

@@ -55,4 +55,4 @@ public enum MetricUnit {
     public String getName() {
         return name;
     }
-}
+}