Commit 0fe3b78a by Andrej Ocenas Committed by GitHub

Show full traceID and better discern multiple stackTraces (#27710)

parent 9e3def42
...@@ -130,6 +130,10 @@ const getStyles = createStyle((theme: Theme) => { ...@@ -130,6 +130,10 @@ const getStyles = createStyle((theme: Theme) => {
font-size: 1.78em; font-size: 1.78em;
margin-right: 0.15em; margin-right: 0.15em;
`, `,
TracePageHeaderTraceId: css`
label: TracePageHeaderTraceId;
white-space: nowrap;
`,
}; };
}); });
...@@ -238,7 +242,7 @@ export default function TracePageHeader(props: TracePageHeaderEmbedProps) { ...@@ -238,7 +242,7 @@ export default function TracePageHeader(props: TracePageHeaderEmbedProps) {
const title = ( const title = (
<h1 className={cx(styles.TracePageHeaderTitle, canCollapse && styles.TracePageHeaderTitleCollapsible)}> <h1 className={cx(styles.TracePageHeaderTitle, canCollapse && styles.TracePageHeaderTitleCollapsible)}>
<TraceName traceName={getTraceName(trace.spans)} />{' '} <TraceName traceName={getTraceName(trace.spans)} />{' '}
<small className={uTxMuted}>{trace.traceID.slice(0, 7)}</small> <small className={cx(styles.TracePageHeaderTraceId, uTxMuted)}>{trace.traceID}</small>
</h1> </h1>
); );
......
...@@ -225,16 +225,26 @@ export default function SpanDetail(props: SpanDetailProps) { ...@@ -225,16 +225,26 @@ export default function SpanDetail(props: SpanDetailProps) {
label="Stack trace" label="Stack trace"
data={stackTraces} data={stackTraces}
isOpen={isStackTracesOpen} isOpen={isStackTracesOpen}
TextComponent={textComponentProps => ( TextComponent={textComponentProps => {
let text;
if (textComponentProps.data?.length > 1) {
text = textComponentProps.data
.map((stackTrace, index) => `StackTrace ${index + 1}:\n${stackTrace}`)
.join('\n');
} else {
text = textComponentProps.data?.[0];
}
return (
<TextArea <TextArea
className={styles.Textarea} className={styles.Textarea}
style={{ cursor: 'unset' }} style={{ cursor: 'unset' }}
readOnly readOnly
cols={10} cols={10}
rows={10} rows={10}
value={textComponentProps.data} value={text}
/> />
)} );
}}
onToggle={() => stackTracesToggle(spanID)} onToggle={() => stackTracesToggle(spanID)}
/> />
)} )}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment