update

Author: stackempty

src/components/queryBuilder/views/TraceQueryBuilder.tsx

@@ -19,8 +19,6 @@ import { OrderByEditor, getOrderByOptions } from '../OrderByEditor';
 import { LimitEditor } from '../LimitEditor';
 import { LabeledInput } from 'components/configEditor/LabeledInput';
 import { Switch } from '../Switch';
-import useTables from 'hooks/useTables';
-import otel from 'otel';
 
 interface TraceQueryBuilderProps {
   datasource: Datasource;
@@ -60,11 +58,6 @@ interface TraceQueryBuilderState {
 export const TraceQueryBuilder = (props: TraceQueryBuilderProps) => {
   const { datasource, builderOptions, builderOptionsDispatch } = props;
   const allColumns = useColumns(datasource, builderOptions.database, builderOptions.table);
-  const tables = useTables(datasource, builderOptions.database);
-  const hasTraceTimestampTable = useMemo(
-    () => tables.some((t) => t === builderOptions.table + otel.traceTimestampTableSuffix),
-    [builderOptions.table, tables]
-  );
   const isNewQuery = useIsNewQuery(builderOptions);
   const [showConfigWarning, setConfigWarningOpen] = useState(
     datasource.getDefaultTraceColumns().size === 0 && builderOptions.columns?.length === 0
@@ -142,7 +135,6 @@ export const TraceQueryBuilder = (props: TraceQueryBuilderProps) => {
           flattenNested: next.flattenNested,
           traceEventsColumnPrefix: next.traceEventsColumnPrefix,
           traceLinksColumnPrefix: next.traceLinksColumnPrefix,
-          hasTraceTimestampTable,
         },
       })
     );

src/data/utils.ts

@@ -154,12 +154,6 @@ export const transformQueryResponseWithTraceAndLogLinks = (
     const traceIdQuery: CHBuilderQuery = {
       datasource: datasource,
       editorType: EditorType.Builder,
-      /**
-       * Evil bug:
-       * The rawSql value might contain time filters such as $__fromTime and $__toTime.
-       * Grafana sees these time range filters as data links and will refuse to enable the traceID link if these are present.
-       * Set rawSql to empty since it gets regenerated when the panel renders anyway.
-       */
       rawSql: '',
       builderOptions: {} as QueryBuilderOptions,
       pluginVersion,
@@ -209,6 +203,7 @@ export const transformQueryResponseWithTraceAndLogLinks = (
           otelVersion: otelVersion,
           traceEventsColumnPrefix: traceEventsColumnPrefix,
           traceLinksColumnPrefix: traceLinksColumnPrefix,
+          hasTraceTimestampTable: Boolean(otelVersion),
         },
       };
 
@@ -224,6 +219,11 @@ export const transformQueryResponseWithTraceAndLogLinks = (
       traceIdQuery.builderOptions = options;
     }
 
+    // Pre-generate rawSql so the query executes immediately when the link is opened.
+    // Trace ID queries don't contain $__fromTime/$__toTime time macros, so they're
+    // safe to include (unlike trace search queries which would break data link detection).
+    traceIdQuery.rawSql = generateSql(traceIdQuery.builderOptions);
+
     const traceLogsQuery: CHBuilderQuery = {
       datasource: datasource,
       editorType: EditorType.Builder,

src/views/CHQueryEditor.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 import { QueryEditorProps } from '@grafana/data';
 import { Datasource } from 'data/CHDatasource';
 import { EditorTypeSwitcher } from 'components/queryBuilder/EditorTypeSwitcher';
@@ -10,9 +10,11 @@ import { QueryBuilder } from 'components/queryBuilder/QueryBuilder';
 import { generateSql } from 'data/sqlGenerator';
 import { SqlEditor } from 'components/SqlEditor';
 import { isBuilderOptionsRunnable, mapQueryBuilderOptionsToGrafanaFormat } from 'data/utils';
-import { setAllOptions, useBuilderOptionsState } from 'hooks/useBuilderOptionsState';
+import { setAllOptions, setOptions, useBuilderOptionsState } from 'hooks/useBuilderOptionsState';
 import { pluginVersion } from 'utils/version';
 import { migrateCHQuery } from 'data/migration';
+import useTables from 'hooks/useTables';
+import otel from 'otel';
 
 export type CHQueryEditorProps = QueryEditorProps<Datasource, CHQuery, CHConfig>;
 
@@ -65,6 +67,31 @@ const CHEditorByType = (props: CHQueryEditorProps) => {
     shouldSkipChanges.current = false;
   }
 
+  // Resolve hasTraceTimestampTable for OTel trace ID queries.
+  // This runs at the CHEditorByType level (not inside TraceQueryBuilder)
+  // so it works even when the builder is minimized via deep-links.
+  const needsTraceTableCheck = Boolean(builderOptions.meta?.isTraceIdMode && builderOptions.meta?.otelEnabled);
+  const traceDb = needsTraceTableCheck ? builderOptions.database : '';
+  const traceTables = useTables(props.datasource, traceDb);
+  const hasTraceTimestampTable = useMemo(
+    () => traceTables.some((t) => t === builderOptions.table + otel.traceTimestampTableSuffix),
+    [builderOptions.table, traceTables]
+  );
+
+  useEffect(() => {
+    if (!needsTraceTableCheck || traceTables.length === 0) {
+      return;
+    }
+
+    if (hasTraceTimestampTable !== builderOptions.meta?.hasTraceTimestampTable) {
+      builderOptionsDispatch(
+        setOptions({
+          meta: { hasTraceTimestampTable },
+        })
+      );
+    }
+  }, [needsTraceTableCheck, traceTables, hasTraceTimestampTable, builderOptions.meta?.hasTraceTimestampTable, builderOptionsDispatch]);
+
   useEffect(() => {
     if (shouldSkipChanges.current || query.editorType === EditorType.SQL) {
       return;