Address review comment

Signed-off-by: Gagan Juneja <[email protected]>
Gaganjuneja · Oct 3, 2023 · a4d4ad0 · a4d4ad0
1 parent d8b8198
commit a4d4ad0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelSpan.java b/plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelSpan.java
@@ -57,7 +57,9 @@ public void addAttribute(String key, Boolean value) {
 
     @Override
     public void setError(Exception exception) {
-        delegateSpan.setStatus(StatusCode.ERROR, exception != null ? exception.getMessage() : "no description");
+        if (exception != null) {
+            delegateSpan.setStatus(StatusCode.ERROR, exception.getMessage());
+        }
     }
 
     @Override

diff --git a/...er/src/main/java/org/opensearch/telemetry/tracing/channels/TraceableTransportChannel.java b/...er/src/main/java/org/opensearch/telemetry/tracing/channels/TraceableTransportChannel.java
@@ -29,8 +29,6 @@ public class TraceableTransportChannel implements TransportChannel {
     private final Span span;
     private final Tracer tracer;
 
-    private final TcpChannel tcpChannel;
-
     /**
      * Constructor.
      * @param delegate delegate
@@ -41,7 +39,6 @@ public TraceableTransportChannel(TransportChannel delegate, Span span, Tracer tr
         this.delegate = delegate;
         this.span = span;
         this.tracer = tracer;
-        this.tcpChannel = tcpChannel;
     }
 
     /**
@@ -88,6 +85,9 @@ public String getChannelType() {
     public void sendResponse(TransportResponse response) throws IOException {
         try (SpanScope scope = tracer.withSpanInScope(span)) {
             delegate.sendResponse(response);
+        } catch (final IOException ex) {
+            span.setError(ex);
+            throw ex;
         } finally {
             span.endSpan();
         }

diff --git a/test/telemetry/src/main/java/org/opensearch/test/telemetry/tracing/MockSpan.java b/test/telemetry/src/main/java/org/opensearch/test/telemetry/tracing/MockSpan.java
@@ -166,7 +166,9 @@ public Long getEndTime() {
     }
 
     public void setError(Exception exception) {
-        putMetadata("ERROR", exception != null ? exception.getMessage() : null);
+        if (exception != null) {
+            putMetadata("ERROR", exception.getMessage());
+        }
     }
 
     private static class IdGenerator {