Traces: Enable showing trace ids (#71950)

* traces: enable showing trace ids by default

* removed unused imports
This commit is contained in:
Gábor Farkas 2023-07-20 07:59:38 +02:00 committed by GitHub
parent 16562faea6
commit 2c82a6b6c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 3 additions and 21 deletions

View File

@ -88,7 +88,6 @@ Experimental features might be changed or removed without prior notice.
| `showDashboardValidationWarnings` | Show warnings when dashboards do not validate against the schema |
| `mysqlAnsiQuotes` | Use double quotes to escape keyword in a MySQL query |
| `nestedFolderPicker` | Enables the still in-development new folder picker to support nested folders |
| `showTraceId` | Show trace ids for requests |
| `alertingBacktesting` | Rule backtesting API for alerting |
| `editPanelCSVDragAndDrop` | Enables drag and drop for CSV and Excel files |
| `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals |

View File

@ -55,7 +55,6 @@ export interface FeatureToggles {
nestedFolders?: boolean;
nestedFolderPicker?: boolean;
accessTokenExpirationCheck?: boolean;
showTraceId?: boolean;
emptyDashboardPage?: boolean;
disablePrometheusExemplarSampling?: boolean;
alertingBacktesting?: boolean;

View File

@ -251,12 +251,6 @@ var (
Stage: FeatureStageGeneralAvailability,
Owner: grafanaAuthnzSquad,
},
{
Name: "showTraceId",
Description: "Show trace ids for requests",
Stage: FeatureStageExperimental,
Owner: grafanaObservabilityLogsSquad,
},
{
Name: "emptyDashboardPage",
Description: "Enable the redesigned user interface of a dashboard page that includes no panels",

View File

@ -36,7 +36,6 @@ accessControlOnCall,preview,@grafana/grafana-authnz-team,false,false,false,false
nestedFolders,preview,@grafana/backend-platform,false,false,false,false
nestedFolderPicker,experimental,@grafana/grafana-frontend-platform,false,false,false,false
accessTokenExpirationCheck,GA,@grafana/grafana-authnz-team,false,false,false,false
showTraceId,experimental,@grafana/observability-logs,false,false,false,false
emptyDashboardPage,GA,@grafana/dashboards-squad,false,false,false,true
disablePrometheusExemplarSampling,GA,@grafana/observability-metrics,false,false,false,false
alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false,false

1 Name Stage Owner requiresDevMode RequiresLicense RequiresRestart FrontendOnly
36 nestedFolders preview @grafana/backend-platform false false false false
37 nestedFolderPicker experimental @grafana/grafana-frontend-platform false false false false
38 accessTokenExpirationCheck GA @grafana/grafana-authnz-team false false false false
showTraceId experimental @grafana/observability-logs false false false false
39 emptyDashboardPage GA @grafana/dashboards-squad false false false true
40 disablePrometheusExemplarSampling GA @grafana/observability-metrics false false false false
41 alertingBacktesting experimental @grafana/alerting-squad false false false false

View File

@ -155,10 +155,6 @@ const (
// Enable OAuth access_token expiration check and token refresh using the refresh_token
FlagAccessTokenExpirationCheck = "accessTokenExpirationCheck"
// FlagShowTraceId
// Show trace ids for requests
FlagShowTraceId = "showTraceId"
// FlagEmptyDashboardPage
// Enable the redesigned user interface of a dashboard page that includes no panels
FlagEmptyDashboardPage = "emptyDashboardPage"

View File

@ -1,7 +1,6 @@
import React from 'react';
import { DataQueryError } from '@grafana/data';
import { config } from '@grafana/runtime';
import { Alert, JSONFormatter } from '@grafana/ui';
interface InspectErrorTabProps {
@ -37,7 +36,7 @@ function renderError(error: DataQueryError) {
<>
{error.status && <>Status: {error.status}. Message: </>}
{msg}
{config.featureToggles.showTraceId && error.traceId != null && (
{error.traceId != null && (
<>
<br />
(Trace ID: {error.traceId})

View File

@ -3,7 +3,6 @@ import React from 'react';
import { PanelData, QueryResultMetaStat, TimeZone } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { config } from '@grafana/runtime';
import { t } from 'app/core/internationalization';
import { InspectStatsTable } from './InspectStatsTable';
@ -67,9 +66,7 @@ export const InspectStatsTab = ({ data, timeZone }: InspectStatsTabProps) => {
<div aria-label={selectors.components.PanelInspector.Stats.content} className={containerStyles}>
<InspectStatsTable timeZone={timeZone} name={statsTableName} stats={stats} />
<InspectStatsTable timeZone={timeZone} name={dataStatsTableName} stats={dataStats} />
{config.featureToggles.showTraceId && (
<InspectStatsTraceIdsTable name={traceIdsStatsTableName} traceIds={data.traceIds ?? []} />
)}
</div>
);
};

View File

@ -2,7 +2,6 @@ import { css } from '@emotion/css';
import React from 'react';
import { DataQueryError, GrafanaTheme2 } from '@grafana/data';
import { config } from '@grafana/runtime';
import { Icon, useStyles2 } from '@grafana/ui';
export interface Props {
@ -21,7 +20,7 @@ export function QueryErrorAlert({ error }: Props) {
</div>
<div className={styles.message}>
{message}
{config.featureToggles.showTraceId && error.traceId != null && (
{error.traceId != null && (
<>
<br /> <span>(Trace ID: {error.traceId})</span>
</>