add experimental to the S3 enrich processor

Signed-off-by: Xun Zhang <xunzh@amazon.com>

Author: Zhangxunmt

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/Event.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -155,9 +156,9 @@ public interface Event extends Serializable {
      * @param keys  the list of keys to selectively merge
      * @throws IllegalArgumentException if the input event is not compatible to merge.
      * @throws UnsupportedOperationException if the current Event does not support merging.
-     * @since 2.11
+     * @since 2.15
      */
-    void merge(Event other, List<String> keys);
+    void merge(Event other, Collection<String> keys);
 
     /**
      * Generates a serialized Json string of the entire Event

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java

@@ -32,6 +32,7 @@
 import java.io.ObjectInputStream;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -447,7 +448,7 @@ public void merge(final Event other) {
     }
 
     @Override
-    public void merge(final Event other, final List<String> keys) {
+    public void merge(final Event other, final Collection<String> keys) {
         if (keys == null || keys.isEmpty()) {
             throw new IllegalArgumentException("Keys list must not be null or empty for selective merge.");
         }

data-prepper-plugins/s3-enrich-processor/src/main/java/org/opensearch/dataprepper/plugins/s3_enrich/processor/S3EnrichProcessor.java

@@ -17,6 +17,7 @@
 import org.opensearch.dataprepper.metrics.PluginMetrics;
 import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin;
 import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor;
+import org.opensearch.dataprepper.model.annotations.Experimental;
 import org.opensearch.dataprepper.model.codec.InputCodec;
 import org.opensearch.dataprepper.model.configuration.PluginModel;
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
@@ -47,6 +48,7 @@
 
 import static org.opensearch.dataprepper.logging.DataPrepperMarkers.NOISY;
 
+@Experimental
 @DataPrepperPlugin(name = "s3_enrich", pluginType = Processor.class, pluginConfigurationType = S3EnrichProcessorConfig.class)
 public class S3EnrichProcessor extends AbstractProcessor<Record<Event>, Record<Event>> {
     private static final Logger LOG = LoggerFactory.getLogger(S3EnrichProcessor.class);
@@ -113,7 +115,6 @@ public S3EnrichProcessor(final S3EnrichProcessorConfig s3EnrichProcessorConfig,
 
     @Override
     public Collection<Record<Event>> doExecute(Collection<Record<Event>> records) {
-        LOG.info("S3EnricherProcessor processing {} records", records.size());
         List<Record<Event>> resultRecords = new ArrayList<>();
 
         // Process new records

data-prepper-plugins/s3-enrich-processor/src/test/java/org/opensearch/dataprepper/s3_enricher/processor/S3EnricherProcessorTest.java

@@ -54,7 +54,7 @@ public class S3ScanService {
     private final ExecutorService executorService;
     private final List<ScanObjectWorker> workers;
 
-    public  S3ScanService(final S3SourceConfig s3SourceConfig,
+    public S3ScanService(final S3SourceConfig s3SourceConfig,
                          final S3ClientBuilderFactory s3ClientBuilderFactory,
                          final S3ObjectHandler s3ObjectHandler,
                          final BucketOwnerProvider bucketOwnerProvider,