Code review changes

hpcc-systems · Jul 3, 2024 · b89df5f · b89df5f
1 parent ab84fa9
commit b89df5f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/HPCCRemoteFileWriter.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/HPCCRemoteFileWriter.java
@@ -18,7 +18,9 @@
 import org.hpccsystems.dfs.client.RowServiceOutputStream;
 import org.hpccsystems.dfs.client.Utils;
 
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.semconv.ServerAttributes;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -115,6 +117,20 @@ public HPCCRemoteFileWriter(DataPartition dp, FieldDef recordDef, IRecordAccesso
         this.writeSpanName = "HPCCRemoteFileWriter.RowService/Write_" + dp.getFileName() + "_" + dp.getThisPart();
         this.writeSpan = Utils.createSpan(writeSpanName);
 
+        String IPs = "";
+        for (int i = 0; i < dp.getCopyCount() ; i++)
+        {
+            IPs += dp.getCopyIP(i);
+            if (i < dp.getCopyCount() - 1)
+            {
+                IPs += ",";
+            }
+        }
+
+        Attributes attributes = Attributes.of(  ServerAttributes.SERVER_ADDRESS, IPs,
+                                                ServerAttributes.SERVER_PORT, Long.valueOf(dp.getPort()));
+        writeSpan.setAllAttributes(attributes);
+
         this.outputStream = new RowServiceOutputStream(dataPartition.getCopyIP(0), dataPartition.getPort(), dataPartition.getUseSsl(),
                 dataPartition.getFileAccessBlob(), this.recordDef, this.dataPartition.getThisPart(), this.dataPartition.getCopyPath(0),
                 fileCompression, connectTimeoutMs, socketOpTimeoutMs, this.writeSpan);

diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -391,7 +391,7 @@ public RowServiceInputStream(DataPartition dp, FieldDef rd, FieldDef pRd, int co
 
         this.dataPart = dp;
 
-        if (rdSpan != null && rdSpan.getSpanContext().isValid())
+        if (rdSpan != null)
         {
             this.readSpan = rdSpan;
             this.traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(readSpan);