@salesforce/telemetry 6.0.38 → 6.1.0

package/LICENSE.txt

@@ -1,12 +1,206 @@
-Copyright (c) 2024, Salesforce.com, Inc.
+Apache License Version 2.0
+
+Copyright (c) 2025 Salesforce, Inc.
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+   Copyright {yyyy} {name of copyright owner}
 
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+       http://www.apache.org/licenses/LICENSE-2.0
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/lib/appInsights.d.ts

@@ -1,39 +1,14 @@
-import { AsyncCreatable, Env } from '@salesforce/kit';
 import * as appInsights from 'applicationinsights';
+import { Properties, Attributes, TelemetryOptions } from './types';
+import { BaseReporter } from './baseReporter';
 export { TelemetryClient } from 'applicationinsights';
-export type Properties = {
-    [key: string]: string;
-};
-export type Measurements = {
-    [key: string]: number;
-};
-export type Attributes = {
-    [key: string]: string | number | boolean | null | undefined;
-};
-export type TelemetryOptions = {
-    project: string;
-    key: string;
-    commonProperties?: Properties;
-    contextTags?: Properties;
-    env?: Env;
-    gdprSensitiveKeys?: string[];
-    userId?: string;
-    sessionId?: string;
-    waitForConnection?: boolean;
-};
-export declare function getPlatformVersion(): string;
-export declare function getCpus(): string;
-export declare function buildPropertiesAndMeasurements(attributes: Attributes): {
-    properties: Properties;
-    measurements: Measurements;
-};
 /**
  * This is a wrapper around appinsights sdk for convenience.
  *
  * NOTE: THis should not be used directly. Use TelemetryReporter which
  * will check if telemetry is disabled and do GDPR checks.
  */
-export declare class AppInsights extends AsyncCreatable<TelemetryOptions> {
+export declare class AppInsights extends BaseReporter {
     static GDPR_HIDDEN: string;
     static APP_INSIGHTS_SERVER: string;
     private static ASIMOV_ENDPOINT;
@@ -84,7 +59,7 @@ export declare class AppInsights extends AsyncCreatable<TelemetryOptions> {
      *
      * @return {Properties} map of base properties and properties provided when class was created
      */
-    private buildCommonProperties;
+    private buildAppInsightsCommonProperties;
     /**
      * Builds the context tags for appInsightsClient
      *

package/lib/appInsights.js

@@ -15,86 +15,48 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppInsights = exports.TelemetryClient = void 0;
-exports.getPlatformVersion = getPlatformVersion;
-exports.getCpus = getCpus;
-exports.buildPropertiesAndMeasurements = buildPropertiesAndMeasurements;
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const os = __importStar(require("node:os"));
 const logger_1 = require("@salesforce/core/logger");
 const kit_1 = require("@salesforce/kit");
 const appInsights = __importStar(require("applicationinsights"));
+const utils_1 = require("./utils");
+const baseReporter_1 = require("./baseReporter");
 var applicationinsights_1 = require("applicationinsights");
 Object.defineProperty(exports, "TelemetryClient", { enumerable: true, get: function () { return applicationinsights_1.TelemetryClient; } });
-function getPlatformVersion() {
-    return (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
-}
-function getCpus() {
-    const cpus = os.cpus();
-    if (cpus && cpus.length > 0) {
-        return `${cpus[0].model}(${cpus.length} x ${cpus[0].speed})`;
-    }
-    else {
-        return '';
-    }
-}
-const homeDir = os.homedir();
-const sanitizeError = (err) => {
-    if (err.name) {
-        err.name = err.name.replace(homeDir, '~');
-    }
-    if (err.message) {
-        err.message = err.message.replace(homeDir, '~');
-    }
-    if (err.stack) {
-        // there might be lots of this one
-        err.stack = err.stack.replace(new RegExp(`\b${homeDir}\b`, 'gi'), '~');
-    }
-    return err;
-};
-function getSystemMemory() {
-    return `${(os.totalmem() / (1024 * 1024 * 1024)).toFixed(2)} GB`;
-}
 function isAsimovKey(key) {
     return !!key?.startsWith('AIF-');
 }
-function buildPropertiesAndMeasurements(attributes) {
-    const properties = {};
-    const measurements = {};
-    Object.keys(attributes).forEach((key) => {
-        const value = attributes[key];
-        if (typeof value === 'string') {
-            properties[key] = value.replace(homeDir, '~');
-        }
-        else if (typeof value === 'number') {
-            measurements[key] = value;
-        }
-        else if (typeof value === 'boolean') {
-            properties[key] = value.toString();
-        }
-    });
-    return { properties, measurements };
-}
 /**
  * This is a wrapper around appinsights sdk for convenience.
  *
  * NOTE: THis should not be used directly. Use TelemetryReporter which
  * will check if telemetry is disabled and do GDPR checks.
  */
-class AppInsights extends kit_1.AsyncCreatable {
+class AppInsights extends baseReporter_1.BaseReporter {
     static GDPR_HIDDEN = '<GDPR_HIDDEN>';
     static APP_INSIGHTS_SERVER = 'https://dc.services.visualstudio.com';
     static ASIMOV_ENDPOINT = 'https://vortex.data.microsoft.com/collect/v1';
@@ -129,7 +91,7 @@ class AppInsights extends kit_1.AsyncCreatable {
     sendTelemetryEvent(eventName, attributes = {}) {
         const name = `${this.options.project}/${eventName}`;
         this.logger.debug(`Sending telemetry event: ${name}`);
-        const { properties, measurements } = buildPropertiesAndMeasurements(attributes);
+        const { properties, measurements } = (0, utils_1.buildPropertiesAndMeasurements)(attributes);
         this.appInsightsClient.trackEvent({ name, properties, measurements });
     }
     /**
@@ -139,9 +101,9 @@ class AppInsights extends kit_1.AsyncCreatable {
      * @param attributes {Attributes} - map of measurements to publish alongside the exception.
      */
     sendTelemetryException(exception, attributes = {}) {
-        const cleanException = sanitizeError(exception);
+        const cleanException = this.sanitizeError(exception);
         this.logger.debug(`Sending telemetry exception: ${cleanException.message}`);
-        const { properties, measurements } = buildPropertiesAndMeasurements(attributes);
+        const { properties, measurements } = (0, utils_1.buildPropertiesAndMeasurements)(attributes);
         this.appInsightsClient.trackException({ exception: cleanException, properties, measurements });
     }
     /**
@@ -181,7 +143,7 @@ class AppInsights extends kit_1.AsyncCreatable {
         this.logger.debug('creating appInsightsClient');
         appInsights.setup(this.options.key);
         this.appInsightsClient = appInsights.defaultClient;
-        this.appInsightsClient.commonProperties = this.buildCommonProperties();
+        this.appInsightsClient.commonProperties = this.buildAppInsightsCommonProperties();
         this.appInsightsClient.context.tags = this.buildContextTags();
         if (isAsimovKey(this.options.key)) {
             this.appInsightsClient.config.endpointUrl = AppInsights.ASIMOV_ENDPOINT;
@@ -198,14 +160,9 @@ class AppInsights extends kit_1.AsyncCreatable {
      *
      * @return {Properties} map of base properties and properties provided when class was created
      */
-    buildCommonProperties() {
-        const baseProperties = {
-            'common.cpus': getCpus(),
-            'common.os': os.platform(),
-            'common.platformversion': getPlatformVersion(),
-            'common.systemmemory': getSystemMemory(),
-            'common.usertype': this.env.getString('SFDX_USER_TYPE') ?? 'normal',
-        };
+    buildAppInsightsCommonProperties() {
+        const baseProperties = this.buildCommonProperties();
+        baseProperties['common.usertype'] = this.env.getString('SFDX_USER_TYPE') ?? 'normal';
         return Object.assign(baseProperties, this.options.commonProperties);
     }
     /**

package/lib/baseReporter.d.ts

@@ -0,0 +1,9 @@
+import { AsyncCreatable } from '@salesforce/kit';
+import { Properties, TelemetryOptions } from './types';
+export declare abstract class BaseReporter extends AsyncCreatable<TelemetryOptions> {
+    protected getPlatformVersion(): string;
+    protected getCpus(): string;
+    protected getSystemMemory(): string;
+    protected sanitizeError(err: Error): Error;
+    protected buildCommonProperties(extra?: Properties): Properties;
+}

package/lib/baseReporter.js

@@ -0,0 +1,92 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseReporter = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const os = __importStar(require("node:os"));
+const kit_1 = require("@salesforce/kit");
+class BaseReporter extends kit_1.AsyncCreatable {
+    // eslint-disable-next-line class-methods-use-this
+    getPlatformVersion() {
+        return (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
+    }
+    // eslint-disable-next-line class-methods-use-this
+    getCpus() {
+        const cpus = os.cpus();
+        if (cpus && cpus.length > 0) {
+            return `${cpus[0].model}(${cpus.length} x ${cpus[0].speed})`;
+        }
+        else {
+            return '';
+        }
+    }
+    // eslint-disable-next-line class-methods-use-this
+    getSystemMemory() {
+        return `${(os.totalmem() / (1024 * 1024 * 1024)).toFixed(2)} GB`;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    sanitizeError(err) {
+        const homeDir = os.homedir();
+        const sanitizedErr = new Error(err.message);
+        sanitizedErr.name = err.name;
+        if (sanitizedErr.name) {
+            sanitizedErr.name = sanitizedErr.name.replace(homeDir, '~');
+        }
+        if (sanitizedErr.message) {
+            sanitizedErr.message = sanitizedErr.message.replace(homeDir, '~');
+        }
+        if (err.stack) {
+            // there might be lots of this one
+            sanitizedErr.stack = err.stack.replace(new RegExp(`\b${homeDir}\b`, 'gi'), '~');
+        }
+        return sanitizedErr;
+    }
+    buildCommonProperties(extra) {
+        const baseProperties = {
+            'common.cpus': this.getCpus(),
+            'common.os': os.platform(),
+            'common.platformversion': this.getPlatformVersion(),
+            'common.systemmemory': this.getSystemMemory(),
+        };
+        return Object.assign(baseProperties, extra);
+    }
+}
+exports.BaseReporter = BaseReporter;
+//# sourceMappingURL=baseReporter.js.map

package/lib/exported.d.ts

@@ -2,3 +2,4 @@ import { TelemetryReporter } from './telemetryReporter';
 export * from './telemetryReporter';
 export { isEnabled } from './enabledCheck';
 export default TelemetryReporter;
+export type { Attributes } from './types';

package/lib/o11yReporter.d.ts

@@ -0,0 +1,35 @@
+import { Attributes, Properties, TelemetryOptions } from './types';
+import { BaseReporter } from './baseReporter';
+export declare class O11yReporter extends BaseReporter {
+    private service;
+    private initialized;
+    private commonProperties;
+    private extensionName;
+    constructor(options: TelemetryOptions);
+    init(): Promise<void>;
+    sendTelemetryEvent(eventName: string, attributes?: Attributes): Promise<void>;
+    flush(): Promise<void>;
+    /**
+     * Publishes exception to O11y service
+     *
+     * @param exception {Error} - exception you want published.
+     * @param attributes {Attributes} - map of measurements to publish alongside the exception.
+     */
+    sendTelemetryException(exception: Error, attributes?: Attributes): Promise<void>;
+    /**
+     * Publishes diagnostic information to O11y service
+     *
+     * @param traceMessage {string} - trace message to send to O11y.
+     * @param properties {Properties} - map of properties to publish alongside the event.
+     */
+    sendTelemetryTrace(traceMessage: string, properties?: Properties): Promise<void>;
+    /**
+     * Publishes metric to O11y service
+     *
+     * @param metricName {string} - name of the metric you want published
+     * @param value {number} - value of the metric
+     * @param properties {Properties} - map of properties to publish alongside the event.
+     */
+    sendTelemetryMetric(metricName: string, value: number, properties?: Properties): Promise<void>;
+    private buildO11yCommonProperties;
+}

package/lib/o11yReporter.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.O11yReporter = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const o11y_reporter_1 = require("@salesforce/o11y-reporter");
+const utils_1 = require("./utils");
+const baseReporter_1 = require("./baseReporter");
+class O11yReporter extends baseReporter_1.BaseReporter {
+    service;
+    initialized;
+    commonProperties;
+    extensionName = '';
+    constructor(options) {
+        super(options);
+        this.extensionName = options.extensionName ?? options.project;
+        this.service = o11y_reporter_1.O11yService.getInstance(this.extensionName);
+        this.initialized = this.service.initialize(this.extensionName, options.o11yUploadEndpoint);
+        this.commonProperties = this.buildO11yCommonProperties(options.commonProperties);
+    }
+    async init() {
+        await this.initialized;
+    }
+    async sendTelemetryEvent(eventName, attributes = {}) {
+        const merged = { ...this.commonProperties, ...attributes };
+        this.service.logEvent({ eventName: `${this.extensionName}/${eventName}`, ...merged });
+        await this.service.upload();
+    }
+    async flush() {
+        await this.service.upload();
+    }
+    /**
+     * Publishes exception to O11y service
+     *
+     * @param exception {Error} - exception you want published.
+     * @param attributes {Attributes} - map of measurements to publish alongside the exception.
+     */
+    async sendTelemetryException(exception, attributes = {}) {
+        const cleanException = this.sanitizeError(exception);
+        const { properties, measurements } = (0, utils_1.buildPropertiesAndMeasurements)(attributes);
+        // Create exception event with sanitized error information
+        const exceptionEvent = {
+            eventName: 'exception',
+            exceptionName: cleanException.name,
+            exceptionMessage: cleanException.message,
+            exceptionStack: cleanException.stack,
+            ...properties,
+            ...measurements,
+        };
+        this.service.logEvent(exceptionEvent);
+        await this.service.upload();
+    }
+    /**
+     * Publishes diagnostic information to O11y service
+     *
+     * @param traceMessage {string} - trace message to send to O11y.
+     * @param properties {Properties} - map of properties to publish alongside the event.
+     */
+    async sendTelemetryTrace(traceMessage, properties) {
+        const traceEvent = {
+            eventName: 'trace',
+            message: traceMessage,
+            ...properties,
+        };
+        this.service.logEvent(traceEvent);
+        await this.service.upload();
+    }
+    /**
+     * Publishes metric to O11y service
+     *
+     * @param metricName {string} - name of the metric you want published
+     * @param value {number} - value of the metric
+     * @param properties {Properties} - map of properties to publish alongside the event.
+     */
+    async sendTelemetryMetric(metricName, value, properties) {
+        const metricEvent = {
+            eventName: 'metric',
+            metricName,
+            value,
+            ...properties,
+        };
+        this.service.logEvent(metricEvent);
+        await this.service.upload();
+    }
+    buildO11yCommonProperties(extra) {
+        const baseProperties = this.buildCommonProperties(extra);
+        baseProperties['common.extensionName'] = this.extensionName;
+        return baseProperties;
+    }
+}
+exports.O11yReporter = O11yReporter;
+//# sourceMappingURL=o11yReporter.js.map

package/lib/telemetryReporter.d.ts

@@ -1,15 +1,17 @@
 import { AsyncCreatable } from '@salesforce/kit';
-import { type Attributes, type Properties, type TelemetryOptions } from './appInsights';
 import { TelemetryClient } from './appInsights';
-export { TelemetryOptions, Attributes, Properties, TelemetryClient } from './appInsights';
+import { Attributes, Properties, TelemetryOptions } from './types';
 /**
- * Reports telemetry events to app insights. We do not send if the config 'disableTelemetry' is set.
+ * This is the main telemetry reporter that should be used by consumers.
+ * It will check if telemetry is disabled and do GDPR checks.
  */
 export declare class TelemetryReporter extends AsyncCreatable<TelemetryOptions> {
     private enabled;
     private options;
     private logger;
     private reporter;
+    private enableO11y;
+    private o11yReporter?;
     constructor(options: TelemetryOptions);
     /**
      * @deprecated Use the standalone function isEnabled() instead.
@@ -31,28 +33,28 @@ export declare class TelemetryReporter extends AsyncCreatable<TelemetryOptions>
     waitForConnection(): Promise<void>;
     testConnection(): Promise<boolean>;
     /**
-     * Sends message to child process.
+     * Sends message to both AppInsights and O11y (if enabled).
      *
      * @param eventName {string} - name of the event you want published.
      * @param attributes {Attributes} - map of properties to publish alongside the event.
      */
     sendTelemetryEvent(eventName: string, attributes?: Attributes): void;
     /**
-     * Sends exception to child process.
+     * Sends exception to both AppInsights and O11y (if enabled).
      *
      * @param exception {Error} - exception you want published.
-     * @param attributes {Attributes} - map of measurements to publish alongside the event.
+     * @param attributes {Attributes} - map of measurements to publish alongside the exception.
      */
     sendTelemetryException(exception: Error, attributes?: Attributes): void;
     /**
-     * Publishes diagnostic information to app insights dashboard
+     * Publishes diagnostic information to both AppInsights and O11y (if enabled).
      *
-     * @param traceMessage {string} - trace message to sen to app insights.
+     * @param traceMessage {string} - trace message to send to app insights.
      * @param properties {Properties} - map of properties to publish alongside the event.
      */
     sendTelemetryTrace(traceMessage: string, properties?: Properties): void;
     /**
-     * Publishes metric to app insights dashboard
+     * Publishes metric to both AppInsights and O11y (if enabled).
      *
      * @param metricName {string} - name of the metric you want published
      * @param value {number} - value of the metric

package/lib/telemetryReporter.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TelemetryReporter = exports.TelemetryClient = void 0;
+exports.TelemetryReporter = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -40,19 +50,22 @@ const got_1 = __importDefault(require("got"));
 const proxy_agent_1 = require("proxy-agent");
 const appInsights_1 = require("./appInsights");
 const enabledCheck_1 = require("./enabledCheck");
-var appInsights_2 = require("./appInsights");
-Object.defineProperty(exports, "TelemetryClient", { enumerable: true, get: function () { return appInsights_2.TelemetryClient; } });
+const o11yReporter_1 = require("./o11yReporter");
 /**
- * Reports telemetry events to app insights. We do not send if the config 'disableTelemetry' is set.
+ * This is the main telemetry reporter that should be used by consumers.
+ * It will check if telemetry is disabled and do GDPR checks.
  */
 class TelemetryReporter extends kit_1.AsyncCreatable {
     enabled = false;
     options;
     logger;
     reporter;
+    enableO11y;
+    o11yReporter;
     constructor(options) {
         super(options);
         this.options = options;
+        this.enableO11y = options.enableO11y ?? false; // default to false for backward compatibility
     }
     /**
      * @deprecated Use the standalone function isEnabled() instead.
@@ -68,6 +81,22 @@ class TelemetryReporter extends kit_1.AsyncCreatable {
         if (this.options.waitForConnection)
             await this.waitForConnection();
         this.reporter = await appInsights_1.AppInsights.create(this.options);
+        // Only initialize O11yReporter if telemetry is enabled, enableO11y is true AND o11yUploadEndpoint is provided
+        if (this.isSfdxTelemetryEnabled() && this.enableO11y) {
+            if (this.options.o11yUploadEndpoint) {
+                try {
+                    this.o11yReporter = new o11yReporter_1.O11yReporter(this.options);
+                    this.logger.debug('O11y reporter initialized successfully');
+                }
+                catch (error) {
+                    this.logger.warn('Failed to initialize O11y reporter:', error);
+                    this.o11yReporter = undefined;
+                }
+            }
+            else {
+                this.logger.warn('O11y reporter not initialized: o11yUploadEndpoint is missing.');
+            }
+        }
     }
     /**
      * Starts data collection services. This is for long running processes. Short lived
@@ -82,6 +111,7 @@ class TelemetryReporter extends kit_1.AsyncCreatable {
      */
     stop() {
         this.reporter.stop();
+        void this.o11yReporter?.flush();
     }
     async waitForConnection() {
         const canConnect = await this.testConnection();
@@ -119,51 +149,84 @@ class TelemetryReporter extends kit_1.AsyncCreatable {
         }
     }
     /**
-     * Sends message to child process.
+     * Sends message to both AppInsights and O11y (if enabled).
      *
      * @param eventName {string} - name of the event you want published.
      * @param attributes {Attributes} - map of properties to publish alongside the event.
      */
     sendTelemetryEvent(eventName, attributes = {}) {
+        // Send to AppInsights only if SFDX telemetry is enabled
         if (this.isSfdxTelemetryEnabled()) {
             this.reporter.sendTelemetryEvent(eventName, attributes);
         }
+        // Send to O11y if telemetry is enabled and O11y is enabled
+        if (this.isSfdxTelemetryEnabled() && this.enableO11y && this.o11yReporter) {
+            void this.o11yReporter.sendTelemetryEvent(eventName, attributes).catch((error) => {
+                this.logger.debug('Failed to send event to O11y:', error);
+            });
+        }
     }
     /**
-     * Sends exception to child process.
+     * Sends exception to both AppInsights and O11y (if enabled).
      *
      * @param exception {Error} - exception you want published.
-     * @param attributes {Attributes} - map of measurements to publish alongside the event.
+     * @param attributes {Attributes} - map of measurements to publish alongside the exception.
      */
     sendTelemetryException(exception, attributes = {}) {
+        // Send to AppInsights only if SFDX telemetry is enabled
         if (this.isSfdxTelemetryEnabled()) {
             // Scrub stack for GDPR
-            exception.stack = exception.stack?.replace(new RegExp(os.homedir(), 'g'), appInsights_1.AppInsights.GDPR_HIDDEN);
-            this.reporter.sendTelemetryException(exception, attributes);
+            const sanitizedException = new Error(exception.message);
+            sanitizedException.name = exception.name;
+            sanitizedException.stack = exception.stack?.replace(new RegExp(os.homedir(), 'g'), appInsights_1.AppInsights.GDPR_HIDDEN);
+            // Send to AppInsights
+            this.reporter.sendTelemetryException(sanitizedException, attributes);
+        }
+        // Send to O11y if telemetry is enabled and O11y is enabled
+        if (this.isSfdxTelemetryEnabled() && this.enableO11y && this.o11yReporter) {
+            void this.o11yReporter.sendTelemetryException(exception, attributes).catch((error) => {
+                this.logger.debug('Failed to send exception to O11y:', error);
+            });
         }
     }
     /**
-     * Publishes diagnostic information to app insights dashboard
+     * Publishes diagnostic information to both AppInsights and O11y (if enabled).
      *
-     * @param traceMessage {string} - trace message to sen to app insights.
+     * @param traceMessage {string} - trace message to send to app insights.
      * @param properties {Properties} - map of properties to publish alongside the event.
      */
     sendTelemetryTrace(traceMessage, properties) {
+        // Send to AppInsights only if SFDX telemetry is enabled
         if (this.isSfdxTelemetryEnabled()) {
+            // Send to AppInsights
             this.reporter.sendTelemetryTrace(traceMessage, properties);
         }
+        // Send to O11y if telemetry is enabled and O11y is enabled
+        if (this.isSfdxTelemetryEnabled() && this.enableO11y && this.o11yReporter) {
+            void this.o11yReporter.sendTelemetryTrace(traceMessage, properties).catch((error) => {
+                this.logger.debug('Failed to send trace to O11y:', error);
+            });
+        }
     }
     /**
-     * Publishes metric to app insights dashboard
+     * Publishes metric to both AppInsights and O11y (if enabled).
      *
      * @param metricName {string} - name of the metric you want published
      * @param value {number} - value of the metric
      * @param properties {Properties} - map of properties to publish alongside the event.
      */
     sendTelemetryMetric(metricName, value, properties) {
+        // Send to AppInsights only if SFDX telemetry is enabled
         if (this.isSfdxTelemetryEnabled()) {
+            // Send to AppInsights
             this.reporter.sendTelemetryMetric(metricName, value, properties);
         }
+        // Send to O11y if telemetry is enabled and O11y is enabled
+        if (this.isSfdxTelemetryEnabled() && this.enableO11y && this.o11yReporter) {
+            void this.o11yReporter.sendTelemetryMetric(metricName, value, properties).catch((error) => {
+                this.logger.debug('Failed to send metric to O11y:', error);
+            });
+        }
     }
     /**
      * Determine if the telemetry event should be logged.

package/lib/types.d.ts

@@ -0,0 +1,25 @@
+import { Env } from '@salesforce/kit';
+export type Properties = {
+    [key: string]: string;
+};
+export type Measurements = {
+    [key: string]: number;
+};
+export type Attributes = {
+    [key: string]: string | number | boolean | null | undefined;
+};
+export type TelemetryOptions = {
+    project: string;
+    key: string;
+    commonProperties?: Properties;
+    contextTags?: Properties;
+    env?: Env;
+    gdprSensitiveKeys?: string[];
+    userId?: string;
+    sessionId?: string;
+    waitForConnection?: boolean;
+    o11yUploadEndpoint?: string;
+    enableO11y?: boolean;
+    enableAppInsights?: boolean;
+    extensionName?: string;
+};

package/lib/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/utils.d.ts

@@ -0,0 +1,5 @@
+import { Attributes, Properties, Measurements } from './types';
+export declare function buildPropertiesAndMeasurements(attributes: Attributes): {
+    properties: Properties;
+    measurements: Measurements;
+};

package/lib/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildPropertiesAndMeasurements = buildPropertiesAndMeasurements;
+function buildPropertiesAndMeasurements(attributes) {
+    const properties = {};
+    const measurements = {};
+    Object.keys(attributes).forEach((key) => {
+        const value = attributes[key];
+        if (typeof value === 'string') {
+            properties[key] = value.replace(process.env.HOME ?? '', '~');
+        }
+        else if (typeof value === 'number') {
+            measurements[key] = value;
+        }
+        else if (typeof value === 'boolean') {
+            properties[key] = value.toString();
+        }
+    });
+    return { properties, measurements };
+}
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/telemetry",
-  "version": "6.0.38",
-  "description": "Library for application insights",
+  "version": "6.1.0",
+  "description": "Library for telemetry reporting to Application Insights and O11y",
   "main": "lib/exported",
   "exports": {
     "./enabledCheck": "./lib/enabledCheck.js",
@@ -9,13 +9,14 @@
   },
   "repository": "forcedotcom/telemetry",
   "author": "Salesforce",
-  "license": "BSD-3-Clause",
+  "license": "Apache-2.0",
   "scripts": {
     "build": "wireit",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
     "compile": "wireit",
     "docs": "sf-docs",
+    "fix-license": "eslint src test --fix --rule \"header/header: [2]\"",
     "format": "wireit",
     "link-check": "wireit",
     "lint": "wireit",
@@ -42,12 +43,13 @@
   "dependencies": {
     "@salesforce/core": "^8.8.0",
     "@salesforce/kit": "^3.2.3",
+    "@salesforce/o11y-reporter": "1.1.1",
     "applicationinsights": "^2.9.6",
     "got": "^11",
-    "proxy-agent": "^6.4.0"
+    "proxy-agent": "^6.5.0"
   },
   "devDependencies": {
-    "@salesforce/dev-scripts": "^10.2.10",
+    "@salesforce/dev-scripts": "^11.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
@@ -128,7 +130,7 @@
       "output": []
     },
     "link-check": {
-      "command": "node -e \"process.exit(process.env.CI ? 0 : 1)\" || linkinator \"**/*.md\" --skip \"CHANGELOG.md|node_modules|test/|confluence.internal.salesforce.com|my.salesforce.com|%s\" --markdown --retry --directory-listing --verbosity error",
+      "command": "node -e \"process.exit(process.env.CI ? 0 : 1)\" || linkinator \"**/*.md\" --skip \"CHANGELOG.md|node_modules|test/|confluence.internal.salesforce.com|my.salesforce.com|localhost|%s\" --markdown --retry --directory-listing --verbosity error",
       "files": [
         "./*.md",
         "./!(CHANGELOG).md",