New: Add endpoint/data contract to log telemetry to internal api

packages/utils-telemetry/src/index.ts

@@ -1,3 +1,3 @@
 export * from './activity';
-export * from './app-insights';
+export * from './telemetry-api';
 export * from './hints';

packages/utils-telemetry/src/app-insights.ts → packages/utils-telemetry/src/telemetry-api.ts

@@ -3,30 +3,23 @@ type Properties = { [key: string]: string };
 
 type TelemetryItem = {
     data: {
-        baseData: {
-            measurements: Measurements;
-            name: string;
-            properties: Properties;
-            ver?: number;
-        };
-        baseType: string;
+        measurements: Measurements;
+        name: string;
+        properties: Properties;
     };
-    iKey: string;
-    name: string;
+    type: string;
     time: string;
 };
 
-const appInsightsEndpoint = 'https://dc.services.visualstudio.com/v2/track';
+const telemetryEndPoint = 'https://webhint-telemetry.azurewebsites.net/api/log';
 
-let nameKey = '';
 let sendTimeout: NodeJS.Timeout | null = null;
 let telemetryQueue: TelemetryItem[] = [];
 
 let options = {
     batchDelay: 15000,
     defaultProperties: {} as Properties,
     enabled: false,
-    instrumentationKey: '8ef2b55b-2ce9-4c33-a09a-2c3ef605c97d',
     post: (url: string, data: string) => {
         return Promise.resolve(200);
     }
@@ -40,7 +33,6 @@ export const enabled = () => {
 /** Initialize telemetry with the provided options */
 export const initTelemetry = (opts: Partial<typeof options>) => {
     options = { ...options, ...opts };
-    nameKey = options.instrumentationKey.replace(/-/g, '');
 };
 
 /** Enable or disable telemetry */
@@ -59,7 +51,7 @@ const sendTelemetry = async () => {
     telemetryQueue = [];
 
     try {
-        const status = await options.post(appInsightsEndpoint, data);
+        const status = await options.post(telemetryEndPoint, data);
 
         /* istanbul ignore next */
         if (status !== 200) {
@@ -70,24 +62,20 @@ const sendTelemetry = async () => {
     }
 };
 
-const track = async (type: string, data: TelemetryItem['data']['baseData']) => {
+const track = async (type: string, data: TelemetryItem['data']) => {
     if (!enabled()) {
         return;
     }
 
     telemetryQueue.push({
         data: {
-            baseData: {
-                measurements: data.measurements,
-                name: data.name,
-                properties: { ...options.defaultProperties, ...data.properties },
-                ver: 2
-            },
-            baseType: `${type}Data`
+            measurements: data.measurements,
+            name: data.name,
+            properties: { ...options.defaultProperties, ...data.properties }
         },
-        iKey: options.instrumentationKey,
-        name: `Microsoft.ApplicationInsights.${nameKey}.${type}`,
-        time: new Date().toISOString()
+        time: new Date().toISOString(),
+        type: `${type}Data`
+
     });
 
     if (!options.batchDelay) {

packages/utils-telemetry/tests/app-insights.ts → packages/utils-telemetry/tests/telemetry-api.ts

@@ -3,15 +3,13 @@ import * as proxyquire from 'proxyquire';
 import * as sinon from 'sinon';
 
 test('It posts telemetry events in the correct format', async (t) => {
-    const instrumentationKey = 'foo';
     const post = sinon.stub().resolves(200);
 
-    const { initTelemetry, trackEvent } = proxyquire('../src/app-insights', {}) as typeof import('../src/app-insights');
+    const { initTelemetry, trackEvent } = proxyquire('../src/telemetry-api', {}) as typeof import('../src/telemetry-api');
 
     initTelemetry({
         batchDelay: 0,
         enabled: true,
-        instrumentationKey,
         post
     });
 
@@ -20,23 +18,20 @@ test('It posts telemetry events in the correct format', async (t) => {
     const postData = JSON.parse(post.firstCall.args[1]);
 
     t.is(post.callCount, 1);
-    t.is(post.firstCall.args[0], 'https://dc.services.visualstudio.com/v2/track');
+    t.is(post.firstCall.args[0], 'https://webhint-telemetry.azurewebsites.net/api/log');
     t.is(postData.length, 1);
-    t.is(postData[0].iKey, instrumentationKey);
-    t.is(postData[0].name, `Microsoft.ApplicationInsights.${instrumentationKey.replace(/-/g, '')}.Event`);
+    t.is(postData[0].data.name, 'test-event');
     t.is(postData[0].time, new Date(postData[0].time).toISOString());
 });
 
 test('It does not post telemetry events when disabled', async (t) => {
-    const instrumentationKey = 'foo';
     const post = sinon.stub().resolves();
 
-    const { initTelemetry, trackEvent, updateTelemetry } = proxyquire('../src/app-insights', {}) as typeof import('../src/app-insights');
+    const { initTelemetry, trackEvent, updateTelemetry } = proxyquire('../src/telemetry-api', {}) as typeof import('../src/telemetry-api');
 
     initTelemetry({
         batchDelay: 0,
         enabled: true,
-        instrumentationKey,
         post
     });
 
@@ -48,15 +43,13 @@ test('It does not post telemetry events when disabled', async (t) => {
 });
 
 test('It batches multiple telemetry events together', async (t) => {
-    const instrumentationKey = 'foo';
     const post = sinon.stub().resolves(200);
 
-    const { initTelemetry, trackEvent } = proxyquire('../src/app-insights', {}) as typeof import('../src/app-insights');
+    const { initTelemetry, trackEvent } = proxyquire('../src/telemetry-api', {}) as typeof import('../src/telemetry-api');
 
     initTelemetry({
         batchDelay: 50,
         enabled: true,
-        instrumentationKey,
         post
     });
 
@@ -72,6 +65,6 @@ test('It batches multiple telemetry events together', async (t) => {
     const items = JSON.parse(post.firstCall.args[1]);
 
     t.is(items.length, 2);
-    t.is(items[0].data.baseData.name, 'test-event-1');
-    t.is(items[1].data.baseData.name, 'test-event-2');
+    t.is(items[0].data.name, 'test-event-1');
+    t.is(items[1].data.name, 'test-event-2');
 });