Skip to content
Open
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: 20 additions & 0 deletions static/app/utils/useResettableState.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import {useCallback, useRef, useState} from 'react';

import {defined} from 'sentry/utils';

export function useResettableState<T>(defaultValue: () => T) {
const defaultValueBoxed = useRef(defaultValue);
defaultValueBoxed.current = defaultValue;

const [state, _setState] = useState<T>(defaultValueBoxed.current());

const setState = useCallback((newState: T | null | undefined) => {
if (defined(newState)) {
_setState(newState);
} else if (newState === null) {
_setState(defaultValueBoxed.current());
}
}, []);

return [state, setState] as const;
}
Original file line number Diff line number Diff line change
Expand Up @@ -212,19 +212,28 @@ function itemTypeToRecentSearches(itemType: TraceItemDataset) {
if (itemType === TraceItemDataset.SPANS) {
return SavedSearchType.SPAN;
}
if (itemType === TraceItemDataset.TRACEMETRICS) {
return SavedSearchType.METRIC;
}
return SavedSearchType.LOG;
}

function itemTypeToFilterKeySections(itemType: TraceItemDataset) {
if (itemType === TraceItemDataset.SPANS) {
return SPANS_FILTER_KEY_SECTIONS;
}
if (itemType === TraceItemDataset.TRACEMETRICS) {
return [];
}
return LOGS_FILTER_KEY_SECTIONS;
}

function itemTypeToDefaultPlaceholder(itemType: TraceItemDataset) {
if (itemType === TraceItemDataset.SPANS) {
return t('Search for spans, users, tags, and more');
}
if (itemType === TraceItemDataset.TRACEMETRICS) {
return t('Search for metrics, users, tags, and more');
}
return t('Search for logs, users, tags, and more');
}
19 changes: 1 addition & 18 deletions static/app/views/explore/logs/logsStateQueryParamsProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {ReactNode} from 'react';
import {useCallback, useMemo, useState} from 'react';

import {defined} from 'sentry/utils';
import {useResettableState} from 'sentry/utils/useResettableState';
import {defaultLogFields} from 'sentry/views/explore/contexts/logs/fields';
import {defaultSortBys} from 'sentry/views/explore/contexts/pageParamsContext/sortBys';
import {
Expand Down Expand Up @@ -91,20 +91,3 @@ export function LogsStateQueryParamsProvider({
function defaultAggregateFields() {
return [...defaultGroupBys(), ...defaultVisualizes()];
}

function useResettableState<T>(defaultValue: () => T) {
const [state, _setState] = useState<T>(defaultValue());

const setState = useCallback(
(newState: T | null | undefined) => {
if (defined(newState)) {
_setState(newState);
} else if (newState === null) {
_setState(defaultValue());
}
},
[defaultValue]
);

return [state, setState] as const;
}
2 changes: 1 addition & 1 deletion static/app/views/explore/logs/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ export const TopSectionBody = styled(Body)`
}
`;

export const BottomSectionBody = styled('div')<{sidebarOpen: boolean}>`
export const BottomSectionBody = styled('div')<{sidebarOpen?: boolean}>`
flex: 1;
padding: ${space(1)} ${space(2)} ${space(3)} ${space(2)};
background-color: ${p => p.theme.backgroundSecondary};
Expand Down
72 changes: 72 additions & 0 deletions static/app/views/explore/metrics/metricRow.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import {useMemo} from 'react';

import {SearchQueryBuilderProvider} from 'sentry/components/searchQueryBuilder/context';
import {
TraceItemSearchQueryBuilder,
useSearchQueryBuilderProps,
type TraceItemSearchQueryBuilderProps,
} from 'sentry/views/explore/components/traceItemSearchQueryBuilder';
import {useMetricVisualize} from 'sentry/views/explore/metrics/metricsQueryParams';
import {type TraceMetric} from 'sentry/views/explore/metrics/traceMetric';
import {
useQueryParamsGroupBys,
useQueryParamsQuery,
useSetQueryParamsQuery,
} from 'sentry/views/explore/queryParams/context';
import {TraceItemDataset} from 'sentry/views/explore/types';

interface MetricRowProps {
traceMetric: TraceMetric;
}

export function MetricRow({traceMetric}: MetricRowProps) {
const query = useQueryParamsQuery();
const setQuery = useSetQueryParamsQuery();

const tracesItemSearchQueryBuilderProps: TraceItemSearchQueryBuilderProps =
useMemo(() => {
return {
itemType: TraceItemDataset.TRACEMETRICS,
numberAttributes: {},
stringAttributes: {},
numberSecondaryAliases: {},
stringSecondaryAliases: {},
initialQuery: query,
onSearch: setQuery,
searchSource: 'tracemetrics',
};
}, [query, setQuery]);

const searchQueryBuilderProviderProps = useSearchQueryBuilderProps(
tracesItemSearchQueryBuilderProps
);

return (
<SearchQueryBuilderProvider {...searchQueryBuilderProviderProps}>
<MetricToolbar
tracesItemSearchQueryBuilderProps={tracesItemSearchQueryBuilderProps}
traceMetric={traceMetric}
/>
</SearchQueryBuilderProvider>
);
}

interface MetricToolbarProps {
traceMetric: TraceMetric;
tracesItemSearchQueryBuilderProps: TraceItemSearchQueryBuilderProps;
}

function MetricToolbar({
tracesItemSearchQueryBuilderProps,
traceMetric,
}: MetricToolbarProps) {
const visualize = useMetricVisualize();
const groupBys = useQueryParamsGroupBys();
const query = useQueryParamsQuery();
return (
<div>
{traceMetric.name}/{visualize.yAxis}/ by {groupBys.join(',')}/ where {query}
<TraceItemSearchQueryBuilder {...tracesItemSearchQueryBuilderProps} />
</div>
);
}
62 changes: 62 additions & 0 deletions static/app/views/explore/metrics/metricsQueryParams.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import type {ReactNode} from 'react';
import {useCallback, useMemo} from 'react';

import {useResettableState} from 'sentry/utils/useResettableState';
import {Mode} from 'sentry/views/explore/contexts/pageParamsContext/mode';
import {
QueryParamsContextProvider,
useQueryParamsVisualizes,
} from 'sentry/views/explore/queryParams/context';
import {ReadableQueryParams} from 'sentry/views/explore/queryParams/readableQueryParams';
import {VisualizeFunction} from 'sentry/views/explore/queryParams/visualize';
import type {WritableQueryParams} from 'sentry/views/explore/queryParams/writableQueryParams';

interface MetricsQueryParamsProviderProps {
children: ReactNode;
}

export function MetricsQueryParamsProvider({children}: MetricsQueryParamsProviderProps) {
const [query, setQuery] = useResettableState(() => '');

const readableQueryParams = useMemo(() => {
return new ReadableQueryParams({
extrapolate: true,
mode: Mode.AGGREGATE,
query,

cursor: '',
fields: ['id', 'timestamp'],
sortBys: [{field: 'timestamp', kind: 'desc'}],

aggregateCursor: '',
aggregateFields: [new VisualizeFunction('sum(value)')],
aggregateSortBys: [{field: 'sum(value)', kind: 'desc'}],
});
}, [query]);

const setWritableQueryParams = useCallback(
(writableQueryParams: WritableQueryParams) => {
setQuery(writableQueryParams.query);
},
[setQuery]
);

return (
<QueryParamsContextProvider
queryParams={readableQueryParams}
setQueryParams={setWritableQueryParams}
isUsingDefaultFields
shouldManageFields={false}
>
{children}
</QueryParamsContextProvider>
);
}

export function useMetricVisualize() {
const visualizes = useQueryParamsVisualizes();
if (visualizes.length === 1) {
return visualizes[0]!;
}
throw new Error('Only 1 visualize per metric allowed');
}
88 changes: 57 additions & 31 deletions static/app/views/explore/metrics/metricsTab.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import {Fragment, useMemo} from 'react';

import * as Layout from 'sentry/components/layouts/thirds';
import {DatePageFilter} from 'sentry/components/organizations/datePageFilter';
import {EnvironmentPageFilter} from 'sentry/components/organizations/environmentPageFilter';
import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
import {SearchQueryBuilderProvider} from 'sentry/components/searchQueryBuilder/context';
import {t} from 'sentry/locale';
import {useSearchQueryBuilderProps} from 'sentry/views/explore/components/traceItemSearchQueryBuilder';
import {
BottomSectionBody,
FilterBarContainer,
StyledPageFilterBar,
TopSectionBody,
} from 'sentry/views/explore/logs/styles';
import {TraceItemDataset} from 'sentry/views/explore/types';
import {MetricRow} from 'sentry/views/explore/metrics/metricRow';
import {MetricsQueryParamsProvider} from 'sentry/views/explore/metrics/metricsQueryParams';
import {type TraceMetric} from 'sentry/views/explore/metrics/traceMetric';
import type {PickableDays} from 'sentry/views/explore/utils';

type LogsTabProps = PickableDays;
Expand All @@ -21,34 +23,58 @@ export function MetricsTabContent({
maxPickableDays,
relativeOptions,
}: LogsTabProps) {
const searchQueryBuilderProviderProps = useSearchQueryBuilderProps({
itemType: TraceItemDataset.TRACEMETRICS,
numberAttributes: {},
stringAttributes: {},
numberSecondaryAliases: {},
stringSecondaryAliases: {},
initialQuery: '',
searchSource: 'ourmetrics',
});
return (
<SearchQueryBuilderProvider {...searchQueryBuilderProviderProps}>
<TopSectionBody noRowGap>
<Layout.Main fullWidth>
<FilterBarContainer>
<StyledPageFilterBar condensed>
<ProjectPageFilter />
<EnvironmentPageFilter />
<DatePageFilter
defaultPeriod={defaultPeriod}
maxPickableDays={maxPickableDays}
relativeOptions={relativeOptions}
searchPlaceholder={t('Custom range: 2h, 4d, 3w')}
/>
</StyledPageFilterBar>
</FilterBarContainer>
</Layout.Main>
</TopSectionBody>
<BottomSectionBody sidebarOpen={false}>Currently in development</BottomSectionBody>
</SearchQueryBuilderProvider>
<Fragment>
<MetricsTabFilterSection
defaultPeriod={defaultPeriod}
maxPickableDays={maxPickableDays}
relativeOptions={relativeOptions}
/>
<MetricsTabBodySection />
</Fragment>
);
}

function MetricsTabFilterSection({
defaultPeriod,
maxPickableDays,
relativeOptions,
}: PickableDays) {
return (
<TopSectionBody noRowGap>
<Layout.Main fullWidth>
<FilterBarContainer>
<StyledPageFilterBar condensed>
<ProjectPageFilter />
<EnvironmentPageFilter />
<DatePageFilter
defaultPeriod={defaultPeriod}
maxPickableDays={maxPickableDays}
relativeOptions={relativeOptions}
searchPlaceholder={t('Custom range: 2h, 4d, 3w')}
/>
</StyledPageFilterBar>
</FilterBarContainer>
</Layout.Main>
</TopSectionBody>
);
}

function MetricsTabBodySection() {
const traceMetrics: TraceMetric[] = useMemo(() => {
return [{name: 'myfirstmetric'}, {name: 'mysecondmetric'}];
}, []);

return (
<BottomSectionBody>
{traceMetrics.map((traceMetric, index) => {
return (
// TODO: figure out a better `key`
<MetricsQueryParamsProvider key={index}>
<MetricRow traceMetric={traceMetric} />
</MetricsQueryParamsProvider>
);
})}
</BottomSectionBody>
);
}
3 changes: 3 additions & 0 deletions static/app/views/explore/metrics/traceMetric.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface TraceMetric {
name: string;
}