Remove concurrent hash map in our logging metadata implementation

CDCgov · Nov 3, 2023 · 94a8b98 · 94a8b98
1 parent dd397a0
commit 94a8b98
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/...rc/main/java/gov/hhs/cdc/trustedintermediary/external/inmemory/LoggingMetricMetaData.java b/...rc/main/java/gov/hhs/cdc/trustedintermediary/external/inmemory/LoggingMetricMetaData.java
@@ -5,7 +5,6 @@
 import gov.hhs.cdc.trustedintermediary.wrappers.Logger;
 import gov.hhs.cdc.trustedintermediary.wrappers.MetricMetaData;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import javax.inject.Inject;
 
 /**
@@ -15,27 +14,27 @@
 public class LoggingMetricMetaData implements MetricMetaData {
     private static final LoggingMetricMetaData INSTANCE = new LoggingMetricMetaData();
 
+    @Inject Logger logger;
+
     public static LoggingMetricMetaData getInstance() {
         return INSTANCE;
     }
 
-    @Inject Logger logger;
-
     private LoggingMetricMetaData() {}
 
-    private static final Map<String, Object> metadataMap = new ConcurrentHashMap<>();
-
     @Override
     public void put(String bundleId, MetaDataStep step) {
         MetaDataEntry entry = extractMetricsFromBundle(bundleId, step);
-        metadataMap.put("BundleId", entry.bundleId());
-        metadataMap.put("Entry Time", entry.entryTime());
-        metadataMap.put("Entry Step", entry.entryStep());
-        logger.logMap("MetaData Event Occured:", metadataMap);
-    }
-
-    public Map<String, Object> getMetaDataMap() {
-        return metadataMap;
+        var metadataMap =
+                Map.of(
+                        "BundleId",
+                        entry.bundleId(),
+                        "Entry Time",
+                        entry.entryTime(),
+                        "Entry Step",
+                        entry.entryStep());
+
+        logger.logMap("MetaData Event Occurred:", metadataMap);
     }
 
     private MetaDataEntry extractMetricsFromBundle(String bundleId, MetaDataStep step) {

diff --git a/...groovy/gov/hhs/cdc/trustedintermediary/external/inmemory/LoggingMetricMetaDataTest.groovy b/...groovy/gov/hhs/cdc/trustedintermediary/external/inmemory/LoggingMetricMetaDataTest.groovy
@@ -2,6 +2,7 @@ package gov.hhs.cdc.trustedintermediary.external.inmemory
 
 import gov.hhs.cdc.trustedintermediary.context.TestApplicationContext
 import gov.hhs.cdc.trustedintermediary.metadata.MetaDataStep
+import gov.hhs.cdc.trustedintermediary.wrappers.Logger
 import gov.hhs.cdc.trustedintermediary.wrappers.MetricMetaData
 import spock.lang.Specification
 
@@ -14,12 +15,20 @@ class LoggingMetricMetaDataTest extends Specification {
         TestApplicationContext.injectRegisteredImplementations()
     }
 
-    def "meta data map is populated"() {
+    def "meta data is correctly logged out"() {
+        given:
+        var logger = Mock(Logger)
+        TestApplicationContext.register(Logger, logger)
+        TestApplicationContext.injectRegisteredImplementations()
 
         when:
         LoggingMetricMetaData.getInstance().put("Key", _ as MetaDataStep)
 
         then:
-        LoggingMetricMetaData.getInstance().getMetaDataMap().containsKey("BundleId")
+        1 * logger.logMap(_ as String, _ as Map) >> { String message, Map keyValue ->
+            assert keyValue.containsKey("BundleId")
+            assert keyValue.containsKey("Entry Time")
+            assert keyValue.containsKey("Entry Step")
+        }
     }
 }