Task: reactivate app insights (#591)

* get instrumentation key from environment config * track run query events * add instrumentation key to pipeline * add check for instrumentation key from window object
microsoftgraph · Jun 24, 2020 · d9b33a1 · d9b33a1
1 parent 9717c8c
commit d9b33a1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -24,13 +24,15 @@ steps:
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
     env:
       REACT_APP_CLIENT_ID: $(REACT_APP_STAGING_CLIENT_ID)
+      REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
     displayName: 'Build static assets for staging'
 
   - script: |
       npm run build
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     env:
       REACT_APP_CLIENT_ID: $(REACT_APP_PROD_CLIENT_ID)
+      REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
     displayName: 'Build static assets for prod'
 
   - task: PublishCodeCoverageResults@1

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/views/query-runner/QueryRunner.tsx b/src/app/views/query-runner/QueryRunner.tsx
@@ -4,6 +4,8 @@ import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
 
+import { telemetry } from '../../../telemetry';
+import { RUN_QUERY_EVENT } from '../../../telemetry/event-types';
 import {
   IQueryRunnerProps,
   IQueryRunnerState,
@@ -15,7 +17,6 @@ import { parseSampleUrl } from '../../utils/sample-url-generation';
 import './query-runner.scss';
 import QueryInput from './QueryInput';
 import Request from './request/Request';
-
 export class QueryRunner extends Component<
   IQueryRunnerProps,
   IQueryRunnerState
@@ -88,6 +89,7 @@ export class QueryRunner extends Component<
     if (actions) {
       actions.runQuery(sampleQuery);
     }
+    telemetry.trackEvent(RUN_QUERY_EVENT, sampleQuery);
   };
 
   private handleOnVersionChange = (urlVersion?: IDropdownOption) => {

diff --git a/src/app/views/sidebar/sample-queries/SampleQueries.tsx b/src/app/views/sidebar/sample-queries/SampleQueries.tsx
@@ -9,6 +9,8 @@ import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
 
 import { geLocale } from '../../../../appLocale';
+import { telemetry } from '../../../../telemetry';
+import { RUN_QUERY_EVENT } from '../../../../telemetry/event-types';
 import { IQuery, ISampleQueriesProps, ISampleQuery } from '../../../../types/query-runner';
 import * as queryActionCreators from '../../../services/actions/query-action-creators';
 import * as queryInputActionCreators from '../../../services/actions/query-input-action-creators';
@@ -296,6 +298,7 @@ export class SampleQueries extends Component<ISampleQueriesProps, any> {
             } else {
               actions.runQuery(sampleQuery);
             }
+            telemetry.trackEvent(RUN_QUERY_EVENT, sampleQuery);
           } else {
             sampleQuery.sampleBody = (sampleQuery.sampleBody) ? JSON.parse(sampleQuery.sampleBody) : undefined;
             if (selectedQuery.tip) { displayTipMessage(actions, selectedQuery); }

diff --git a/src/telemetry/telemetry.ts b/src/telemetry/telemetry.ts
@@ -9,7 +9,7 @@ class Telemetry implements ITelemetry {
   private reactPlugin: any;
 
   constructor() {
-    this.reactPlugin  = new ReactPlugin();
+    this.reactPlugin = new ReactPlugin();
 
     this.config = {
       instrumentationKey: this.getInstrumentationKey(),
@@ -57,7 +57,7 @@ class Telemetry implements ITelemetry {
   }
 
   private getInstrumentationKey() {
-    return (window as any).InstrumentationKey || '';
+    return (window as any).InstrumentationKey || process.env.REACT_APP_INSTRUMENTATION_KEY || '';
   }
 }