fix: instead of trace id, send request correlation id in WireQueryAdapter

GitOrigin-RevId: da0d07a8d5144c5427eb0d903af9613b625b0257

Author: wnederhof

README.md

@@ -1,5 +1,6 @@
 [![Docker Images](https://img.shields.io/badge/docker-latest-blue)](https://github.com/orgs/wirequery/packages?repo_name=wirequery&ecosystem=container)
 [![Maven Central](https://img.shields.io/maven-central/v/com.wirequery/wirequery-spring-boot-3-starter)](https://central.sonatype.com/search?q=com.wirequery)
+[![NPM](https://img.shields.io/npm/v/@wirequery/wirequery-js-core)](https://www.npmjs.com/package/@wirequery/wirequery-js-core)
 
 # WireQuery
 

sdk/js/examples/shop/package-lock.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@wirequery/wirequery-js-core": "0.0.4",
+    "@wirequery/wirequery-js-core": "0.0.5",
     "@mantine/core": "^7.1.5",
     "@mantine/hooks": "^7.1.5",
     "@next/font": "13.5.5",

sdk/js/examples/shop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirequery/wirequery-js-core",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "WireQuery JS SDK Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

sdk/js/wirequery-js-core/package.json

@@ -316,16 +316,19 @@ function initXhrObserver(
     'open',
     (originalOpen: any) => {
       // @ts-ignore
-      const x: any = this
       return function (
         method: string,
         url: string | URL,
         async = true,
         username?: string | null,
         password?: string | null,
       ) {
-        const xhr = x as XMLHttpRequest;
+        const xhr = this as XMLHttpRequest;
         const req = new Request(url);
+        if ((window as any).recordingCorrelationId) {
+          req.headers.set('wirequery-request-correlation-id', crypto.randomUUID())
+          req.headers.set('wirequery-recording-correlation-id', (window as any).recordingCorrelationId)
+        }
         const networkRequest: Partial<NetworkRequest> = {};
         let after: number | undefined;
         let before: number | undefined;
@@ -457,6 +460,10 @@ function initFetchObserver(
         });
         if (recordRequestHeaders) {
           networkRequest.requestHeaders = requestHeaders;
+        } else {
+          if (requestHeaders['wirequery-request-correlation-id']) {
+            networkRequest.requestHeaders = {'wirequery-request-correlation-id': requestHeaders['wirequery-request-correlation-id']};
+          }
         }
         if (shouldRecordBody('request', options.recordBody, requestHeaders)) {
           if (req.body === undefined || req.body === null) {

sdk/js/wirequery-js-core/src/core/recordNetworkPlugin.ts

@@ -183,7 +183,7 @@ class WireQueryAdapter(
                 .setStartTime(startTime)
                 .setEndTime(endTime)
                 .let { if (traceId != null) it.setTraceId(traceId) else it }
-                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(traceId) else it }
+                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(requestCorrelationId) else it }
                 .build()
     }
 
@@ -202,7 +202,7 @@ class WireQueryAdapter(
                 .setStartTime(startTime)
                 .setEndTime(endTime)
                 .let { if (traceId != null) it.setTraceId(traceId) else it }
-                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(traceId) else it }
+                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(requestCorrelationId) else it }
                 .build()
     }
 

sdk/jvm/wirequery-spring-5/src/main/kotlin/com/wirequery/spring5/WireQueryAdapter.kt

@@ -183,7 +183,7 @@ class WireQueryAdapter(
                 .setStartTime(startTime)
                 .setEndTime(endTime)
                 .let { if (traceId != null) it.setTraceId(traceId) else it }
-                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(traceId) else it }
+                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(requestCorrelationId) else it }
                 .build()
     }
 
@@ -202,7 +202,7 @@ class WireQueryAdapter(
                 .setStartTime(startTime)
                 .setEndTime(endTime)
                 .let { if (traceId != null) it.setTraceId(traceId) else it }
-                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(traceId) else it }
+                .let { if (requestCorrelationId != null) it.setRequestCorrelationId(requestCorrelationId) else it }
                 .build()
     }
 

sdk/jvm/wirequery-spring-6/src/main/kotlin/com/wirequery/spring6/WireQueryAdapter.kt

@@ -118,15 +118,16 @@ class QueryLogService(
         jdbcTemplate.update {
             val ps =
                 it.prepareStatement(
-                    "INSERT INTO query_logs (stored_query_id, message, start_time, end_time, app_name, trace_id, created_at, main) VALUES (?, ?, ?, ?, ?, ?, ?, TRUE)",
+                    "INSERT INTO query_logs (stored_query_id, message, start_time, end_time, app_name, trace_id, request_correlation_id, created_at, main) VALUES (?, ?, ?, ?, ?, ?, ?, ?, TRUE)",
                 )
             ps.setInt(1, input.storedQueryId)
             ps.setString(2, input.message)
             ps.setLong(3, input.startTime)
             ps.setLong(4, input.endTime)
             ps.setString(5, input.appName)
             ps.setString(6, queryLogEntity.traceId)
-            ps.setTimestamp(7, ts)
+            ps.setString(7, queryLogEntity.requestCorrelationId)
+            ps.setTimestamp(8, ts)
             ps
         }
 
@@ -140,7 +141,7 @@ class QueryLogService(
         return queryLog
     }
 
-    /** Stores as non-tracing log. */
+    /** Stores as tracing log. */
     fun putTrace(storedQuery: QueryReport): QueryLog? {
         val storedQueryId = storedQuery.queryId.split(":")[1].toInt()
 
@@ -167,15 +168,16 @@ class QueryLogService(
         jdbcTemplate.update {
             val ps =
                 it.prepareStatement(
-                    "INSERT INTO query_logs (stored_query_id, message, start_time, end_time, app_name, trace_id, created_at, main) VALUES (?, ?, ?, ?, ?, ?, ?, FALSE)",
+                    "INSERT INTO query_logs (stored_query_id, message, start_time, end_time, app_name, trace_id, request_correlation_id, created_at, main) VALUES (?, ?, ?, ?, ?, ?, ?, ?, FALSE)",
                 )
             ps.setInt(1, queryLogEntity.storedQueryId)
             ps.setString(2, queryLogEntity.message)
             ps.setLong(3, queryLogEntity.startTime)
             ps.setLong(4, queryLogEntity.endTime)
             ps.setString(5, queryLogEntity.appName)
             ps.setString(6, queryLogEntity.traceId)
-            ps.setTimestamp(7, ts)
+            ps.setString(7, queryLogEntity.requestCorrelationId)
+            ps.setTimestamp(8, ts)
             ps
         }
 

wirequery/manager-server/src/main/kotlin/com/wirequery/manager/domain/querylog/QueryLogService.kt

@@ -48,7 +48,7 @@ export const NetworkCalls = (props: {
             {new Date(call.events[0].start).toLocaleTimeString()} (
             {call.events[0].end - call.events[0].start}ms)
           </div>
-          <div style={{ marginTop: 10, marginBottom: 10 }}>
+          <div style={{marginTop: 10, marginBottom: 10}}>
             <div>{call.url}</div>
             <div style={{ float: 'right', marginRight: '15px' }}>
               {props.correlationMap?.[call.correlationId] ? (