Fix test case

Signed-off-by: Gagan Juneja <[email protected]>
Gaganjuneja · Sep 8, 2023 · 0aacc18 · 0aacc18
1 parent 89d5413
commit 0aacc18
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/telemetry/tracing/SpanBuilder.java b/server/src/main/java/org/opensearch/telemetry/tracing/SpanBuilder.java
@@ -122,7 +122,7 @@ private static String createSpanName(String action, Transport.Connection connect
     private static Attributes buildSpanAttributes(String action, Transport.Connection connection) {
         Attributes attributes = Attributes.create().addAttribute(AttributeNames.TRANSPORT_ACTION, action);
         if (connection != null && connection.getNode() != null) {
-            attributes.addAttribute(AttributeNames.TRANSPORT_TARGET_HOST, connection.getNode().getHostAddress());
+            attributes.addAttribute(AttributeNames.TRANSPORT_TARGET_HOST, connection.getNode().getHostAddress() + connection.getNode().getName() + connection.getNode().getId() + connection.getNode().getHostName());
         }
         return attributes;
     }

diff --git a/test/telemetry/src/main/java/org/opensearch/test/telemetry/tracing/MockTracingTelemetry.java b/test/telemetry/src/main/java/org/opensearch/test/telemetry/tracing/MockTracingTelemetry.java
@@ -15,6 +15,7 @@
 import org.opensearch.telemetry.tracing.TracingTelemetry;
 import org.opensearch.telemetry.tracing.attributes.Attributes;
 
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -36,7 +37,7 @@ public MockTracingTelemetry() {}
     public Span createSpan(String spanName, Span parentSpan, Attributes attributes) {
         Span span = new MockSpan(spanName, parentSpan, spanProcessor, attributes);
         if (shutdown.get() == false) {
-            logger.info("adding span {} {}", Thread.currentThread().getName(), span);
+            logger.info("adding span {} {}", Thread.currentThread().getName(), toMockSpanData(span));
             spanProcessor.onStart(span);
         }
         return span;
@@ -54,4 +55,19 @@ public void close() {
         shutdown.set(true);
     }
 
+    private MockSpanData toMockSpanData(Span span) {
+        String parentSpanId = (span.getParentSpan() != null) ? span.getParentSpan().getSpanId() : "";
+        MockSpanData spanData = new MockSpanData(
+            span.getSpanId(),
+            parentSpanId,
+            span.getTraceId(),
+            System.nanoTime(),
+            false,
+            span.getSpanName(),
+            Thread.currentThread().getStackTrace(),
+            (span instanceof MockSpan) ? ((MockSpan) span).getAttributes() : Map.of()
+        );
+        return spanData;
+    }
+
 }