fix: only include trace columns in query when configured (#9)

* fix: only include trace columns in query when configured

Tags, serviceTags, statusCode, statusMessage, and kind columns are now
only added to the trace detail SQL when the user has configured them in
datasource settings, preventing errors on tables missing those columns.

* chore: bump version to 1.4.1

Author: everpcpc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "datasource-databend",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Grafana datasource plugin for Databend",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

src/data/sqlGenerator.ts

@@ -270,23 +270,15 @@ function generateTraceIdSql(options: QueryBuilderOptions): string {
   }
   if (tagsCol) {
     selectParts.push(`${tagsCol.name} AS tags`);
-  } else {
-    selectParts.push(`'[]' AS tags`);
   }
   if (serviceTagsCol) {
     selectParts.push(`${serviceTagsCol.name} AS serviceTags`);
-  } else {
-    selectParts.push(`'[]' AS serviceTags`);
   }
   if (statusCodeCol) {
     selectParts.push(`CASE WHEN ${statusCodeCol.name} IN ('Error', 'STATUS_CODE_ERROR') THEN 2 ELSE 0 END AS statusCode`);
-  } else {
-    selectParts.push(`0 AS statusCode`);
   }
   if (statusMessageCol) {
     selectParts.push(`${statusMessageCol.name} AS statusMessage`);
-  } else {
-    selectParts.push(`'' AS statusMessage`);
   }
   if (kindCol) {
     selectParts.push(`${kindCol.name} AS kind`);

src/data/utils.ts

@@ -126,11 +126,11 @@ export const transformQueryResponseWithTraceAndLogLinks = (
           { name: settings.tracesServiceNameColumn || 'service_name', hint: ColumnHint.TraceServiceName },
           { name: settings.tracesDurationColumn || 'duration', hint: ColumnHint.TraceDurationTime },
           { name: settings.tracesStartTimeColumn || 'timestamp', hint: ColumnHint.Time },
-          { name: settings.tracesTagsColumn || 'span_attributes', hint: ColumnHint.TraceTags },
-          { name: settings.tracesServiceTagsColumn || 'resource_attributes', hint: ColumnHint.TraceServiceTags },
-          { name: settings.tracesStatusCodeColumn || 'status_code', hint: ColumnHint.TraceStatusCode },
-          { name: settings.tracesStatusMessageColumn || 'status_message', hint: ColumnHint.TraceStatusMessage },
-          { name: settings.tracesKindColumn || 'span_kind', hint: ColumnHint.TraceKind },
+          ...(settings.tracesTagsColumn ? [{ name: settings.tracesTagsColumn, hint: ColumnHint.TraceTags }] : []),
+          ...(settings.tracesServiceTagsColumn ? [{ name: settings.tracesServiceTagsColumn, hint: ColumnHint.TraceServiceTags }] : []),
+          ...(settings.tracesStatusCodeColumn ? [{ name: settings.tracesStatusCodeColumn, hint: ColumnHint.TraceStatusCode }] : []),
+          ...(settings.tracesStatusMessageColumn ? [{ name: settings.tracesStatusMessageColumn, hint: ColumnHint.TraceStatusMessage }] : []),
+          ...(settings.tracesKindColumn ? [{ name: settings.tracesKindColumn, hint: ColumnHint.TraceKind }] : []),
         ],
         filters: [],
         orderBy: [],