Updates from PR feedback

Signed-off-by: Peter Nied <peternied@hotmail.com>
gregschohn · Aug 15, 2024 · a152666 · a152666
1 parent 2e7f43b
commit a152666
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 35 deletions.
diff --git a/DocumentsFromSnapshotMigration/src/test/java/com/rfs/ParallelDocumentMigrationsTest.java b/DocumentsFromSnapshotMigration/src/test/java/com/rfs/ParallelDocumentMigrationsTest.java
@@ -224,15 +224,6 @@ public void testDocumentMigration(
         }
     }
 
-//    @Test
-//    public void testDocumentMigrationForBigMonolithicShardWorks() throws Exception {
-//        testDocumentMigration(1,
-//            SearchClusterContainer.OS_V2_14_0.getImageName(),
-//            SearchClusterContainer.OS_V2_14_0,
-//            GENERATOR_BASE_IMAGE,
-//            new String[]{"tail", "-f", "/dev/null"});
-//    }
-
     private void verifyWorkMetrics(DocumentMigrationTestContext rootContext, int numWorkers, int numRuns) {
         var workMetrics = rootContext.inMemoryInstrumentationBundle.getFinishedMetrics();
         var migrationMetrics = rootContext.inMemoryInstrumentationBundle.getFinishedMetrics();

diff --git a/RFS/src/main/java/com/rfs/tracing/RootWorkCoordinationContext.java b/RFS/src/main/java/com/rfs/tracing/RootWorkCoordinationContext.java
@@ -19,10 +19,6 @@ public class RootWorkCoordinationContext extends RootOtelContext {
     public final WorkCoordinationContexts.CompleteWorkItemContext.MetricInstruments completeWorkMetrics;
     public final WorkCoordinationContexts.AcquireNextWorkItemContext.MetricInstruments acquireNextWorkMetrics;
 
-    public RootWorkCoordinationContext(OpenTelemetry sdk, IContextTracker contextTracker) {
-        this(sdk, contextTracker, null);
-    }
-
     public RootWorkCoordinationContext(OpenTelemetry sdk,
                                        IContextTracker contextTracker,
                                        RootOtelContext enclosingScope)

diff --git a/...pture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TrafficReplayer.java b/...pture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/TrafficReplayer.java
@@ -226,7 +226,7 @@ public static void main(String[] args) throws Exception {
         var activeContextLogger = LoggerFactory.getLogger(ALL_ACTIVE_CONTEXTS_MONITOR_LOGGER);
         var params = parseArgs(args);
         URI uri;
-        final var workerId = UUID.randomUUID().toString();
+        final var workerId = ProcessHelpers.getNodeInstanceName();
         System.err.println("Starting Traffic Replayer with id=" + workerId);
         System.err.println("Got args: " + String.join("; ", args));
         try {
@@ -263,7 +263,7 @@ public static void main(String[] args) throws Exception {
         var topContext = new RootReplayerContext(
             RootOtelContext.initializeOpenTelemetryWithCollectorOrAsNoop(params.otelCollectorEndpoint,
                 "replay",
-                ProcessHelpers.getNodeInstanceName()),
+                workerId),
             contextTrackers
         );
 

diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/tracing/RootOtelContext.java b/coreUtilities/src/main/java/org/opensearch/migrations/tracing/RootOtelContext.java
@@ -36,7 +36,7 @@ public class RootOtelContext implements IRootOtelContext {
     public static OpenTelemetry initializeOpenTelemetryForCollector(
         @NonNull String collectorEndpoint,
         @NonNull String serviceName,
-        String nodeName
+        @NonNull String nodeName
     ) {
         final var spanProcessor = BatchSpanProcessor.builder(
             OtlpGrpcSpanExporter.builder().setEndpoint(collectorEndpoint).setTimeout(2, TimeUnit.SECONDS).build()

diff --git a/coreUtilities/src/main/java/org/opensearch/migrations/utils/ProcessHelpers.java b/coreUtilities/src/main/java/org/opensearch/migrations/utils/ProcessHelpers.java
@@ -1,32 +1,21 @@
 package org.opensearch.migrations.utils;
 
+import java.util.Optional;
 import java.util.UUID;
 
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
+@UtilityClass
 public class ProcessHelpers {
     private static final String DEFAULT_NODE_ID = UUID.randomUUID().toString();
 
     public static String getNodeInstanceName() {
-        String id = null;
-        try {
-            id = System.getenv("ECS_TASK_ID"); // for ECS deployments
-            if (id != null) {
-                return id;
-            }
-            id = System.getenv("HOSTNAME"); // for any kubernetes deployed pod
-            if (id != null) {
-                return id;
-            }
-            // add additional fallbacks here
-            id = DEFAULT_NODE_ID;
-            return id;
-        } finally {
-            if (id != null) {
-                String finalId = id;
-                log.atInfo().setMessage(() -> "getNodeInstanceName()=" + finalId).log();
-            }
-        }
+        var nodeId = Optional.of("ECS_TASK_ID").map(System::getenv)
+            .or(() -> Optional.of("HOSTNAME").map(System::getenv))
+            .orElse(DEFAULT_NODE_ID);
+        log.atInfo().setMessage(() -> "getNodeInstanceName()=" + nodeId).log();
+        return nodeId;
     }
 }