IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Traces: Move towards using OTEL naming conventions (#51379)

Browse Source 
* Updates names

* Update tests

* Update betterer results

* Updated betterer.results

* Updated tests
This commit is contained in:
Joey Tawadrous 2022-07-06 11:12:53 +01:00 committed by GitHub
parent df9f86190f
commit 45a00bdc94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.betterer.results
View File

@ -44,7 +44,7 @@ exports[`no enzyme tests`] = {
"packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.test.js:1734982398": [
[14, 26, 13, "RegExp match", "2409514259"]
],
"packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js:700147304": [
"packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js:1241675783": [
[16, 19, 13, "RegExp match", "2409514259"]
],
"packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.js:174536706": [
@ -7044,12 +7044,7 @@ exports[`better eslint`] = {
[0, 0, 0, "Unexpected any. Specify a different type.", "1"]
],
"public/app/features/explore/TraceView/TraceView.test.tsx:5381": [
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
[0, 0, 0, "Unexpected any. Specify a different type.", "4"],
[0, 0, 0, "Unexpected any. Specify a different type.", "5"]
[0, 0, 0, "Parsing error: Merge conflict marker encountered.", "0"]
],
"public/app/features/explore/TraceView/TraceView.tsx:5381": [
[0, 0, 0, "Do not use any type assertions.", "0"],

2
packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js
View File

@ -56,7 +56,7 @@ describe('AccordianLogs tests', () => {
it('shows the number of log entries', () => {
setup();
expect(screen.getByRole('switch', { name: 'Logs (2)' })).toBeInTheDocument();
expect(screen.getByRole('switch', { name: 'Events (2)' })).toBeInTheDocument();
});
it('hides log entries when not expanded', () => {

2
packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
View File

@ -90,7 +90,7 @@ export default function AccordianLogs(props: AccordianLogsProps) {
return (
<div className={styles.AccordianLogs}>
<HeaderComponent className={styles.AccordianLogsHeader} {...headerProps}>
{arrow} <strong>Logs</strong> ({logs.length})
{arrow} <strong>Events</strong> ({logs.length})
</HeaderComponent>
{isOpen && (
<div className={styles.AccordianLogsContent}>

4
packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js
View File

@ -146,14 +146,14 @@ describe('<SpanDetail>', () => {
});
it('renders the span tags', () => {
const target = <AccordianKeyValues data={span.tags} label="Tags" isOpen={detailState.isTagsOpen} />;
const target = <AccordianKeyValues data={span.tags} label="Attributes" isOpen={detailState.isTagsOpen} />;
expect(wrapper.containsMatchingElement(target)).toBe(true);
wrapper.find({ data: span.tags }).simulate('toggle');
expect(props.tagsToggle).toHaveBeenLastCalledWith(span.spanID);
});
it('renders the process tags', () => {
const target = <AccordianKeyValues data={span.process.tags} label="Process" isOpen={detailState.isProcessOpen} />;
const target = <AccordianKeyValues data={span.process.tags} label="Resource" isOpen={detailState.isProcessOpen} />;
expect(wrapper.containsMatchingElement(target)).toBe(true);
wrapper.find({ data: span.process.tags }).simulate('toggle');
expect(props.processToggle).toHaveBeenLastCalledWith(span.spanID);

4
packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx
View File

@ -213,7 +213,7 @@ export default function SpanDetail(props: SpanDetailProps) {
<div>
<AccordianKeyValues
data={tags}
label="Tags"
label="Attributes"
linksGetter={linksGetter}
isOpen={isTagsOpen}
onToggle={() => tagsToggle(spanID)}
@ -222,7 +222,7 @@ export default function SpanDetail(props: SpanDetailProps) {
<AccordianKeyValues
className={ubMb1}
data={process.tags}
label="Process"
label="Resource"
linksGetter={linksGetter}
isOpen={isProcessOpen}
onToggle={() => processToggle(spanID)}

18
public/app/features/explore/TraceView/TraceView.test.tsx
View File

@ -92,14 +92,14 @@ describe('TraceView', () => {
it('toggles detailState', async () => {
renderTraceViewNew();
expect(screen.queryByText(/Tags/)).toBeFalsy();
expect(screen.queryByText(/Attributes/)).toBeFalsy();
const spanView = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[0];
await userEvent.click(spanView);
expect(screen.queryByText(/Tags/)).toBeTruthy();
expect(screen.queryByText(/Attributes/)).toBeTruthy();
await userEvent.click(spanView);
screen.debug(screen.queryAllByText(/Tags/));
expect(screen.queryByText(/Tags/)).toBeFalsy();
screen.debug(screen.queryAllByText(/Attributes/));
expect(screen.queryByText(/Attributes/)).toBeFalsy();
});
it('shows timeline ticks', () => {
@ -118,21 +118,21 @@ describe('TraceView', () => {
const firstSpan = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[0];
await userEvent.click(firstSpan);
await userEvent.click(screen.getByText(/Process/));
await userEvent.click(screen.getByText(/Resource/));
table = screen.getByText('', { selector: 'div[data-testid="KeyValueTable"]' });
expect(table.innerHTML).toContain('client-uuid-1');
await userEvent.click(firstSpan);
const secondSpan = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[1];
await userEvent.click(secondSpan);
await userEvent.click(screen.getByText(/Process/));
await userEvent.click(screen.getByText(/Resource/));
table = screen.getByText('', { selector: 'div[data-testid="KeyValueTable"]' });
expect(table.innerHTML).toContain('client-uuid-2');
await userEvent.click(secondSpan);
const thirdSpan = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[2];
await userEvent.click(thirdSpan);
await userEvent.click(screen.getByText(/Process/));
await userEvent.click(screen.getByText(/Resource/));
table = screen.getByText('', { selector: 'div[data-testid="KeyValueTable"]' });
expect(table.innerHTML).toContain('client-uuid-3');
});
@ -142,10 +142,10 @@ describe('TraceView', () => {
const span = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[2];
await userEvent.click(span);
//Process is in detail view
expect(screen.getByText(/Process/)).toBeInTheDocument();
expect(screen.getByText(/Resource/)).toBeInTheDocument();
rerender(getTraceView([frameNew]));
expect(screen.queryByText(/Process/)).not.toBeInTheDocument();
expect(screen.queryByText(/Resource/)).not.toBeInTheDocument();
});
});