Query: send datasourceId along with datasource ref (#41830)

packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts

@@ -68,6 +68,7 @@ describe('DataSourceWithBackend', () => {
                 "type": "dummy",
                 "uid": "abc",
               },
+              "datasourceId": 1234,
               "intervalMs": 5000,
               "maxDataPoints": 10,
               "refId": "A",
@@ -77,6 +78,7 @@ describe('DataSourceWithBackend', () => {
                 "type": "sample",
                 "uid": "?",
               },
+              "datasourceId": undefined,
               "intervalMs": 5000,
               "maxDataPoints": 10,
               "refId": "B",

packages/grafana-runtime/src/utils/DataSourceWithBackend.ts

@@ -109,6 +109,7 @@ class DataSourceWithBackend<
 
     const queries = targets.map((q) => {
       let datasource = this.getRef();
+      let datasourceId = this.id;
 
       if (isExpressionReference(q.datasource)) {
         return {
@@ -125,11 +126,13 @@ class DataSourceWithBackend<
         }
 
         datasource = ds.rawRef ?? getDataSourceRef(ds);
+        datasourceId = ds.id;
       }
 
       return {
         ...this.applyTemplateVariables(q, request.scopedVars),
         datasource,
+        datasourceId, // deprecated!
         intervalMs,
         maxDataPoints,
       };