Address PR feedback

- Rename 'emf' config property to 'emf_metrics' for clarity
- Improve test with random keys/values and proper verification using MetricsContext
- Remove unused DEFAULT constant from EMFLoggingRegistryConfig

Signed-off-by: Manuel Mangas Zurita <mzurita@amazon.com>

Author: mzurita-amz

data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfig.java

@@ -11,7 +11,6 @@
 import java.util.Map;
 
 public interface EMFLoggingRegistryConfig extends StepRegistryConfig {
-    EMFLoggingRegistryConfig DEFAULT = k -> null;
 
     @Override
     default String prefix() {

data-prepper-core/src/main/java/org/opensearch/dataprepper/core/parser/model/DataPrepperConfiguration.java

@@ -94,7 +94,7 @@ public DataPrepperConfiguration(
             final List<MetricTagFilter> metricTagFilters,
             @JsonProperty("disabled_metrics")
             final List<String> disabledMetrics,
-            @JsonProperty("emf")
+            @JsonProperty("emf_metrics")
             final EmfConfig emf,
             @JsonProperty("peer_forwarder") final PeerForwarderConfiguration peerForwarderConfiguration,
             @JsonProperty("processor_shutdown_timeout")

data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistryTest.java

@@ -28,6 +28,7 @@
 import software.amazon.cloudwatchlogs.emf.model.Unit;
 
 import java.lang.reflect.Field;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -60,7 +61,7 @@ class EMFLoggingMeterRegistryTest {
     private final MockClock clock = new MockClock();
     private final EMFLoggingMeterRegistry registry = spy(
             new EMFLoggingMeterRegistry(
-                    EMFLoggingRegistryConfig.DEFAULT, new EnvironmentProvider().resolveEnvironment().join(), clock)
+                    k -> null, new EnvironmentProvider().resolveEnvironment().join(), clock)
     );
     private final EMFLoggingMeterRegistry.Snapshot registrySnapshot = registry.new Snapshot();
 
@@ -218,7 +219,7 @@ void snapshotFunctionCounterDataValid() {
     void snapshotFunctionCounterDataShouldClampInfiniteValues() {
         FunctionCounter functionCounter = FunctionCounter
                 .builder("my.positive.infinity", Double.POSITIVE_INFINITY, Number::doubleValue).register(registry);
-        clock.add(EMFLoggingRegistryConfig.DEFAULT.step());
+        clock.add(Duration.ofMinutes(1));
         final List<EMFLoggingMeterRegistry.MetricDataPoint> metricDataPoints1 = registrySnapshot
                 .functionCounterData(functionCounter)
                 .collect(Collectors.toList());
@@ -227,7 +228,7 @@ void snapshotFunctionCounterDataShouldClampInfiniteValues() {
 
         functionCounter = FunctionCounter
                 .builder("my.negative.infinity", Double.NEGATIVE_INFINITY, Number::doubleValue).register(registry);
-        clock.add(EMFLoggingRegistryConfig.DEFAULT.step());
+        clock.add(Duration.ofMinutes(1));
         final List<EMFLoggingMeterRegistry.MetricDataPoint> metricDataPoints2 = registrySnapshot
                 .functionCounterData(functionCounter)
                 .collect(Collectors.toList());
@@ -270,7 +271,7 @@ void snapshotShouldNotAddFunctionTimerDataWhenSumIsNaN() {
         final FunctionTimer functionTimer = FunctionTimer
                 .builder("my.function.timer", Double.NaN, Number::longValue, Number::doubleValue, TimeUnit.MILLISECONDS)
                 .register(registry);
-        clock.add(EMFLoggingRegistryConfig.DEFAULT.step());
+        clock.add(Duration.ofMinutes(1));
         final List<EMFLoggingMeterRegistry.MetricDataPoint> metricDataPoints = registrySnapshot
                 .functionTimerData(functionTimer)
                 .collect(Collectors.toList());
@@ -358,7 +359,12 @@ private MetricsContext reflectivelyGetMetricsContext(final MetricsLogger metrics
 
     @Test
     void testAdditionalPropertiesAreAddedToMetricsLogger() {
-        final Map<String, String> additionalProperties = Map.of("key1", "value1", "key2", "value2");
+        final String randomKey1 = "testKey_" + System.currentTimeMillis();
+        final String randomValue1 = "testValue_" + Math.random();
+        final String randomKey2 = "anotherKey_" + System.nanoTime();
+        final String randomValue2 = "anotherValue_" + Math.random();
+        
+        final Map<String, String> additionalProperties = Map.of(randomKey1, randomValue1, randomKey2, randomValue2);
         final EMFLoggingRegistryConfig config = new EMFLoggingRegistryConfig() {
             @Override
             public String get(String key) {
@@ -378,8 +384,17 @@ public Map<String, String> additionalProperties() {
         final List<MetricsLogger> metricsLoggers = registryWithProperties.metricsLoggers();
 
         assertThat(metricsLoggers.size(), equalTo(1));
-        // Note: We can't directly verify putProperty calls without mocking the MetricsLogger
-        // This test verifies the registry can be created with additional properties config
+        
+        final MetricsLogger metricsLogger = metricsLoggers.get(0);
+        final MetricsContext context = reflectivelyGetMetricsContext(metricsLogger);
+        
+        // Verify properties exist
+        assertThat(context.getProperty(randomKey1), equalTo(randomValue1));
+        assertThat(context.getProperty(randomKey2), equalTo(randomValue2));
+        
+        // Verify properties are not dimensions
+        assertThat(hasDimension(context, randomKey1), is(false));
+        assertThat(hasDimension(context, randomKey2), is(false));
     }
 
     private boolean hasDimension(final MetricsContext context, final String key) {

data-prepper-core/src/test/java/org/opensearch/dataprepper/core/meter/EMFLoggingRegistryConfigTest.java

@@ -13,7 +13,7 @@
 class EMFLoggingRegistryConfigTest {
     @Test
     void testDefault() {
-        final EMFLoggingRegistryConfig objectUnderTest = EMFLoggingRegistryConfig.DEFAULT;
+        final EMFLoggingRegistryConfig objectUnderTest = k -> null;
         assertThat(objectUnderTest.prefix(), equalTo("emf"));
     }
 }