Allow uploading JSON-per-line OTLP data

packages/jaeger-ui/src/utils/fixtures/otlp2jaeger-multi-in.json.txt

@@ -0,0 +1,4 @@
+{"resourceSpans":[{"resource":{"attributes":[{"key":"service.name","value":{"stringValue":"example-trace"}},{"key":"telemetry.sdk.language","value":{"stringValue":"nodejs"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.version","value":{"stringValue":"1.22.0"}}]},"scopeSpans":[{"scope":{"name":"ohboy"},"spans":[{"traceId":"c620759e5d60fafb8ee0922b30e06bc6","spanId":"26f5ef9dbb885479","parentSpanId":"49b8e9efa1e8a3b1","name":"ohboy.do","kind":1,"startTimeUnixNano":"1711138246978000000","endTimeUnixNano":"1711138247024460625","status":{}}]}]}]}
+{"resourceSpans":[{"resource":{"attributes":[{"key":"service.name","value":{"stringValue":"example-trace"}},{"key":"telemetry.sdk.language","value":{"stringValue":"nodejs"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.version","value":{"stringValue":"1.22.0"}}]},"scopeSpans":[{"scope":{"name":"ohboy"},"spans":[{"traceId":"c620759e5d60fafb8ee0922b30e06bc6","spanId":"e76628f4e6dde174","parentSpanId":"49b8e9efa1e8a3b1","name":"ohboy.do","kind":1,"startTimeUnixNano":"1711138247025000000","endTimeUnixNano":"1711138247096355250","status":{}}]}]}]}
+{"resourceSpans":[{"resource":{"attributes":[{"key":"service.name","value":{"stringValue":"example-trace"}},{"key":"telemetry.sdk.language","value":{"stringValue":"nodejs"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.version","value":{"stringValue":"1.22.0"}}]},"scopeSpans":[{"scope":{"name":"widgets","version":"1.2.3"},"spans":[{"traceId":"c620759e5d60fafb8ee0922b30e06bc6","spanId":"49b8e9efa1e8a3b1","parentSpanId":"eff3153be6b1fb93","name":"info","kind":1,"startTimeUnixNano":"1711138246943000000","endTimeUnixNano":"1711138247116150875","status":{}}]}]}]}
+{"resourceSpans":[{"resource":{"attributes":[{"key":"service.name","value":{"stringValue":"example-trace"}},{"key":"telemetry.sdk.language","value":{"stringValue":"nodejs"}},{"key":"telemetry.sdk.name","value":{"stringValue":"opentelemetry"}},{"key":"telemetry.sdk.version","value":{"stringValue":"1.22.0"}}]},"scopeSpans":[{"scope":{"name":"widgets","version":"1.2.3"},"spans":[{"traceId":"c620759e5d60fafb8ee0922b30e06bc6","spanId":"eff3153be6b1fb93","parentSpanId":"","name":"main","kind":1,"startTimeUnixNano":"1711138246940000000","endTimeUnixNano":"1711138247116321958","status":{}}]}]}]}

packages/jaeger-ui/src/utils/readJsonFile.test.js

@@ -72,4 +72,17 @@ describe('fileReader.readJsonFile', () => {
     const p = readJsonFile({ file });
     return expect(p).rejects.toMatchObject(expect.any(Error));
   });
+
+  it('loads multiple JSON data', () => {
+    let fileContent;
+    try {
+      fileContent = fs.readFileSync('src/utils/fixtures/otlp2jaeger-multi-in.json.txt', 'utf-8');
+    } catch (err) {
+      console.error('Error reading file:', err);
+      throw err;
+    }
+    const file = new File([fileContent], 'multi.json', { type: 'application/json' });
+    const p = readJsonFile({ file });
+    expect(p).resolves.toBeDefined();
+  });
 });

packages/jaeger-ui/src/utils/readJsonFile.tsx

@@ -14,6 +14,22 @@
 
 import JaegerAPI from '../api/jaeger';
 
+function tryParseMultiLineInput(input: string): any[] {
+  const jsonStrings = input.split('\n').filter((line: string) => line.trim() !== '');
+  const parsedObjects: any[] = [];
+
+  jsonStrings.forEach((jsonString: string) => {
+    try {
+      const traceObj = JSON.parse(jsonString.trim());
+      parsedObjects.push(traceObj);
+    } catch (error) {
+      throw new Error(`Error parsing JSON: ${(error as Error).message}`);
+    }
+  });
+
+  return parsedObjects;
+}
+
 export default function readJsonFile(fileList: { file: File }): Promise<string> {
   return new Promise((resolve, reject) => {
     const reader = new FileReader();
@@ -22,21 +38,36 @@ export default function readJsonFile(fileList: { file: File }): Promise<string>
         reject(new Error('Invalid result type'));
         return;
       }
+      let traceObj;
       try {
-        const traceObj = JSON.parse(reader.result);
-        if ('resourceSpans' in traceObj) {
-          JaegerAPI.transformOTLP(traceObj)
-            .then((result: string) => {
-              resolve(result);
-            })
-            .catch(() => {
-              reject(new Error(`Error converting traces to OTLP`));
-            });
-        } else {
-          resolve(traceObj);
+        traceObj = JSON.parse(reader.result);
+      } catch (error) {
+        try {
+          traceObj = tryParseMultiLineInput(reader.result);
+        } catch (error) {
+          reject(new Error(`Error processing JSON: ${(error as Error).message}`));
+          return;
         }
-      } catch (error: unknown) {
-        reject(new Error(`Error parsing JSON: ${(error as Error).message}`));
+      }
+      if (Array.isArray(traceObj) && traceObj.every(obj => 'resourceSpans' in obj)) {
+        const mergedResourceSpans = traceObj.reduce((acc, obj) => {
+          acc.push(...obj.resourceSpans);
+          return acc;
+        }, []);
+
+        traceObj = { resourceSpans: mergedResourceSpans };
+      }
+
+      if ('resourceSpans' in traceObj) {
+        JaegerAPI.transformOTLP(traceObj)
+          .then((result: string) => {
+            resolve(result);
+          })
+          .catch(() => {
+            reject(new Error('Error converting traces to OTLP'));
+          });
+      } else {
+        resolve(traceObj);
       }
     };
     reader.onerror = () => {
@@ -48,7 +79,7 @@ export default function readJsonFile(fileList: { file: File }): Promise<string>
     };
     try {
       reader.readAsText(fileList.file);
-    } catch (error: unknown) {
+    } catch (error) {
       reject(new Error(`Error reading the JSON file: ${(error as Error).message}`));
     }
   });