Analytics: add data source type in data-request events (#30087)

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;
   }
 

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;

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,