@sap-ux/telemetry 1.0.12 → 1.0.14

package/dist/base/client/azure-appinsight-client.d.ts

@@ -62,7 +62,7 @@ declare class ApplicationInsightClient extends Client {
      */
     private trackEventBlocking;
     /**
-     * Send teleemtry event in non-blocking fashion.
+     * Send telemetry event in non-blocking fashion.
      *
      * @param client Telemetry client instance
      * @param event Telemetry event

package/dist/base/client/azure-appinsight-client.js

@@ -104,23 +104,13 @@ class ApplicationInsightClient extends Client {
      * @returns Promise<void>
      */
     async trackEventBlocking(client, event) {
-        if (process.env.SAP_UX_FIORI_TOOLS_DISABLE_TELEMETRY === 'true') {
-            return;
+        if (process.env.SAP_UX_FIORI_TOOLS_DISABLE_TELEMETRY !== 'true') {
+            client.trackEvent(event);
+            await client.flush();
         }
-        return new Promise((resolve, reject) => {
-            try {
-                client.trackEvent(event);
-                client.flush({
-                    callback: () => resolve()
-                });
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
     }
     /**
-     * Send teleemtry event in non-blocking fashion.
+     * Send telemetry event in non-blocking fashion.
      *
      * @param client Telemetry client instance
      * @param event Telemetry event
@@ -140,21 +130,21 @@ class ApplicationInsightClient extends Client {
      * @returns Telemetry client instance
      */
     createTelemetryClient(sampleRate) {
-        let sampleRateNumer;
+        let sampleRateNumber;
         switch (sampleRate) {
             case SampleRate.OnePercent:
-                sampleRateNumer = 1;
+                sampleRateNumber = 1;
                 break;
             case SampleRate.TenPercent:
-                sampleRateNumer = 10;
+                sampleRateNumber = 10;
                 break;
             case SampleRate.NoSampling:
             default:
-                sampleRateNumer = 100;
+                sampleRateNumber = 100;
                 break;
         }
         const client = new appInsights.TelemetryClient(this.applicationKey);
-        client.config.samplingPercentage = sampleRateNumer;
+        client.config.samplingPercentage = sampleRateNumber;
         configAzureTelemetryClient(client);
         return client;
     }

package/dist/base/client/index.d.ts

@@ -19,6 +19,7 @@ declare class ClientFactory {
      * @returns Subclass of telemetry Client class
      */
     static getTelemetryClientByClass<T extends Client>(clientConstructor: new (appKey: string, extensionName: string, extensionVersion: string) => T): T;
+    private static buildConnectionString;
 }
 export { ClientFactory };
 //# sourceMappingURL=index.d.ts.map

package/dist/base/client/index.js

@@ -1,5 +1,6 @@
 import { ToolsSuiteTelemetryClient } from '../../tooling-telemetry/index.js';
 import { TelemetrySettings } from '../config-state.js';
+const instrumentationKeyPlaceholder = 'ApplicationInsightsInstrumentationKeyPLACEH0LDER';
 /**
  * Factory to get telemetry client instance.
  */
@@ -25,11 +26,19 @@ class ClientFactory {
         if (client) {
             return client;
         }
-        const ClientConstructor = clientConstructor;
-        client = new ClientConstructor(TelemetrySettings.azureInstrumentationKey, TelemetrySettings.consumerModuleName, TelemetrySettings.consumerModuleVersion);
+        const connectionString = ClientFactory.buildConnectionString(TelemetrySettings.azureInstrumentationKey);
+        client = new clientConstructor(connectionString, TelemetrySettings.consumerModuleName, TelemetrySettings.consumerModuleVersion);
         ClientFactory.clientMap.set(clientConstructor.name, client);
         return client;
     }
+    static buildConnectionString(key) {
+        if (!key) {
+            return '';
+        }
+        // ApplicationInsights v3+ requires InstrumentationKey=<uuid> format
+        const instrumentationKey = key === instrumentationKeyPlaceholder ? '00000000-0000-0000-0000-000000000000' : key;
+        return `InstrumentationKey=${instrumentationKey}`;
+    }
 }
 export { ClientFactory };
 //# sourceMappingURL=index.js.map

package/dist/base/utils/azure-client-config.js

@@ -1,3 +1,4 @@
+// import type { TelemetryItem } from 'applicationinsights'; // not exported
 /**
  * Enable local caching of telemetry data when offline.
  * Disable GDPR private data that are collected by Azure AppInsight client.
@@ -5,8 +6,16 @@
  * @param client Azure App Insights telemetry client instance
  */
 export function configAzureTelemetryClient(client) {
-    client.channel.setUseDiskRetryCaching(true);
-    client.addTelemetryProcessor((envelope) => {
+    if (client.setUseDiskRetryCaching) {
+        try {
+            client.setUseDiskRetryCaching(true);
+        }
+        catch {
+            // setUseDiskRetryCaching may throw "Not implemented"
+        }
+    }
+    client.addTelemetryProcessor((envelope /* TelemetryItem */) => {
+        envelope.tags ??= {};
         envelope.tags['ai.location.ip'] = '0.0.0.0';
         envelope.tags['ai.cloud.roleInstance'] = 'masked';
         envelope.tags['ai.cloud.role'] = 'masked';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/telemetry",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Library for sending usage telemetry data",
   "type": "module",
   "repository": {
@@ -15,7 +15,7 @@
   "private": false,
   "main": "dist/index.js",
   "dependencies": {
-    "applicationinsights": "2.9.8",
+    "applicationinsights": "3.15.0",
     "axios": "1.16.0",
     "performance-now": "2.1.0",
     "yaml": "2.8.3",