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.

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

Add to investigation #320

Merged
merged 9 commits into from
Feb 17, 2025
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
1 change: 1 addition & 0 deletions cspell.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"gdev",
"lokiexplore",
"viewports",
"overriden",
"analysing"
]
}
4 changes: 2 additions & 2 deletions src/components/Explore/TracesByService/MiniREDPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { EmptyStateScene } from 'components/states/EmptyState/EmptyStateScene';
import { LoadingStateScene } from 'components/states/LoadingState/LoadingStateScene';
import { SkeletonComponent } from '../ByFrameRepeater';
import { barsPanelConfig } from '../panels/barsPanel';
import { rateByWithStatus } from '../queries/rateByWithStatus';
import { metricByWithStatus } from '../queries/generateMetricsQuery';
import { StepQueryRunner } from '../queries/StepQueryRunner';
import { RadioButtonList, useStyles2 } from '@grafana/ui';
import { css } from '@emotion/css';
Expand Down Expand Up @@ -87,7 +87,7 @@ export class MiniREDPanel extends SceneObjectBase<MiniREDPanelState> {
$data: new StepQueryRunner({
maxDataPoints: this.state.metric === 'duration' ? 24 : 64,
datasource: explorationDS,
queries: [this.state.metric === 'duration' ? buildHistogramQuery() : rateByWithStatus(this.state.metric)],
queries: [this.state.metric === 'duration' ? buildHistogramQuery() : metricByWithStatus(this.state.metric)],
}),
transformations: [...exemplarsTransformations(traceExploration.state.locationService)],
}),
Expand Down
4 changes: 2 additions & 2 deletions src/components/Explore/TracesByService/REDPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { EmptyStateScene } from 'components/states/EmptyState/EmptyStateScene';
import { LoadingStateScene } from 'components/states/LoadingState/LoadingStateScene';
import { SkeletonComponent } from '../ByFrameRepeater';
import { barsPanelConfig } from '../panels/barsPanel';
import { rateByWithStatus } from '../queries/rateByWithStatus';
import { metricByWithStatus } from '../queries/generateMetricsQuery';
import { StepQueryRunner } from '../queries/StepQueryRunner';
import { css } from '@emotion/css';
import { RadioButtonList, useStyles2 } from '@grafana/ui';
Expand Down Expand Up @@ -179,7 +179,7 @@ export class REDPanel extends SceneObjectBase<RateMetricsPanelState> {
$data: new StepQueryRunner({
maxDataPoints: this.isDuration() ? 24 : 64,
datasource: explorationDS,
queries: [this.isDuration() ? buildHistogramQuery() : rateByWithStatus(metric)],
queries: [this.isDuration() ? buildHistogramQuery() : metricByWithStatus(metric)],
}),
transformations: [...exemplarsTransformations(traceExploration.state.locationService)],
}),
Expand Down
89 changes: 89 additions & 0 deletions src/components/Explore/actions/AddToInvestigationButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import { TimeRange } from '@grafana/data';
import { sceneGraph, SceneObject, SceneObjectBase, SceneObjectState, SceneQueryRunner } from '@grafana/scenes';
import { DataQuery, DataSourceRef } from '@grafana/schema';

import Logo from '../../../../src/img/logo.svg';
import { VAR_DATASOURCE_EXPR } from 'utils/shared';

export interface AddToInvestigationButtonState extends SceneObjectState {
dsUid?: string;
query?: string;
labelValue?: string;
context?: ExtensionContext;
queries: DataQuery[];
}

interface ExtensionContext {
timeRange: TimeRange;
queries: DataQuery[];
datasource: DataSourceRef;
origin: string;
url: string;
type: string;
title: string;
id: string;
logoPath: string;
}

export class AddToInvestigationButton extends SceneObjectBase<AddToInvestigationButtonState> {
constructor(state: Omit<AddToInvestigationButtonState, 'queries'>) {
super({ ...state, queries: [] });

this.addActivationHandler(this._onActivate.bind(this));
}

private _onActivate = () => {
this._subs.add(
this.subscribeToState(() => {
this.getQueries();
this.getContext();
})
);

const datasourceUid = sceneGraph.interpolate(this, VAR_DATASOURCE_EXPR);
this.setState({ dsUid: datasourceUid });
};

private readonly getQueries = () => {
const data = sceneGraph.getData(this);
const queryRunner = sceneGraph.findObject(data, isQueryRunner);

if (isQueryRunner(queryRunner)) {
const queries = queryRunner.state.queries.map((q) => ({
...q,
query: this.state.query,
}));

if (JSON.stringify(queries) !== JSON.stringify(this.state.queries)) {
this.setState({ queries });
}
}
};

private readonly getContext = () => {
const { queries, dsUid, labelValue } = this.state;
const timeRange = sceneGraph.getTimeRange(this);

if (!timeRange || !queries || !dsUid) {
return;
}
const ctx = {
origin: 'Explore Traces',
type: 'traces',
queries,
timeRange: { ...timeRange.state.value },
datasource: { uid: dsUid },
url: window.location.href,
id: `${JSON.stringify(queries)}`,
title: `${labelValue}`,
logoPath: Logo,
};
if (JSON.stringify(ctx) !== JSON.stringify(this.state.context)) {
this.setState({ context: ctx });
}
};
}

function isQueryRunner(o: SceneObject<SceneObjectState> | null): o is SceneQueryRunner {
return o instanceof SceneQueryRunner;
}
6 changes: 6 additions & 0 deletions src/components/Explore/filters/FilterByVariable.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { renderTraceQLLabelFilters } from "./FilterByVariable";

jest.mock('../../../utils/utils', () => ({
isNumber: {
test: jest.fn().mockReturnValue(false),
},
}));

describe('renderTraceQLLabelFilters', () => {
it('should render empty expression from no filters', () => {
const expression = renderTraceQLLabelFilters([]);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Explore/filters/FilterByVariable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { VariableHide } from '@grafana/schema';

import { FilterSetRenderer } from './FilterSetRenderer';
import { VAR_FILTERS, explorationDS } from 'utils/shared';
import { isNumber } from 'utils/utils';

export type FilterByVariableState = ConstructorParameters<typeof AdHocFiltersVariable>[0] & {
initialFilters?: AdHocVariableFilter[];
Expand Down Expand Up @@ -35,7 +36,6 @@ export function renderTraceQLLabelFilters(filters: AdHocVariableFilter[]) {
// and avoid invalid queries like '{ && key=value }'
return expr.length ? expr : 'true';
}
const isNumber = /^-?\d+\.?\d*$/;

function renderFilter(filter: AdHocVariableFilter) {
let val = filter.value;
Expand Down
3 changes: 3 additions & 0 deletions src/components/Explore/filters/FilterSetRenderer.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jest.mock('../../../utils/utils', () => ({
useState: jest.fn().mockReturnValue('rate'),
}),
}),
isNumber: {
test: jest.fn().mockReturnValue(false),
},
}));

describe('FilterSetRenderer', () => {
Expand Down
20 changes: 16 additions & 4 deletions src/components/Explore/layouts/attributeBreakdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@ import {
SceneDataTransformer,
SceneFlexItem,
SceneFlexLayout,
sceneGraph,
SceneObject,
VizPanelState,
} from '@grafana/scenes';
import { LayoutSwitcher } from '../LayoutSwitcher';
import { explorationDS, GRID_TEMPLATE_COLUMNS, MetricFunction } from '../../../utils/shared';
import { ByFrameRepeater } from '../ByFrameRepeater';
import { getLabelValue, getTraceExplorationScene } from '../../../utils/utils';
import { formatLabelValue, getLabelValue, getTraceExplorationScene } from '../../../utils/utils';
import { map, Observable } from 'rxjs';
import { DataFrame, PanelData, reduceField, ReducerID } from '@grafana/data';
import { rateByWithStatus } from '../queries/rateByWithStatus';
import { generateMetricsQuery, metricByWithStatus } from '../queries/generateMetricsQuery';
import { barsPanelConfig } from '../panels/barsPanel';
import { linesPanelConfig } from '../panels/linesPanel';
import { StepQueryRunner } from '../queries/StepQueryRunner';
import { syncYAxis } from '../behaviors/syncYaxis';
import { exemplarsTransformations } from '../../../utils/exemplars';
import { PanelMenu } from '../panels/PanelMenu';

export function buildNormalLayout(
scene: SceneObject,
Expand All @@ -29,7 +31,7 @@ export function buildNormalLayout(
) {
const traceExploration = getTraceExplorationScene(scene);
const metric = traceExploration.getMetricVariable().getValue() as MetricFunction;
const query = rateByWithStatus(metric, variable.getValueText());
const query = metricByWithStatus(metric, variable.getValueText());

return new LayoutSwitcher({
$behaviors: [syncYAxis()],
Expand Down Expand Up @@ -96,12 +98,22 @@ export function buildNormalLayout(
export function getLayoutChild(
getTitle: (df: DataFrame, labelName: string) => string,
variable: CustomVariable,
metric: string,
metric: MetricFunction,
actionsFn: (df: DataFrame) => VizPanelState['headerActions']
) {
return (data: PanelData, frame: DataFrame) => {
const query = sceneGraph.interpolate(
variable,
generateMetricsQuery({
metric,
extraFilters: `${variable.getValueText()}=${formatLabelValue(getLabelValue(frame))}`,
groupByStatus: true,
})
);

const panel = (metric === 'duration' ? linesPanelConfig().setUnit('s') : barsPanelConfig())
.setTitle(getTitle(frame, variable.getValueText()))
.setMenu(new PanelMenu({ query, labelValue: getLabelValue(frame) }))
.setData(
new SceneDataNode({
data: {
Expand Down
Loading
Loading