Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend JSON file reader to handle array of objects with resourceSpans #2254

Closed
wants to merge 7 commits into from
Closed

Extend JSON file reader to handle array of objects with resourceSpans #2254

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d79a743
Extend JSON file reader to handle array of objects with resourceSpans
Adarsh-jaiss Apr 13, 2024
d8b22d7
fixed code and added test-cases
Adarsh-jaiss Apr 21, 2024
455c157
added resolve statement
Adarsh-jaiss Apr 22, 2024
a1a4559
Merge branch 'main' into ui-bug-2225
yurishkuro Apr 22, 2024
b98b96c
Update packages/jaeger-ui/src/utils/readJsonFile.tsx
yurishkuro May 22, 2024
8cd2886
Update packages/jaeger-ui/src/utils/readJsonFile.tsx
yurishkuro May 22, 2024
cd79e73
Merge branch 'main' into ui-bug-2225
yurishkuro May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion packages/jaeger-ui/src/utils/readJsonFile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,21 @@ export default function readJsonFile(fileList: { file: File }): Promise<string>
}
try {
const traceObj = JSON.parse(reader.result);
if ('resourceSpans' in traceObj) {
if (Array.isArray(traceObj) && traceObj.every(obj => 'resourceSpans' in obj)) {
const mergedResourceSpans = traceObj.reduce((acc, obj) => {
acc.push(...obj.resourceSpans);
return acc;
}, []);

const mergedTraceObj = { resourceSpans: mergedResourceSpans };
JaegerAPI.transformOTLP(mergedTraceObj)
yurishkuro marked this conversation as resolved.
Show resolved Hide resolved
.then((result: string) => {
resolve(result);
})
.catch(() => {
reject(new Error(`Error converting traces to OTLP`));
});
} else if ('resourceSpans' in traceObj) {
JaegerAPI.transformOTLP(traceObj)
.then((result: string) => {
resolve(result);
Expand Down