From 4aa09a6a71611e0a42c15120f914d7abace50d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Toulet?=
 <35176601+AgnesToulet@users.noreply.github.com>
Date: Fri, 8 Jan 2021 08:41:26 +0100
Subject: [PATCH] Analytics: add data source type in data-request events
 (#30087)

---
 packages/grafana-data/src/types/datasource.ts     | 6 ++++++
 packages/grafana-runtime/src/types/analytics.ts   | 3 ++-
 public/app/features/query/state/queryAnalytics.ts | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index e3cf77ae476..4fc49935059 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -174,6 +174,11 @@ export abstract class DataSourceApi<
    */
   readonly id: number;
 
+  /**
+   *  Set in constructor
+   */
+  readonly type: string;
+
   /**
    *  min interval range
    */
@@ -182,6 +187,7 @@ export abstract class DataSourceApi<
   constructor(instanceSettings: DataSourceInstanceSettings<TOptions>) {
     this.name = instanceSettings.name;
     this.id = instanceSettings.id;
+    this.type = instanceSettings.type;
     this.meta = {} as DataSourcePluginMeta;
   }
 
diff --git a/packages/grafana-runtime/src/types/analytics.ts b/packages/grafana-runtime/src/types/analytics.ts
index 5fd24a382eb..767dc7482f4 100644
--- a/packages/grafana-runtime/src/types/analytics.ts
+++ b/packages/grafana-runtime/src/types/analytics.ts
@@ -20,7 +20,8 @@ export interface DashboardInfo {
  */
 export interface DataRequestInfo extends Partial<DashboardInfo> {
   datasourceName: string;
-  datasourceId?: number;
+  datasourceId: number;
+  datasourceType: string;
   panelId?: number;
   panelName?: string;
   duration: number;
diff --git a/public/app/features/query/state/queryAnalytics.ts b/public/app/features/query/state/queryAnalytics.ts
index 90b288724eb..4ec30cadfff 100644
--- a/public/app/features/query/state/queryAnalytics.ts
+++ b/public/app/features/query/state/queryAnalytics.ts
@@ -23,6 +23,7 @@ export function emitDataRequestEvent(datasource: DataSourceApi) {
       eventName: MetaAnalyticsEventName.DataRequest,
       datasourceName: datasource.name,
       datasourceId: datasource.id,
+      datasourceType: datasource.type,
       panelId: data.request.panelId,
       dashboardId: data.request.dashboardId,
       dataSize: 0,