@dxos/observability 0.3.11-main.5c52a13 → 0.3.11-main.5cbcf4e

package/dist/types/src/helpers/{app-observability.js → browser-observability.js}

@@ -25,44 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeAppObservability = exports.storeObservabilityGroup = exports.getObservabilityGroup = exports.storeObservabilityDisabled = exports.isObservabilityDisabled = exports.getTelemetryIdentifier = exports.OBSERVABILITY_GROUP_KEY = exports.OBSERVABILITY_DISABLED_KEY = exports.BASE_TELEMETRY_PROPERTIES = void 0;
+exports.initializeAppObservability = exports.storeObservabilityGroup = exports.getObservabilityGroup = exports.storeObservabilityDisabled = exports.isObservabilityDisabled = exports.OBSERVABILITY_GROUP_KEY = exports.OBSERVABILITY_DISABLED_KEY = void 0;
 // NOTE: localStorage is not available in web workers.
 const localForage = __importStar(require("localforage"));
 const log_1 = require("@dxos/log");
-exports.BASE_TELEMETRY_PROPERTIES = {};
-// item name is 'telemetry' for backwards compatibility
-exports.OBSERVABILITY_DISABLED_KEY = 'telemetry-disabled';
-exports.OBSERVABILITY_GROUP_KEY = 'telemetry-group';
-if (typeof navigator !== 'undefined' && ((_a = navigator.storage) === null || _a === void 0 ? void 0 : _a.estimate)) {
-    setInterval(async () => {
-        try {
-            const storageEstimate = await navigator.storage.estimate();
-            exports.BASE_TELEMETRY_PROPERTIES.storageUsage = storageEstimate.usage;
-            exports.BASE_TELEMETRY_PROPERTIES.storageQuota = storageEstimate.quota;
-        }
-        catch (error) {
-            log_1.log.warn('Failed to run estimate()', error);
-        }
-    }, 10e3);
-}
-// TODO(wittjosiah): Improve privacy of telemetry identifiers.
-//  - Identifier should be generated client-side with no attachment to identity.
-//  - Identifier can then be reset by user.
-//  - Identifier can be synced via HALO to allow for correlation of events bewteen devices.
-//  - Identifier should also be stored outside of HALO such that it is available immediately on startup.
-const getTelemetryIdentifier = (client) => {
-    if (!(client === null || client === void 0 ? void 0 : client.initialized)) {
-        return undefined;
-    }
-    const identity = client.halo.identity.get();
-    if (identity) {
-        return identity.identityKey.truncate();
-    }
-    return undefined;
-};
-exports.getTelemetryIdentifier = getTelemetryIdentifier;
+exports.OBSERVABILITY_DISABLED_KEY = 'observability-disabled';
+exports.OBSERVABILITY_GROUP_KEY = 'observability-group';
 const isObservabilityDisabled = async (namespace) => {
     try {
         return (await localForage.getItem(`${namespace}:${exports.OBSERVABILITY_DISABLED_KEY}`)) === 'true';
@@ -101,11 +70,11 @@ const storeObservabilityGroup = async (namespace, value) => {
     }
 };
 exports.storeObservabilityGroup = storeObservabilityGroup;
-// TODO(wittjosiah): Store preference for disabling telemetry.
+// TODO(wittjosiah): Store preference for disabling observability.
 //   At minimum should be stored locally (i.e., localstorage), possibly in halo preference.
 //   Needs to be hooked up to settings page for user visibility.
 const initializeAppObservability = async ({ namespace, config, mode = 'basic', tracingEnable = true, replayEnable = true, }) => {
-    var _a;
+    var _a, _b;
     (0, log_1.log)('initializeAppObservability', { config });
     /*
       const platform = (await client.services.services.SystemService?.getPlatform()) as Platform;
@@ -117,9 +86,6 @@ const initializeAppObservability = async ({ namespace, config, mode = 'basic', t
     const group = (_a = (await (0, exports.getObservabilityGroup)(namespace))) !== null && _a !== void 0 ? _a : undefined;
     const release = `${namespace}@${config.get('runtime.app.build.version')}`;
     const environment = config.get('runtime.app.env.DX_ENVIRONMENT');
-    exports.BASE_TELEMETRY_PROPERTIES.group = group;
-    exports.BASE_TELEMETRY_PROPERTIES.release = release;
-    exports.BASE_TELEMETRY_PROPERTIES.environment = environment;
     const observabilityDisabled = await (0, exports.isObservabilityDisabled)(namespace);
     const { Observability } = await Promise.resolve().then(() => __importStar(require('../observability')));
     // TODO(nf): configure mode
@@ -151,11 +117,10 @@ const initializeAppObservability = async ({ namespace, config, mode = 'basic', t
         const getIPData = async (config) => {
             const IP_DATA_CACHE_TIMEOUT = 6 * 60 * 60 * 1000; // 6 hours
             // Check cache first.
-            const cachedData = await localForage.getItem('dxos:telemetry:ipdata');
+            const cachedData = await localForage.getItem('dxos:observability:ipdata');
             if (cachedData && cachedData.timestamp > Date.now() - IP_DATA_CACHE_TIMEOUT) {
                 return cachedData.data;
             }
-            // TODO(nf): move into observability
             // Fetch data if not cached.
             const IPDATA_API_KEY = config.get('runtime.app.env.DX_IPDATA_API_KEY');
             if (IPDATA_API_KEY) {
@@ -164,7 +129,7 @@ const initializeAppObservability = async ({ namespace, config, mode = 'basic', t
                     .then((data) => {
                     // Cache data.
                     localForage
-                        .setItem('dxos:telemetry:ipdata', {
+                        .setItem('dxos:observability:ipdata', {
                         data,
                         timestamp: Date.now(),
                     })
@@ -174,17 +139,23 @@ const initializeAppObservability = async ({ namespace, config, mode = 'basic', t
                     .catch((err) => observability.captureException(err));
             }
         };
-        const ipData = await getIPData(config);
-        if (ipData && ipData.city) {
-            exports.BASE_TELEMETRY_PROPERTIES.city = ipData.city;
-            exports.BASE_TELEMETRY_PROPERTIES.region = ipData.region;
-            exports.BASE_TELEMETRY_PROPERTIES.country = ipData.country;
-            exports.BASE_TELEMETRY_PROPERTIES.latitude = ipData.latitude;
-            exports.BASE_TELEMETRY_PROPERTIES.longitude = ipData.longitude;
-        }
         // TODO(nf): plugin state?
         // TODO(nf): should provide capability to init Sentry earlier in booting process to capture errors during initialization.
         observability.initialize();
+        const ipData = await getIPData(config);
+        ipData && observability.addIPDataTelemetryTags(ipData);
+        if (typeof navigator !== 'undefined' && ((_b = navigator.storage) === null || _b === void 0 ? void 0 : _b.estimate)) {
+            setInterval(async () => {
+                try {
+                    const storageEstimate = await navigator.storage.estimate();
+                    storageEstimate.usage && observability.setTag('storageUsage', storageEstimate.usage.toString(), 'telemetry');
+                    storageEstimate.quota && observability.setTag('storageQuota', storageEstimate.quota.toString(), 'telemetry');
+                }
+                catch (error) {
+                    log_1.log.warn('Failed to run estimate()', error);
+                }
+            }, 10e3);
+        }
     }
     catch (err) {
         log_1.log.error('Failed to initialize app observability', err);
@@ -192,4 +163,4 @@ const initializeAppObservability = async ({ namespace, config, mode = 'basic', t
     return observability;
 };
 exports.initializeAppObservability = initializeAppObservability;
-//# sourceMappingURL=app-observability.js.map
+//# sourceMappingURL=browser-observability.js.map

package/dist/types/src/helpers/browser-observability.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser-observability.js","sourceRoot":"","sources":["../../../../src/helpers/browser-observability.ts"],"names":[],"mappings":"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"}

package/dist/types/src/helpers/common.d.ts

@@ -0,0 +1,10 @@
+import type { Client } from '@dxos/client';
+export declare const getTelemetryIdentifier: (client: Client) => string | undefined;
+export type IPData = {
+    city: string;
+    region: string;
+    country: string;
+    latitude: number;
+    longitude: number;
+};
+//# sourceMappingURL=common.d.ts.map

package/dist/types/src/helpers/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/helpers/common.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAO3C,eAAO,MAAM,sBAAsB,WAAY,MAAM,uBAWpD,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dist/types/src/helpers/common.js

@@ -0,0 +1,23 @@
+"use strict";
+//
+// Copyright 2022 DXOS.org
+//
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTelemetryIdentifier = void 0;
+// TODO(wittjosiah): Improve privacy of telemetry identifiers.
+//  - Identifier should be generated client-side with no attachment to identity.
+//  - Identifier can then be reset by user.
+//  - Identifier can be synced via HALO to allow for correlation of events bewteen devices.
+//  - Identifier should also be stored outside of HALO such that it is available immediately on startup.
+const getTelemetryIdentifier = (client) => {
+    if (!(client === null || client === void 0 ? void 0 : client.initialized)) {
+        return undefined;
+    }
+    const identity = client.halo.identity.get();
+    if (identity) {
+        return identity.identityKey.truncate();
+    }
+    return undefined;
+};
+exports.getTelemetryIdentifier = getTelemetryIdentifier;
+//# sourceMappingURL=common.js.map

package/dist/types/src/helpers/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/helpers/common.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAIF,8DAA8D;AAC9D,gFAAgF;AAChF,2CAA2C;AAC3C,2FAA2F;AAC3F,wGAAwG;AACjG,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IACvD,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAA,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC5C,IAAI,QAAQ,EAAE;QACZ,OAAO,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;KACxC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAXW,QAAA,sBAAsB,0BAWjC"}

package/dist/types/src/helpers/index.d.ts

@@ -1,4 +1,6 @@
-export * from './app-observability';
+export * from './browser-observability';
+export * from './common';
+export * from './node-observability';
 export * from './map-spaces';
 export * from './setup-telemetry-listeners';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/helpers/index.ts"],"names":[],"mappings":"AAIA,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/helpers/index.ts"],"names":[],"mappings":"AAIA,cAAc,yBAAyB,CAAC;AACxC,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,6BAA6B,CAAC"}

package/dist/types/src/helpers/index.js

@@ -17,7 +17,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./app-observability"), exports);
+__exportStar(require("./browser-observability"), exports);
+__exportStar(require("./common"), exports);
+__exportStar(require("./node-observability"), exports);
 __exportStar(require("./map-spaces"), exports);
 __exportStar(require("./setup-telemetry-listeners"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/src/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,sDAAoC;AACpC,+CAA6B;AAC7B,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,0DAAwC;AACxC,2CAAyB;AACzB,uDAAqC;AACrC,+CAA6B;AAC7B,8DAA4C"}

package/dist/types/src/helpers/node-observability.d.ts

@@ -0,0 +1,34 @@
+import type { Config } from '@dxos/client';
+import { Observability, type Mode } from '../observability';
+/**
+ * Print observability banner once per installation.
+ */
+export declare const showObservabilityBanner: (configDir: string, bannercb: (input: string) => void) => Promise<void>;
+export declare const getObservabilityState: (configDir: string) => Promise<PersistentObservabilityState>;
+export type TelemetryContext = {
+    mode: Mode;
+    installationId?: string;
+    group?: string;
+    timezone: string;
+    runtime: string;
+    os: string;
+    arch: string;
+    ci: boolean;
+    [key: string]: any;
+};
+export type PersistentObservabilityState = {
+    installationId: string;
+    group?: string;
+    mode: Mode;
+};
+export type NodeObservabilityOptions = {
+    installationId: string;
+    group?: string;
+    namespace: string;
+    config: Config;
+    mode?: Mode;
+    tracingEnable?: boolean;
+    replayEnable?: boolean;
+};
+export declare const initializeNodeObservability: ({ namespace, config, installationId, group, mode, tracingEnable, replayEnable, }: NodeObservabilityOptions) => Promise<Observability>;
+//# sourceMappingURL=node-observability.d.ts.map

package/dist/types/src/helpers/node-observability.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-observability.d.ts","sourceRoot":"","sources":["../../../../src/helpers/node-observability.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,aAAa,EAAE,KAAK,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,uBAAuB,cAAqB,MAAM,oBAAoB,MAAM,KAAK,IAAI,kBAcjG,CAAC;AAEF,eAAO,MAAM,qBAAqB,cAAqB,MAAM,KAAG,QAAQ,4BAA4B,CAkBnG,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,IAAI,CAAC;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AA8BF,MAAM,MAAM,wBAAwB,GAAG;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CAExB,CAAC;AAEF,eAAO,MAAM,2BAA2B,qFAQrC,wBAAwB,KAAG,QAAQ,aAAa,CAgClD,CAAC"}

package/dist/types/src/helpers/node-observability.js

@@ -0,0 +1,106 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeNodeObservability = exports.getObservabilityState = exports.showObservabilityBanner = void 0;
+//
+// Copyright 2022 DXOS.org
+//
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const uuid_1 = require("uuid");
+const log_1 = require("@dxos/log");
+const observability_1 = require("../observability");
+/**
+ * Print observability banner once per installation.
+ */
+const showObservabilityBanner = async (configDir, bannercb) => {
+    const path = (0, node_path_1.join)(configDir, '.observability-banner-printed');
+    if ((0, node_fs_1.existsSync)(path)) {
+        return;
+    }
+    bannercb(
+    // eslint-disable-next-line no-multi-str
+    'Basic observability data will be sent to the DXOS team in order to improve the product. This includes \
+    performance metrics, error logs, and usage data. No personally identifiable information, other than your \
+    public key, is included with this data and no private data ever leaves your devices. To disable sending \
+    observability data, set the environment variable DX_DISABLE_TELEMETRY=true.');
+    await (0, promises_1.writeFile)(path, '', 'utf-8');
+};
+exports.showObservabilityBanner = showObservabilityBanner;
+const getObservabilityState = async (configDir) => {
+    // check whether configDir exists and if it's a directory
+    var _a;
+    if ((0, node_fs_1.existsSync)(configDir)) {
+        if (!(0, node_fs_1.statSync)(configDir).isDirectory()) {
+            throw new Error(`Config directory ${configDir} exists but is not a directory`);
+        }
+    }
+    else {
+        await (0, promises_1.mkdir)(configDir, { recursive: true });
+    }
+    const idPath = (0, node_path_1.join)(configDir, 'observability.yml');
+    if ((0, node_fs_1.existsSync)(idPath)) {
+        const context = await (0, promises_1.readFile)(idPath, 'utf-8');
+        return (_a = validate(context)) !== null && _a !== void 0 ? _a : initializeState(idPath);
+    }
+    return initializeState(idPath);
+};
+exports.getObservabilityState = getObservabilityState;
+// create initial state and write to file, using environment variables to override defaults.
+const initializeState = async (idPath) => {
+    var _a, _b;
+    // TODO(nf): read initial values from config or seed file
+    const observabilityState = {
+        installationId: (0, uuid_1.v4)(),
+        group: (_a = process.env.DX_TELEMETRY_GROUP) !== null && _a !== void 0 ? _a : undefined,
+        mode: (process.env.DX_DISABLE_TELEMETRY ? 'disabled' : (_b = process.env.DX_TELEMETRY_MODE) !== null && _b !== void 0 ? _b : 'basic'),
+    };
+    await (0, promises_1.writeFile)(idPath, '# This file is automatically generated by the @dxos/cli.\n' + js_yaml_1.default.dump(observabilityState), 'utf-8');
+    return observabilityState;
+};
+const validate = (contextString) => {
+    var _a;
+    const context = js_yaml_1.default.load(contextString);
+    if (Boolean(context.installationId) && (0, uuid_1.validate)(context.installationId)) {
+        return {
+            ...context,
+            mode: process.env.DX_DISABLE_TELEMETRY ? 'disabled' : (_a = context.mode) !== null && _a !== void 0 ? _a : 'basic',
+        };
+    }
+};
+const initializeNodeObservability = async ({ namespace, config, installationId, group, mode = 'basic', tracingEnable = true, replayEnable = true, }) => {
+    (0, log_1.log)('initializeCliObservability', { config });
+    const release = `${namespace}@${config.get('runtime.app.build.version')}`;
+    const environment = config.get('runtime.app.env.DX_ENVIRONMENT');
+    const observability = new observability_1.Observability({
+        namespace,
+        group,
+        mode,
+        errorLog: {
+            sentryInitOptions: {
+                environment,
+                release,
+                // TODO(wittjosiah): Configure this.
+                sampleRate: 1.0,
+            },
+            logProcessor: true,
+        },
+    });
+    observability.setTag('installationId', installationId);
+    const IPDATA_API_KEY = config.get('runtime.app.env.DX_IPDATA_API_KEY');
+    try {
+        const res = await fetch(`https://api.ipdata.co/?api-key=${IPDATA_API_KEY}`);
+        const ipData = await res.json();
+        ipData && observability.addIPDataTelemetryTags(ipData);
+    }
+    catch (err) {
+        observability === null || observability === void 0 ? void 0 : observability.captureException(err);
+    }
+    return observability;
+};
+exports.initializeNodeObservability = initializeNodeObservability;
+//# sourceMappingURL=node-observability.js.map

package/dist/types/src/helpers/node-observability.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-observability.js","sourceRoot":"","sources":["../../../../src/helpers/node-observability.ts"],"names":[],"mappings":"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"}

package/dist/types/src/helpers/setup-telemetry-listeners.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-telemetry-listeners.d.ts","sourceRoot":"","sources":["../../../../src/helpers/setup-telemetry-listeners.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKtD,eAAO,MAAM,uBAAuB,cAAe,MAAM,UAAU,MAAM,iBAAiB,aAAa,eAsGtG,CAAC"}
+{"version":3,"file":"setup-telemetry-listeners.d.ts","sourceRoot":"","sources":["../../../../src/helpers/setup-telemetry-listeners.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKtD,eAAO,MAAM,uBAAuB,cAAe,MAAM,UAAU,MAAM,iBAAiB,aAAa,eAiGtG,CAAC"}

package/dist/types/src/helpers/setup-telemetry-listeners.js

@@ -4,22 +4,21 @@
 //
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTelemetryListeners = void 0;
-const app_observability_1 = require("./app-observability");
+const common_1 = require("./common");
 let lastFocusEvent = new Date();
 let totalTime = 0;
 const setupTelemetryListeners = (namespace, client, observability) => {
     const clickCallback = (event) => {
-        if (app_observability_1.BASE_TELEMETRY_PROPERTIES.group === 'dxos' && event.target && !event.target.id) {
+        if (observability.group === 'dxos' && event.target && !event.target.id) {
             // TODO(wittjosiah): Use @dxos/log so these can be filtered.
             console.warn('Click event on element without id:', event.target);
         }
         setTimeout(() => {
             var _a, _b;
             return observability.event({
-                identityId: (0, app_observability_1.getTelemetryIdentifier)(client),
+                identityId: (0, common_1.getTelemetryIdentifier)(client),
                 name: `${namespace}.window.click`,
                 properties: {
-                    ...app_observability_1.BASE_TELEMETRY_PROPERTIES,
                     href: window.location.href,
                     id: (_a = event.target) === null || _a === void 0 ? void 0 : _a.id,
                     path: (_b = event.path) === null || _b === void 0 ? void 0 : _b.filter((el) => Boolean(el.tagName)).map((el) => `${el.tagName.toLowerCase()}${el.id ? `#${el.id}` : ''}`).reverse().join('>'),
@@ -30,10 +29,9 @@ const setupTelemetryListeners = (namespace, client, observability) => {
     const focusCallback = () => {
         const now = new Date();
         setTimeout(() => observability.event({
-            identityId: (0, app_observability_1.getTelemetryIdentifier)(client),
+            identityId: (0, common_1.getTelemetryIdentifier)(client),
             name: `${namespace}.window.focus`,
             properties: {
-                ...app_observability_1.BASE_TELEMETRY_PROPERTIES,
                 href: window.location.href,
                 timeAway: now.getTime() - lastFocusEvent.getTime(),
             },
@@ -44,10 +42,9 @@ const setupTelemetryListeners = (namespace, client, observability) => {
         const now = new Date();
         const timeSpent = now.getTime() - lastFocusEvent.getTime();
         setTimeout(() => observability.event({
-            identityId: (0, app_observability_1.getTelemetryIdentifier)(client),
+            identityId: (0, common_1.getTelemetryIdentifier)(client),
             name: `${namespace}.window.blur`,
             properties: {
-                ...app_observability_1.BASE_TELEMETRY_PROPERTIES,
                 href: window.location.href,
                 timeSpent,
             },
@@ -57,10 +54,9 @@ const setupTelemetryListeners = (namespace, client, observability) => {
     };
     const unloadCallback = () => {
         setTimeout(() => observability.event({
-            identityId: (0, app_observability_1.getTelemetryIdentifier)(client),
+            identityId: (0, common_1.getTelemetryIdentifier)(client),
             name: `${namespace}.page.unload`,
             properties: {
-                ...app_observability_1.BASE_TELEMETRY_PROPERTIES,
                 href: window.location.href,
                 timeSpent: totalTime,
             },
@@ -68,10 +64,9 @@ const setupTelemetryListeners = (namespace, client, observability) => {
     };
     const errorCallback = (event) => {
         setTimeout(() => observability.event({
-            identityId: (0, app_observability_1.getTelemetryIdentifier)(client),
+            identityId: (0, common_1.getTelemetryIdentifier)(client),
             name: `${namespace}.window.error`,
             properties: {
-                ...app_observability_1.BASE_TELEMETRY_PROPERTIES,
                 href: window.location.href,
                 message: event.message,
                 filename: event.filename,

package/dist/types/src/helpers/setup-telemetry-listeners.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-telemetry-listeners.js","sourceRoot":"","sources":["../../../../src/helpers/setup-telemetry-listeners.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup-telemetry-listeners.js","sourceRoot":"","sources":["../../../../src/helpers/setup-telemetry-listeners.ts"],"names":[],"mappings":"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"}

package/dist/types/src/observability.d.ts

@@ -1,4 +1,5 @@
 import { type Client, type Config } from '@dxos/client';
+import { type IPData } from './helpers';
 import { type EventOptions, type PageOptions } from './segment';
 import { type InitOptions } from './sentry';
 export type ObservabilitySecrets = {
@@ -11,6 +12,7 @@ export type ObservabilitySecrets = {
     DATADOG_APP_KEY: string | null;
 };
 export type Mode = 'basic' | 'full' | 'disabled';
+export type TagScope = 'errors' | 'telemetry' | 'metrics' | 'all';
 export type ObservabilityOptions = {
     namespace: string;
     config?: Config;
@@ -44,11 +46,10 @@ export declare class Observability {
     close(): Promise<void>;
     setMode(mode: Mode): void;
     get mode(): Mode;
+    get group(): string | undefined;
     get enabled(): boolean;
-    /**
-     * Set a tag for all observability services.
-     */
-    setTag(key: string, value: string): void;
+    setTag(key: string, value: string, scope?: TagScope): void;
+    addIPDataTelemetryTags: (ipData: IPData) => void;
     setIdentityTags(client: Client): Promise<void>;
     private _initMetrics;
     /**

package/dist/types/src/observability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observability.d.ts","sourceRoot":"","sources":["../../../src/observability.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAYxD,OAAO,EAAoB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAClF,OAAO,EAKL,KAAK,WAAW,EAEjB,MAAM,UAAU,CAAC;AAWlB,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,CAAC;AAEjD,MAAM,MAAM,oBAAoB,GAAG;IAEjC,SAAS,EAAE,MAAM,CAAC;IAGlB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ,SAAS,CAAC,EAAE;QACV,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,QAAQ,CAAC,EAAE;QACT,iBAAiB,CAAC,EAAE,WAAW,CAAC;QAChC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH,CAAC;AAMF,qBAAa,aAAa;IAExB,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAElC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,UAAU,CAAC,CAAmB;IAEtC,OAAO,CAAC,sBAAsB,CAAC,CAAc;IAC7C,OAAO,CAAC,kBAAkB,CAAU;IAEpC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,MAAM,CAAC,CAAS;IAExB,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,KAAK,CAA6B;gBAG9B,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,oBAAoB;IAoBlG,OAAO,CAAC,YAAY;IAmBpB,UAAU;IAMJ,KAAK;IAMX,OAAO,CAAC,IAAI,EAAE,IAAI;IAIlB,IAAI,IAAI,SAEP;IAED,IAAI,OAAO,YAEV;IAMD;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAS3B,eAAe,CAAC,MAAM,EAAE,MAAM;IAiCpC,OAAO,CAAC,YAAY;IAapB;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG;IAMxD,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAkDlC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAmD9C,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAA8B;IAwCnF,OAAO,CAAC,cAAc;IAYtB;;;;OAIG;IACH,KAAK,CAAC,OAAO,EAAE,YAAY;IAI3B;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,WAAW;IAQzB,OAAO,CAAC,cAAc;IA8BtB;;;;OAIG;IACH,gBAAgB,CAAC,GAAG,EAAE,GAAG;CAK1B"}
+{"version":3,"file":"observability.d.ts","sourceRoot":"","sources":["../../../src/observability.ts"],"names":[],"mappings":"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"}

package/dist/types/src/observability.js

@@ -22,8 +22,6 @@ const sentry_1 = require("./sentry");
 const SPACE_METRICS_MIN_INTERVAL = 1000 * 60;
 // const DATADOG_IDLE_INTERVAL = 1000 * 60 * 5;
 const DATADOG_IDLE_INTERVAL = 1000 * 60 * 1;
-// TODO(nf): add allowlist for telemetry tags?
-const ERROR_TAGS = ['identityKey', 'username', 'deviceKey', 'group'];
 /*
  * Observability provides a common interface for error logging, metrics, and telemetry.
  * It currently provides these capabilities using Sentry, Datadog, and Segment.
@@ -36,6 +34,13 @@ class Observability {
         // TODO(nf): accept upstream context?
         this._ctx = new context_1.Context();
         this._tags = new Map();
+        this.addIPDataTelemetryTags = (ipData) => {
+            this.setTag('city', ipData.city, 'telemetry');
+            this.setTag('region', ipData.region, 'telemetry');
+            this.setTag('country', ipData.country, 'telemetry');
+            ipData.latitude && this.setTag('latitude', ipData.latitude.toString(), 'telemetry');
+            ipData.longitude && this.setTag('longitude', ipData.longitude.toString(), 'telemetry');
+        };
         this._namespace = namespace;
         this._config = config;
         this._mode = mode !== null && mode !== void 0 ? mode : 'disabled';
@@ -86,20 +91,23 @@ class Observability {
     get mode() {
         return this._mode;
     }
+    get group() {
+        return this._group;
+    }
     get enabled() {
         return this._mode !== 'disabled';
     }
     //
     // Tags
     //
-    /**
-     * Set a tag for all observability services.
-     */
-    setTag(key, value) {
-        if (this.enabled && ERROR_TAGS.includes(key)) {
+    setTag(key, value, scope) {
+        if (this.enabled && (scope === undefined || scope === 'all' || scope === 'errors')) {
             (0, sentry_1.setTag)(key, value);
         }
-        this._tags.set(key, value);
+        if (!scope) {
+            scope = 'all';
+        }
+        this._tags.set(key, { value, scope });
     }
     // TODO(wittjosiah): Improve privacy of telemetry identifiers. See `getTelemetryIdentifier`.
     async setIdentityTags(client) {
@@ -136,7 +144,11 @@ class Observability {
         if (this.enabled && this._secrets.DATADOG_API_KEY) {
             this._metrics = new datadog_1.DatadogMetrics({
                 apiKey: this._secrets.DATADOG_API_KEY,
-                getTags: () => this._tags,
+                getTags: () => Object.fromEntries(Array.from(this._tags)
+                    .filter(([key, value]) => {
+                    return value.scope === 'all' || value.scope === 'metrics';
+                })
+                    .map(([key, value]) => [key, value.value])),
                 // TODO(nf): move/refactor from telementryContext, needed to read CORS proxy
                 config: this._config,
             });
@@ -215,10 +227,7 @@ class Observability {
                 this.event({
                     identityId: (0, helpers_1.getTelemetryIdentifier)(client),
                     name: `${namespace}.space.update`,
-                    properties: {
-                        ...helpers_1.BASE_TELEMETRY_PROPERTIES,
-                        ...data,
-                    },
+                    properties: data,
                 });
             }
         });
@@ -279,7 +288,11 @@ class Observability {
             this._telemetry = new segment_1.SegmentTelemetry({
                 apiKey: this._secrets.TELEMETRY_API_KEY,
                 batchSize: this._telemetryBatchSize,
-                getTags: () => this._tags,
+                getTags: () => Object.fromEntries(Array.from(this._tags)
+                    .filter(([key, value]) => {
+                    return value.scope === 'all' || value.scope === 'telemetry';
+                })
+                    .map(([key, value]) => [key, value.value])),
             });
         }
         else {
@@ -329,8 +342,8 @@ class Observability {
             }
             // TODO(nf): is this different than passing as properties in options?
             this._tags.forEach((v, k) => {
-                if (ERROR_TAGS.includes(k)) {
-                    (0, sentry_1.setTag)(k, v);
+                if (v.scope === 'all' || v.scope === 'errors') {
+                    (0, sentry_1.setTag)(k, v.value);
                 }
             });
         }