Merge remote-tracking branch 'origin/candidate-9.8.x'

jakesmith · jakesmith · commit 23d567807faf · 2024-12-12T16:49:09.000Z
Signed-off-by: Jake Smith &lt;jake.smith@lexisnexisrisk.com&gt;

# Conflicts:
#	commons-hpcc/pom.xml
#	dfsclient/pom.xml
#	pom.xml
#	wsclient/pom.xml
diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -165,7 +165,6 @@ private static StreamContext constructStreamContext(FieldDef rd, FieldDef pRd, i
     private String                   rowServiceVersion = "";
 
     private Span                     fileReadSpan = null;
-    private String                   traceContextHeader = null;
 
     private Span                     readRequestSpan = null;
     private int                      readRequestCount = 0;
@@ -472,7 +471,6 @@ public RowServiceInputStream(StreamContext context, DataPartition dp, RestartInf
         if (context.fileReadSpan != null && context.fileReadSpan.getSpanContext().isValid())
         {
             this.fileReadSpan = context.fileReadSpan;
-            this.traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(fileReadSpan);
         }
 
         int copycount = dataPart.getCopyCount();
@@ -1038,7 +1036,7 @@ private int startFetch()
             if (inFetchingMode)
             {
                 if (this.simulateFail) this.handle = -1;
-                readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest() : this.makeHandleRequest();
+                readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest(readRequestSpan) : this.makeHandleRequest(readRequestSpan);
 
                 try
                 {
@@ -1118,7 +1116,7 @@ private int startFetch()
             {
                 inTokenRetry = true;
 
-                String retryTrans = this.makeTokenRequest();
+                String retryTrans = this.makeTokenRequest(readRequestSpan);
                 int len = retryTrans.length();
                 try
                 {
@@ -1345,7 +1343,7 @@ private void finishFetch()
 
             // Create the read ahead request
             if (this.simulateFail) this.handle = -1;
-            String readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest() : this.makeHandleRequest();
+            String readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest(readRequestSpan) : this.makeHandleRequest(readRequestSpan);
 
             try
             {
@@ -2002,7 +2000,7 @@ private void makeActive() throws HpccFileException
 
                 try
                 {
-                    String msg = makeGetVersionRequest();
+                    String msg = makeGetVersionRequest(versionSpan);
                     int msgLen = msg.length();
 
                     this.dos.writeInt(msgLen);
@@ -2069,11 +2067,11 @@ private void makeActive() throws HpccFileException
                     if (this.tokenBin == null)
                     {
                         this.tokenBin = new byte[0];
-                        readTrans = makeInitialRequest();
+                        readTrans = makeInitialRequest(readRequestSpan);
                     }
                     else
                     {
-                        readTrans = makeTokenRequest();
+                        readTrans = makeTokenRequest(readRequestSpan);
                     }
 
                     int transLen = readTrans.length();
@@ -2395,21 +2393,23 @@ private void makeFetchObject(StringBuilder sb)
         }
     }
 
-    private String makeGetVersionRequest()
+    private String makeGetVersionRequest(Span versionSpan)
     {
+        String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(versionSpan);
         final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";
         final String versionMsg = RFCCodes.RFCStreamReadCmd + "{ \"command\" : \"version\", \"handle\": \"-1\", " + trace + " \"format\": \"binary\" }";
         return versionMsg;
     }
 
-    private String makeInitialRequest()
+    private String makeInitialRequest(Span span)
     {
         StringBuilder sb = new StringBuilder(256);
 
         sb.append(RFCCodes.RFCStreamReadCmd);
         sb.append("{ \"format\" : \"binary\", \n");
         sb.append("\"replyLimit\" : " + this.initialReadSizeKB + ",\n");
 
+        String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);
         final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";
         sb.append(trace);
 
@@ -2478,7 +2478,7 @@ private String makeNodeObject()
         return sb.toString();
     }
 
-    private String makeHandleRequest()
+    private String makeHandleRequest(Span span)
     {
         StringBuilder sb = new StringBuilder(256);
 
@@ -2487,6 +2487,7 @@ private String makeHandleRequest()
         sb.append("  \"handle\" : \"" + Integer.toString(this.handle) + "\",");
         sb.append("\"replyLimit\" : " + this.maxReadSizeKB + ",\n");
 
+        String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);
         final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";
         sb.append(trace);
 
@@ -2505,14 +2506,15 @@ private String makeHandleRequest()
         return sb.toString();
     }
 
-    private String makeTokenRequest()
+    private String makeTokenRequest(Span span)
     {
         StringBuilder sb = new StringBuilder(256);
 
         sb.append(RFCCodes.RFCStreamReadCmd);
         sb.append("{ \"format\" : \"binary\",\n");
         sb.append("\"replyLimit\" : " + this.maxReadSizeKB + ",\n");
 
+        String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);
         final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";
         sb.append(trace);
 
@@ -2529,13 +2531,14 @@ private String makeTokenRequest()
         return sb.toString();
     }
 
-    private String makeCloseHandleRequest()
+    private String makeCloseHandleRequest(Span span)
     {
         StringBuilder sb = new StringBuilder(256);
 
         sb.append("{ \"format\" : \"binary\",\n");
         sb.append("  \"handle\" : \"" + Integer.toString(this.handle) + "\",");
 
+        String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);
         final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";
         sb.append(trace);
 
@@ -2562,7 +2565,7 @@ private void sendCloseFileRequest() throws IOException
             closeSpan.setStatus(StatusCode.OK);
         }
 
-        String closeFileRequest = makeCloseHandleRequest();
+        String closeFileRequest = makeCloseHandleRequest(closeSpan);
         int jsonRequestLen = closeFileRequest.length();
 
         try

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,6 @@ private static StreamContext constructStreamContext(FieldDef rd, FieldDef pRd, i`
`165`	`165`	`private String rowServiceVersion = "";`
`166`	`166`
`167`	`167`	`private Span fileReadSpan = null;`
`168`		`- private String traceContextHeader = null;`
`169`	`168`
`170`	`169`	`private Span readRequestSpan = null;`
`171`	`170`	`private int readRequestCount = 0;`
`@@ -472,7 +471,6 @@ public RowServiceInputStream(StreamContext context, DataPartition dp, RestartInf`
`472`	`471`	`if (context.fileReadSpan != null && context.fileReadSpan.getSpanContext().isValid())`
`473`	`472`	`{`
`474`	`473`	`this.fileReadSpan = context.fileReadSpan;`
`475`		`- this.traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(fileReadSpan);`
`476`	`474`	`}`
`477`	`475`
`478`	`476`	`int copycount = dataPart.getCopyCount();`
`@@ -1038,7 +1036,7 @@ private int startFetch()`
`1038`	`1036`	`if (inFetchingMode)`
`1039`	`1037`	`{`
`1040`	`1038`	`if (this.simulateFail) this.handle = -1;`
`1041`		`- readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest() : this.makeHandleRequest();`
	`1039`	`+ readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest(readRequestSpan) : this.makeHandleRequest(readRequestSpan);`
`1042`	`1040`
`1043`	`1041`	`try`
`1044`	`1042`	`{`
`@@ -1118,7 +1116,7 @@ private int startFetch()`
`1118`	`1116`	`{`
`1119`	`1117`	`inTokenRetry = true;`
`1120`	`1118`
`1121`		`- String retryTrans = this.makeTokenRequest();`
	`1119`	`+ String retryTrans = this.makeTokenRequest(readRequestSpan);`
`1122`	`1120`	`int len = retryTrans.length();`
`1123`	`1121`	`try`
`1124`	`1122`	`{`
`@@ -1345,7 +1343,7 @@ private void finishFetch()`
`1345`	`1343`
`1346`	`1344`	`// Create the read ahead request`
`1347`	`1345`	`if (this.simulateFail) this.handle = -1;`
`1348`		`- String readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest() : this.makeHandleRequest();`
	`1346`	`+ String readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest(readRequestSpan) : this.makeHandleRequest(readRequestSpan);`
`1349`	`1347`
`1350`	`1348`	`try`
`1351`	`1349`	`{`
`@@ -2002,7 +2000,7 @@ private void makeActive() throws HpccFileException`
`2002`	`2000`
`2003`	`2001`	`try`
`2004`	`2002`	`{`
`2005`		`- String msg = makeGetVersionRequest();`
	`2003`	`+ String msg = makeGetVersionRequest(versionSpan);`
`2006`	`2004`	`int msgLen = msg.length();`
`2007`	`2005`
`2008`	`2006`	`this.dos.writeInt(msgLen);`
`@@ -2069,11 +2067,11 @@ private void makeActive() throws HpccFileException`
`2069`	`2067`	`if (this.tokenBin == null)`
`2070`	`2068`	`{`
`2071`	`2069`	`this.tokenBin = new byte[0];`
`2072`		`- readTrans = makeInitialRequest();`
	`2070`	`+ readTrans = makeInitialRequest(readRequestSpan);`
`2073`	`2071`	`}`
`2074`	`2072`	`else`
`2075`	`2073`	`{`
`2076`		`- readTrans = makeTokenRequest();`
	`2074`	`+ readTrans = makeTokenRequest(readRequestSpan);`
`2077`	`2075`	`}`
`2078`	`2076`
`2079`	`2077`	`int transLen = readTrans.length();`
`@@ -2395,21 +2393,23 @@ private void makeFetchObject(StringBuilder sb)`
`2395`	`2393`	`}`
`2396`	`2394`	`}`
`2397`	`2395`
`2398`		`- private String makeGetVersionRequest()`
	`2396`	`+ private String makeGetVersionRequest(Span versionSpan)`
`2399`	`2397`	`{`
	`2398`	`+ String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(versionSpan);`
`2400`	`2399`	`final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";`
`2401`	`2400`	`final String versionMsg = RFCCodes.RFCStreamReadCmd + "{ \"command\" : \"version\", \"handle\": \"-1\", " + trace + " \"format\": \"binary\" }";`
`2402`	`2401`	`return versionMsg;`
`2403`	`2402`	`}`
`2404`	`2403`
`2405`		`- private String makeInitialRequest()`
	`2404`	`+ private String makeInitialRequest(Span span)`
`2406`	`2405`	`{`
`2407`	`2406`	`StringBuilder sb = new StringBuilder(256);`
`2408`	`2407`
`2409`	`2408`	`sb.append(RFCCodes.RFCStreamReadCmd);`
`2410`	`2409`	`sb.append("{ \"format\" : \"binary\", \n");`
`2411`	`2410`	`sb.append("\"replyLimit\" : " + this.initialReadSizeKB + ",\n");`
`2412`	`2411`
	`2412`	`+ String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);`
`2413`	`2413`	`final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";`
`2414`	`2414`	`sb.append(trace);`
`2415`	`2415`
`@@ -2478,7 +2478,7 @@ private String makeNodeObject()`
`2478`	`2478`	`return sb.toString();`
`2479`	`2479`	`}`
`2480`	`2480`
`2481`		`- private String makeHandleRequest()`
	`2481`	`+ private String makeHandleRequest(Span span)`
`2482`	`2482`	`{`
`2483`	`2483`	`StringBuilder sb = new StringBuilder(256);`
`2484`	`2484`
`@@ -2487,6 +2487,7 @@ private String makeHandleRequest()`
`2487`	`2487`	`sb.append(" \"handle\" : \"" + Integer.toString(this.handle) + "\",");`
`2488`	`2488`	`sb.append("\"replyLimit\" : " + this.maxReadSizeKB + ",\n");`
`2489`	`2489`
	`2490`	`+ String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);`
`2490`	`2491`	`final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";`
`2491`	`2492`	`sb.append(trace);`
`2492`	`2493`
`@@ -2505,14 +2506,15 @@ private String makeHandleRequest()`
`2505`	`2506`	`return sb.toString();`
`2506`	`2507`	`}`
`2507`	`2508`
`2508`		`- private String makeTokenRequest()`
	`2509`	`+ private String makeTokenRequest(Span span)`
`2509`	`2510`	`{`
`2510`	`2511`	`StringBuilder sb = new StringBuilder(256);`
`2511`	`2512`
`2512`	`2513`	`sb.append(RFCCodes.RFCStreamReadCmd);`
`2513`	`2514`	`sb.append("{ \"format\" : \"binary\",\n");`
`2514`	`2515`	`sb.append("\"replyLimit\" : " + this.maxReadSizeKB + ",\n");`
`2515`	`2516`
	`2517`	`+ String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);`
`2516`	`2518`	`final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";`
`2517`	`2519`	`sb.append(trace);`
`2518`	`2520`
`@@ -2529,13 +2531,14 @@ private String makeTokenRequest()`
`2529`	`2531`	`return sb.toString();`
`2530`	`2532`	`}`
`2531`	`2533`
`2532`		`- private String makeCloseHandleRequest()`
	`2534`	`+ private String makeCloseHandleRequest(Span span)`
`2533`	`2535`	`{`
`2534`	`2536`	`StringBuilder sb = new StringBuilder(256);`
`2535`	`2537`
`2536`	`2538`	`sb.append("{ \"format\" : \"binary\",\n");`
`2537`	`2539`	`sb.append(" \"handle\" : \"" + Integer.toString(this.handle) + "\",");`
`2538`	`2540`
	`2541`	`+ String traceContextHeader = org.hpccsystems.ws.client.utils.Utils.getTraceParentHeader(span);`
`2539`	`2542`	`final String trace = traceContextHeader != null ? "\"_trace\": { \"traceparent\" : \"" + traceContextHeader + "\" },\n" : "";`
`2540`	`2543`	`sb.append(trace);`
`2541`	`2544`
`@@ -2562,7 +2565,7 @@ private void sendCloseFileRequest() throws IOException`
`2562`	`2565`	`closeSpan.setStatus(StatusCode.OK);`
`2563`	`2566`	`}`
`2564`	`2567`
`2565`		`- String closeFileRequest = makeCloseHandleRequest();`
	`2568`	`+ String closeFileRequest = makeCloseHandleRequest(closeSpan);`
`2566`	`2569`	`int jsonRequestLen = closeFileRequest.length();`
`2567`	`2570`
`2568`	`2571`	`try`