prettier fix

Signed-off-by: Joe Elliott <number101010@gmail.com>

public/app/plugins/datasource/tempo/datasource.ts

@@ -811,7 +811,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     return merge(
       ...targets.map((target) =>
         doTempoSearchStreaming(
-          { ...target, query },
+          { ...target, query: this.applyVariables(target, options.scopedVars).query },
           this, // the datasource
           options,
           this.instanceSettings
@@ -857,7 +857,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     return merge(
       ...targets.map((target) =>
         doTempoMetricsStreaming(
-          { ...target, query },
+          { ...target, query: this.applyVariables(target, options.scopedVars).query },
           this, // the datasource
           options
         )

public/app/plugins/datasource/tempo/streaming.ts

@@ -5,6 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 import {
   DataFrame,
   dataFrameFromJSON,
+  DataFrameJSON,
   DataQueryRequest,
   DataQueryResponse,
   DataSourceInstanceSettings,
@@ -165,7 +166,15 @@ export function doTempoMetricsStreaming(
           }
 
           newResult = {
-            data: data?.map(dataFrameFromJSON) ?? [],
+            data:
+              data?.map((frame: DataFrameJSON) => {
+                const df = dataFrameFromJSON(frame);
+                // preserve the query's refId to prevent conflation of series from different queries
+                if (query.refId) {
+                  df.refId = query.refId;
+                }
+                return df;
+              }) ?? [],
             state,
           };
         }