Extend JSON file reader to handle array of objects with resourceSpans

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

@@ -72,4 +72,20 @@ describe('fileReader.readJsonFile', () => {
  const p = readJsonFile({ file });
  return expect(p).rejects.toMatchObject(expect.any(Error));
  });
+
+ it('loads JSON data with single resourceSpans array successfully', async () => {
+ const obj = { resourceSpans: [{ id: 1 }, { id: 2 }, { id: 3 }] };
+ const file = new File([JSON.stringify(obj)], 'singleResourceSpans.json');
+ const result = await readJsonFile({ file });
+ expect(result).toEqual(JSON.stringify(obj));
+ });
+
+ it('loads JSON data with multiple resourceSpans arrays successfully', async () => {
+ const obj1 = { resourceSpans: [{ id: 1 }, { id: 2 }] };
+ const obj2 = { resourceSpans: [{ id: 3 }, { id: 4 }] };
+ const file = new File([JSON.stringify([obj1, obj2])], 'multipleResourceSpans.json');
+ const expectedResult = { resourceSpans: [...obj1.resourceSpans, ...obj2.resourceSpans] };
+ const result = await readJsonFile({ file });
+ expect(result).toEqual(JSON.stringify(expectedResult));
+ });
 });

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

@@ -23,7 +23,15 @@ export default function readJsonFile(fileList: { file: File }): Promise<string>
  return;
  }
  try {
- const traceObj = JSON.parse(reader.result);
+ let traceObj = JSON.parse(reader.result);
+ 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) => {
@@ -32,7 +40,7 @@ export default function readJsonFile(fileList: { file: File }): Promise<string>
  .catch(() => {
  reject(new Error(`Error converting traces to OTLP`));
  });
- } else {
+ } else{
  resolve(traceObj);
  }
  } catch (error: unknown) {