Refactor debugExporter into singleton

Signed-off-by: Chenyang Ji <cyji@amazon.com>
ansjcy · Jun 5, 2024 · d171db0 · d171db0
1 parent 0ab9c0b
commit d171db0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/...ry-insights/src/main/java/org/opensearch/plugin/insights/core/exporter/DebugExporter.java b/...ry-insights/src/main/java/org/opensearch/plugin/insights/core/exporter/DebugExporter.java
@@ -26,7 +26,20 @@ public final class DebugExporter implements QueryInsightsExporter {
     /**
      * Constructor of DebugExporter
      */
-    public DebugExporter() {}
+    private DebugExporter() {}
+
+    private static class InstanceHolder {
+        private static final DebugExporter INSTANCE = new DebugExporter();
+    }
+
+    /**
+     Get the singleton instance of DebugExporter
+     *
+     @return DebugExporter instance
+     */
+    public static DebugExporter getInstance() {
+        return InstanceHolder.INSTANCE;
+    }
 
     /**
      * Write the list of SearchQueryRecord to debug log

diff --git a/.../main/java/org/opensearch/plugin/insights/core/exporter/QueryInsightsExporterFactory.java b/.../main/java/org/opensearch/plugin/insights/core/exporter/QueryInsightsExporterFactory.java
@@ -93,16 +93,12 @@ public void validateExporterConfig(final Settings settings) throws IllegalArgume
      * @return QueryInsightsExporter the created exporter sink
      */
     public QueryInsightsExporter createExporter(SinkType type, String indexPattern) {
-        QueryInsightsExporter exporter;
-        switch (type) {
-            case LOCAL_INDEX:
-                exporter = new LocalIndexExporter(client, DateTimeFormat.forPattern(indexPattern));
-                break;
-            default:
-                exporter = new DebugExporter();
+        if (SinkType.LOCAL_INDEX.equals(type)) {
+            QueryInsightsExporter exporter = new LocalIndexExporter(client, DateTimeFormat.forPattern(indexPattern));
+            this.exporters.add(exporter);
+            return exporter;
         }
-        this.exporters.add(exporter);
-        return exporter;
+        return DebugExporter.getInstance();
     }
 
     /**

diff --git a/...sights/src/test/java/org/opensearch/plugin/insights/core/exporter/DebugExporterTests.java b/...sights/src/test/java/org/opensearch/plugin/insights/core/exporter/DebugExporterTests.java
@@ -23,7 +23,7 @@ public class DebugExporterTests extends OpenSearchTestCase {
 
     @Before
     public void setup() {
-        debugExporter = new DebugExporter();
+        debugExporter = DebugExporter.getInstance();
     }
 
     public void testExport() {