From 135572d21aa3c95848c95cc0e62f755083d204e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Wed, 10 Nov 2021 19:37:27 +0100
Subject: [PATCH] DataSourceSrv: Use correct getAngularInjector function
 (#41568)

---
 public/app/features/plugins/datasource_srv.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index 5d572a3d57b..9798eab9b59 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -6,6 +6,7 @@ import {
   getDataSourceSrv as getDataSourceService,
   TemplateSrv,
   getTemplateSrv,
+  getLegacyAngularInjector,
 } from '@grafana/runtime';
 // Types
 import {
@@ -25,7 +26,6 @@ import {
 import { DataSourceVariableModel } from '../variables/types';
 import { ExpressionDatasourceRef } from '@grafana/runtime/src/utils/DataSourceWithBackend';
 import appEvents from 'app/core/app_events';
-import { getAngularInjector } from 'app/angular/lazyBootAngular';
 
 export class DatasourceSrv implements DataSourceService {
   private datasources: Record<string, DataSourceApi> = {}; // UID
@@ -161,7 +161,7 @@ export class DatasourceSrv implements DataSourceService {
       let instance: DataSourceApi<any, any>;
 
       if (useAngular) {
-        instance = (await getAngularInjector()).instantiate(dsPlugin.DataSourceClass, {
+        instance = getLegacyAngularInjector().instantiate(dsPlugin.DataSourceClass, {
           instanceSettings: dsConfig,
         });
       } else {