From 376765b3d777719453db144360c779c81c34f5fc Mon Sep 17 00:00:00 2001
From: Andrej Ocenas <mr.ocenas@gmail.com>
Date: Thu, 23 Apr 2020 20:46:42 +0200
Subject: [PATCH] Tracing: Remove feature flag (#23834)

---
 packages/grafana-data/src/types/config.ts     |  1 -
 packages/grafana-runtime/src/config.ts        |  1 -
 pkg/plugins/plugins.go                        |  8 ---
 .../datasources/state/buildCategories.test.ts | 14 ++---
 .../datasources/state/buildCategories.ts      |  3 +-
 .../loki/configuration/DerivedField.test.tsx  |  8 ---
 .../loki/configuration/DerivedField.tsx       | 55 +++++++++----------
 7 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 93c7a0df544..c1e8219c900 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -39,7 +39,6 @@ export interface FeatureToggles {
    */
   meta: boolean;
   newVariables: boolean;
-  tracingIntegration: boolean;
 }
 
 /**
diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts
index 00395036b2f..1e4bb6582f3 100644
--- a/packages/grafana-runtime/src/config.ts
+++ b/packages/grafana-runtime/src/config.ts
@@ -53,7 +53,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
     newEdit: false,
     meta: false,
     newVariables: true,
-    tracingIntegration: false,
   };
   licenseInfo: LicenseInfo = {} as LicenseInfo;
   rendererAvailable = false;
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index e83786747f5..db9cdd59eee 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -222,14 +222,6 @@ func (scanner *PluginScanner) walker(currentPath string, f os.FileInfo, err erro
 		return nil
 	}
 
-	if !scanner.cfg.FeatureToggles["tracingIntegration"] {
-		// Do not load tracing datasources if
-		prefix := path.Join(setting.StaticRootPath, "app/plugins/datasource")
-		if strings.Contains(currentPath, path.Join(prefix, "jaeger")) || strings.Contains(currentPath, path.Join(prefix, "zipkin")) {
-			return nil
-		}
-	}
-
 	if f.Name() == "plugin.json" {
 		err := scanner.loadPluginJson(currentPath)
 		if err != nil {
diff --git a/public/app/features/datasources/state/buildCategories.test.ts b/public/app/features/datasources/state/buildCategories.test.ts
index 273dcc42b70..78f09927faa 100644
--- a/public/app/features/datasources/state/buildCategories.test.ts
+++ b/public/app/features/datasources/state/buildCategories.test.ts
@@ -29,7 +29,7 @@ describe('buildCategories', () => {
   const categories = buildCategories(plugins);
 
   it('should group plugins into categories', () => {
-    expect(categories.length).toBe(6);
+    expect(categories.length).toBe(7);
     expect(categories[0].title).toBe('Time series databases');
     expect(categories[0].plugins.length).toBe(2);
     expect(categories[1].title).toBe('Logging & document databases');
@@ -40,17 +40,17 @@ describe('buildCategories', () => {
   });
 
   it('should add phantom plugin for Grafana cloud', () => {
-    expect(categories[3].title).toBe('Cloud');
-    expect(categories[3].plugins.length).toBe(2);
-    expect(categories[3].plugins[1].id).toBe('gcloud');
+    expect(categories[4].title).toBe('Cloud');
+    expect(categories[4].plugins.length).toBe(2);
+    expect(categories[4].plugins[1].id).toBe('gcloud');
   });
 
   it('should set module to phantom on phantom plugins', () => {
-    expect(categories[4].plugins[0].module).toBe('phantom');
+    expect(categories[5].plugins[0].module).toBe('phantom');
   });
 
   it('should add enterprise phantom plugins', () => {
-    expect(categories[4].title).toBe('Enterprise plugins');
-    expect(categories[4].plugins.length).toBe(6);
+    expect(categories[5].title).toBe('Enterprise plugins');
+    expect(categories[5].plugins.length).toBe(6);
   });
 });
diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts
index a6d906e7929..bd4b03aac59 100644
--- a/public/app/features/datasources/state/buildCategories.ts
+++ b/public/app/features/datasources/state/buildCategories.ts
@@ -1,12 +1,11 @@
 import { DataSourcePluginMeta, PluginType } from '@grafana/data';
 import { DataSourcePluginCategory } from 'app/types';
-import { config } from '@grafana/runtime';
 
 export function buildCategories(plugins: DataSourcePluginMeta[]): DataSourcePluginCategory[] {
   const categories: DataSourcePluginCategory[] = [
     { id: 'tsdb', title: 'Time series databases', plugins: [] },
     { id: 'logging', title: 'Logging & document databases', plugins: [] },
-    config.featureToggles.tracingIntegration ? { id: 'tracing', title: 'Distributed tracing', plugins: [] } : null,
+    { id: 'tracing', title: 'Distributed tracing', plugins: [] },
     { id: 'sql', title: 'SQL', plugins: [] },
     { id: 'cloud', title: 'Cloud', plugins: [] },
     { id: 'enterprise', title: 'Enterprise plugins', plugins: [] },
diff --git a/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx b/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx
index 503fd7ec7dd..5c4ff10ed40 100644
--- a/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx
@@ -3,14 +3,6 @@ import { shallow } from 'enzyme';
 import { DerivedField } from './DerivedField';
 import DataSourcePicker from '../../../../core/components/Select/DataSourcePicker';
 
-jest.mock('app/core/config', () => ({
-  config: {
-    featureToggles: {
-      tracingIntegration: true,
-    },
-  },
-}));
-
 jest.mock('app/features/plugins/datasource_srv', () => ({
   getDatasourceSrv() {
     return {
diff --git a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
index 37502fbdf1d..93c71addc83 100644
--- a/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
+++ b/public/app/plugins/datasource/loki/configuration/DerivedField.tsx
@@ -8,7 +8,6 @@ import { DataSourceSelectItem } from '@grafana/data';
 import { DerivedFieldConfig } from '../types';
 import DataSourcePicker from 'app/core/components/Select/DataSourcePicker';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { config } from 'app/core/config';
 import { usePrevious } from 'react-use';
 
 const getStyles = stylesFactory(() => ({
@@ -113,35 +112,33 @@ export const DerivedField = (props: Props) => {
         `}
       />
 
-      {config.featureToggles.tracingIntegration && (
-        <div className={styles.row}>
-          <Switch
-            label="Internal link"
-            checked={showInternalLink}
-            onChange={() => {
-              if (showInternalLink) {
-                onChange({
-                  ...value,
-                  datasourceUid: undefined,
-                });
-              }
-              setShowInternalLink(!showInternalLink);
-            }}
-          />
+      <div className={styles.row}>
+        <Switch
+          label="Internal link"
+          checked={showInternalLink}
+          onChange={() => {
+            if (showInternalLink) {
+              onChange({
+                ...value,
+                datasourceUid: undefined,
+              });
+            }
+            setShowInternalLink(!showInternalLink);
+          }}
+        />
 
-          {showInternalLink && (
-            <DataSourceSection
-              onChange={datasourceUid => {
-                onChange({
-                  ...value,
-                  datasourceUid,
-                });
-              }}
-              datasourceUid={value.datasourceUid}
-            />
-          )}
-        </div>
-      )}
+        {showInternalLink && (
+          <DataSourceSection
+            onChange={datasourceUid => {
+              onChange({
+                ...value,
+                datasourceUid,
+              });
+            }}
+            datasourceUid={value.datasourceUid}
+          />
+        )}
+      </div>
     </div>
   );
 };