Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion web/src/TracingApp.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
import React, { ReactNode } from 'react';
import { QueryParamProvider } from 'use-query-params';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactRouterAdapter } from './react_router_adapter';

interface TracingAppProps {
children: ReactNode;
}

const queryClient = new QueryClient({
defaultOptions: {
queries: {
refetchOnWindowFocus: false,
retry: 0,
},
},
});

/**
* TracingApp is the common entrypoint for all Distributed Tracing UI pages.
* It initializes @tanstack/react-query and use-query-params.
*/
export function TracingApp({ children }: TracingAppProps) {
return <QueryParamProvider adapter={ReactRouterAdapter}>{children}</QueryParamProvider>;
return (
<QueryClientProvider client={queryClient}>
<QueryParamProvider adapter={ReactRouterAdapter}>{children}</QueryParamProvider>
</QueryClientProvider>
);
}
14 changes: 1 addition & 13 deletions web/src/components/PersesWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
} from '@perses-dev/core';
import panelsResource from '@perses-dev/panels-plugin/plugin.json';
import tempoResource from '@perses-dev/tempo-plugin/plugin.json';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { DatasourceApi, DatasourceStoreProvider, VariableProvider } from '@perses-dev/dashboards';
import { ChartThemeColor, getThemeColors } from '@patternfly/react-charts';
import { TempoInstance } from '../hooks/useTempoInstance';
Expand Down Expand Up @@ -86,15 +85,6 @@ const pluginLoader = dynamicImportPluginLoader([
},
]);

const queryClient = new QueryClient({
defaultOptions: {
queries: {
refetchOnWindowFocus: false,
retry: 0,
},
},
});

interface PersesWrapperProps {
children?: React.ReactNode;
}
Expand Down Expand Up @@ -125,9 +115,7 @@ export function PersesWrapper({ children }: PersesWrapperProps) {
return (
<ThemeProvider theme={muiTheme}>
<ChartsProvider chartsTheme={chartsTheme}>
<PluginRegistry pluginLoader={pluginLoader}>
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
</PluginRegistry>
<PluginRegistry pluginLoader={pluginLoader}>{children}</PluginRegistry>
</ChartsProvider>
</ThemeProvider>
);
Expand Down
38 changes: 20 additions & 18 deletions web/src/pages/TraceDetailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,8 @@ import { TracingApp } from '../TracingApp';
import { memo } from 'react';

function TraceDetailPage() {
const { t } = useTranslation('plugin__distributed-tracing-console-plugin');
const { traceId } = useParams();

return (
<TracingApp>
<Helmet>
<title>
{t('Trace')} {traceId} · {t('Tracing')}
</title>
</Helmet>
<PersesWrapper>
<PersesDashboardWrapper>
<TraceDetailPageBody />
Expand Down Expand Up @@ -56,9 +48,7 @@ function TraceDetailPageBody() {
</BreadcrumbItem>
<BreadcrumbItem isActive>{t('Trace details')}</BreadcrumbItem>
</Breadcrumb>
<Title headingLevel="h1">
<TraceTitle />
</Title>
<PageTitle />
<Divider className="pf-v6-u-mt-md" />
</PageSection>
<PageSection isFilled hasBodyWrapper={false}>
Expand All @@ -73,19 +63,31 @@ function TraceDetailPageBody() {
);
}

function TraceTitle() {
function PageTitle() {
const { t } = useTranslation('plugin__distributed-tracing-console-plugin');
const traceName = useTraceName();

return (
<>
<Helmet>
<title>
{t('Trace')} {traceName} · {t('Tracing')}
</title>
</Helmet>
<Title headingLevel="h1">{traceName}</Title>
</>
);
}

function useTraceName() {
const { traceId } = useParams();
const { queryResults } = useDataQueries('TraceQuery');
const trace = queryResults[0]?.data?.trace;

if (!trace) {
return <>{traceId}</>;
return traceId;
}
return (
<>
{trace.rootSpan.resource.serviceName}: {trace.rootSpan.name}
</>
);
return `${trace.rootSpan.resource.serviceName}: ${trace.rootSpan.name}`;
}

const sval = (val?: TraceAttributeValue) =>
Expand Down