From 1ca5c347d376985042cf12a52a712edd77375467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20L=C3=B3pez=20de=20la=20Franca=20Beltran?=
 <5459617+joanlopez@users.noreply.github.com>
Date: Thu, 13 Oct 2022 17:41:52 +0200
Subject: [PATCH] Analytics: Add datasource UID to events (#56852)

* Analytics: Add datasource UID to events
---
 packages/grafana-runtime/src/types/analytics.ts        | 1 +
 public/app/features/query/state/queryAnalytics.test.ts | 3 +++
 public/app/features/query/state/queryAnalytics.ts      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/packages/grafana-runtime/src/types/analytics.ts b/packages/grafana-runtime/src/types/analytics.ts
index c3e7f585303..2a7ef01504e 100644
--- a/packages/grafana-runtime/src/types/analytics.ts
+++ b/packages/grafana-runtime/src/types/analytics.ts
@@ -22,6 +22,7 @@ export interface DashboardInfo {
 export interface DataRequestInfo extends Partial<DashboardInfo> {
   datasourceName: string;
   datasourceId: number;
+  datasourceUid: string;
   datasourceType: string;
   panelId?: number;
   panelName?: string;
diff --git a/public/app/features/query/state/queryAnalytics.test.ts b/public/app/features/query/state/queryAnalytics.test.ts
index aa3a4f41f25..6c847338bc0 100644
--- a/public/app/features/query/state/queryAnalytics.test.ts
+++ b/public/app/features/query/state/queryAnalytics.test.ts
@@ -105,6 +105,7 @@ describe('emitDataRequestEvent - from a dashboard panel', () => {
         eventName: MetaAnalyticsEventName.DataRequest,
         datasourceName: datasource.name,
         datasourceId: datasource.id,
+        datasourceUid: datasource.uid,
         panelId: 2,
         dashboardId: 1,
         dashboardName: 'Test Dashboard',
@@ -128,6 +129,7 @@ describe('emitDataRequestEvent - from a dashboard panel', () => {
         eventName: MetaAnalyticsEventName.DataRequest,
         datasourceName: datasource.name,
         datasourceId: datasource.id,
+        datasourceUid: datasource.uid,
         panelId: 2,
         dashboardId: 1,
         dashboardName: 'Test Dashboard',
@@ -151,6 +153,7 @@ describe('emitDataRequestEvent - from a dashboard panel', () => {
         eventName: MetaAnalyticsEventName.DataRequest,
         datasourceName: datasource.name,
         datasourceId: datasource.id,
+        datasourceUid: datasource.uid,
         panelId: 2,
         dashboardId: 1,
         dashboardName: 'Test Dashboard',
diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts
index 862666f2613..ae70999ff61 100644
--- a/public/app/features/query/state/queryAnalytics.ts
+++ b/public/app/features/query/state/queryAnalytics.ts
@@ -35,6 +35,7 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
       eventName: MetaAnalyticsEventName.DataRequest,
       datasourceName: datasource.name,
       datasourceId: datasource.id,
+      datasourceUid: datasource.uid,
       datasourceType: datasource.type,
       panelId: data.request.panelId,
       dashboardId: data.request.dashboardId,