@dxos/observability 0.3.11-main.2f1331c → 0.3.11-main.463e5cd

package/dist/types/src/segment/browser.js

@@ -30,7 +30,7 @@ class SegmentTelemetry {
         var _a;
         try {
             (_a = window.analytics) === null || _a === void 0 ? void 0 : _a.page({
-                context: Object.fromEntries(this._getTags().entries()),
+                context: this._getTags(),
                 ...options,
                 userId,
             });
@@ -44,7 +44,7 @@ class SegmentTelemetry {
         try {
             options.properties = {
                 ...options.properties,
-                ...Object.fromEntries(this._getTags().entries()),
+                ...this._getTags(),
             };
             (_a = window.analytics) === null || _a === void 0 ? void 0 : _a.track({
                 ...options,

package/dist/types/src/segment/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/segment/browser.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,+DAAuC;AAEvC,mCAAgC;AAGhC,sCAA6C;AAE7C,MAAa,gBAAgB;IAG3B,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAA2B;QACjE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI;YACF,MAAM,QAAQ,GAAG,iBAAO,CAAC,GAAG,CAAC;gBAC3B,MAAM;gBACN,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;SAClD;IACH,CAAC;IAED,IAAI,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,KAAkB,EAAE;;QACvD,IAAI;YACF,MAAC,MAAc,CAAC,SAAS,0CAAE,IAAI,CAAC;gBAC9B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;gBACtD,GAAG,OAAO;gBACV,MAAM;aACP,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;SACxC;IACH,CAAC;IAED,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAgB;;QACjE,IAAI;YACF,OAAO,CAAC,UAAU,GAAG;gBACnB,GAAG,OAAO,CAAC,UAAU;gBACrB,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;aACjD,CAAC;YACF,MAAC,MAAc,CAAC,SAAS,0CAAE,KAAK,CAAC;gBAC/B,GAAG,OAAO;gBACV,KAAK;aACN,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;SACzC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;;QACT,IAAI;YACF,MAAM,CAAA,MAAC,MAAc,CAAC,SAAS,0CAAE,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAClD,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC,CAAC,CAAA,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;SAC7C;IACH,CAAC;CACF;AAvDD,4CAuDC"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/segment/browser.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,+DAAuC;AAEvC,mCAAgC;AAGhC,sCAA6C;AAE7C,MAAa,gBAAgB;IAG3B,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAA2B;QACjE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI;YACF,MAAM,QAAQ,GAAG,iBAAO,CAAC,GAAG,CAAC;gBAC3B,MAAM;gBACN,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;SAClD;IACH,CAAC;IAED,IAAI,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,KAAkB,EAAE;;QACvD,IAAI;YACF,MAAC,MAAc,CAAC,SAAS,0CAAE,IAAI,CAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;gBACxB,GAAG,OAAO;gBACV,MAAM;aACP,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;SACxC;IACH,CAAC;IAED,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAgB;;QACjE,IAAI;YACF,OAAO,CAAC,UAAU,GAAG;gBACnB,GAAG,OAAO,CAAC,UAAU;gBACrB,GAAG,IAAI,CAAC,QAAQ,EAAE;aACnB,CAAC;YACF,MAAC,MAAc,CAAC,SAAS,0CAAE,KAAK,CAAC;gBAC/B,GAAG,OAAO;gBACV,KAAK;aACN,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;SACzC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;;QACT,IAAI;YACF,MAAM,CAAA,MAAC,MAAc,CAAC,SAAS,0CAAE,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAClD,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC,CAAC,CAAA,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;SAC7C;IACH,CAAC;CACF;AAvDD,4CAuDC"}

package/dist/types/src/segment/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../../src/segment/node.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGlF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAA4B;gBAEhC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,uBAAuB;IAcnE;;OAEG;IACH,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,GAAE,WAAgB;IAiBtF;;OAEG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,EAAE,YAAY;IAoBhG;;OAEG;IACG,KAAK;CAcZ"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../../src/segment/node.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGlF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAAkC;gBAEtC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,uBAAuB;IAcnE;;OAEG;IACH,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,GAAE,WAAgB;IAiBtF;;OAEG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,EAAE,YAAY;IAoBhG;;OAEG;IACG,KAAK;CAcZ"}

package/dist/types/src/segment/node.js

@@ -48,7 +48,7 @@ class SegmentTelemetry {
      * Track an event.
      */
     event({ installationId: anonymousId, identityId: userId, name: event, ...options }) {
-        (0, log_1.log)('sending event to telemetry', { event, options, tags: Object.fromEntries(this._getTags().entries()) });
+        (0, log_1.log)('sending event to telemetry', { event, options, tags: this._getTags() });
         if (!this._analytics) {
             (0, log_1.log)('Analytics not initialized', { action: 'event' });
             return;
@@ -56,7 +56,7 @@ class SegmentTelemetry {
         try {
             this._analytics.track({
                 ...options,
-                context: Object.fromEntries(this._getTags().entries()),
+                context: this._getTags(),
                 userId,
                 anonymousId: anonymousId,
                 event,

package/dist/types/src/segment/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../../src/segment/node.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oEAAuC;AAEvC,+CAA4C;AAC5C,mCAAgC;AAGhC,sCAA6C;AAE7C,MAAa,gBAAgB;IAI3B,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAA2B;QACjE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI;YACF,IAAA,qBAAS,EAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;YAEpD,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAS,CAAC,MAAM,EAAE;gBACtC,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;SAClD;IACH,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,KAAkB,EAAE;QACpF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACrD,OAAO;SACR;QAED,IAAI;YACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACnB,GAAG,OAAO;gBACV,MAAM;gBACN,WAAW,EAAE,WAAY;aAC1B,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;SACxC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAgB;QAC9F,IAAA,SAAG,EAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3G,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI;YACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACpB,GAAG,OAAO;gBACV,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;gBACtD,MAAM;gBACN,WAAW,EAAE,WAAY;gBACzB,KAAK;aACN,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;SACzC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI;YACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClC,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;SACnC;IACH,CAAC;CACF;AA9ED,4CA8EC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../../src/segment/node.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oEAAuC;AAEvC,+CAA4C;AAC5C,mCAAgC;AAGhC,sCAA6C;AAE7C,MAAa,gBAAgB;IAI3B,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAA2B;QACjE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI;YACF,IAAA,qBAAS,EAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;YAEpD,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAS,CAAC,MAAM,EAAE;gBACtC,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;SAClD;IACH,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,KAAkB,EAAE;QACpF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACrD,OAAO;SACR;QAED,IAAI;YACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACnB,GAAG,OAAO;gBACV,MAAM;gBACN,WAAW,EAAE,WAAY;aAC1B,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;SACxC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAgB;QAC9F,IAAA,SAAG,EAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI;YACF,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACpB,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;gBACxB,MAAM;gBACN,WAAW,EAAE,WAAY;gBACzB,KAAK;aACN,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;SACzC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI;YACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClC,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,SAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;SACnC;IACH,CAAC;CACF;AA9ED,4CA8EC"}

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

@@ -2,7 +2,9 @@ export type SegmentTelemetryOptions = {
     apiKey?: string;
     batchSize?: number;
     enable?: boolean;
-    getTags: () => Map<string, string>;
+    getTags: () => {
+        [key: string]: string;
+    };
 };
 type CommonOptions = {
     installationId?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/segment/types.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG;IACzC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/segment/types.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC1C,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG;IACzC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/observability",
-  "version": "0.3.11-main.2f1331c",
+  "version": "0.3.11-main.463e5cd",
   "description": "Provides a common interface for app and platform observability",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -65,24 +65,28 @@
     "analytics-node": "^6.2.0",
     "datadog-metrics": "^0.11.1",
     "debug": "^4.3.4",
-    "@dxos/async": "0.3.11-main.2f1331c",
-    "@dxos/client-protocol": "0.3.11-main.2f1331c",
-    "@dxos/client-services": "0.3.11-main.2f1331c",
-    "@dxos/context": "0.3.11-main.2f1331c",
-    "@dxos/config": "0.3.11-main.2f1331c",
-    "@dxos/debug": "0.3.11-main.2f1331c",
-    "@dxos/log": "0.3.11-main.2f1331c",
-    "@dxos/invariant": "0.3.11-main.2f1331c",
-    "@dxos/network-manager": "0.3.11-main.2f1331c",
-    "@dxos/node-std": "0.3.11-main.2f1331c",
-    "@dxos/protocols": "0.3.11-main.2f1331c",
-    "@dxos/react-client": "0.3.11-main.2f1331c",
-    "@dxos/util": "0.3.11-main.2f1331c"
+    "js-yaml": "^4.1.0",
+    "localforage": "^1.10.0",
+    "uuid": "^8.3.2",
+    "@dxos/async": "0.3.11-main.463e5cd",
+    "@dxos/client-protocol": "0.3.11-main.463e5cd",
+    "@dxos/context": "0.3.11-main.463e5cd",
+    "@dxos/client-services": "0.3.11-main.463e5cd",
+    "@dxos/debug": "0.3.11-main.463e5cd",
+    "@dxos/config": "0.3.11-main.463e5cd",
+    "@dxos/invariant": "0.3.11-main.463e5cd",
+    "@dxos/log": "0.3.11-main.463e5cd",
+    "@dxos/network-manager": "0.3.11-main.463e5cd",
+    "@dxos/node-std": "0.3.11-main.463e5cd",
+    "@dxos/react-client": "0.3.11-main.463e5cd",
+    "@dxos/protocols": "0.3.11-main.463e5cd",
+    "@dxos/util": "0.3.11-main.463e5cd"
   },
   "devDependencies": {
     "@sentry/types": "^7.98.0",
     "@types/analytics-node": "^3.1.9",
     "@types/debug": "^4.1.10",
+    "@types/js-yaml": "^4.0.5",
     "sentry-testkit": "^5.0.5"
   },
   "publishConfig": {

package/src/datadog/metrics.ts

@@ -16,7 +16,7 @@ export type DatadogOptions = {
   apiKey: string;
   host?: string;
   site?: String;
-  getTags: () => Map<string, string>;
+  getTags: () => { [key: string]: string };
   // needed to read CORS proxy
   config: Config;
 };
@@ -25,7 +25,7 @@ debug.enable('metrics');
 
 export class DatadogMetrics {
   private _datadogmetrics?: any;
-  private _getTags: () => Map<string, string>;
+  private _getTags: () => { [key: string]: string };
 
   constructor(options: DatadogOptions) {
     this._getTags = options.getTags;
@@ -36,9 +36,7 @@ export class DatadogMetrics {
 
   gauge(name: string, value: number, tags?: any) {
     invariant(this._datadogmetrics, 'Datadog not initialized');
-    const mergedTags = Object.entries({ ...Object.fromEntries(this._getTags().entries()), ...tags }).map(
-      ([key, value]) => `${key}:${value}`,
-    );
+    const mergedTags = Object.entries({ ...this._getTags(), ...tags }).map(([key, value]) => `${key}:${value}`);
     log('datadog gauge', { name, value, tags: mergedTags });
     this._datadogmetrics.gauge(name, value, mergedTags);
   }

package/src/helpers/browser-observability.ts

@@ -0,0 +1,177 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+// NOTE: localStorage is not available in web workers.
+import * as localForage from 'localforage';
+
+// import { type Platform } from '@dxos/client-services';
+// import { type InitOptions as TelemetryInitOptions } from '@dxos/telemetry';
+
+import type { Config } from '@dxos/client';
+import { log } from '@dxos/log';
+
+import type { IPData } from './common';
+import type { Mode, Observability } from '../observability';
+
+export const OBSERVABILITY_DISABLED_KEY = 'observability-disabled';
+export const OBSERVABILITY_GROUP_KEY = 'observability-group';
+
+export const isObservabilityDisabled = async (namespace: string): Promise<boolean> => {
+  try {
+    return (await localForage.getItem(`${namespace}:${OBSERVABILITY_DISABLED_KEY}`)) === 'true';
+  } catch (err) {
+    log.catch('Failed to check if observability is disabled, assuming it is', err);
+    return true;
+  }
+};
+
+export const storeObservabilityDisabled = async (namespace: string, value: boolean) => {
+  try {
+    await localForage.setItem(`${namespace}:${OBSERVABILITY_DISABLED_KEY}`, String(value));
+  } catch (err) {
+    log.catch('Failed to store observability disabled', err);
+  }
+};
+
+export const getObservabilityGroup = async (namespace: string): Promise<string | undefined> => {
+  try {
+    return (await localForage.getItem(`${namespace}:${OBSERVABILITY_GROUP_KEY}`)) ?? undefined;
+  } catch (err) {
+    log.catch('Failed to get observability group', err);
+  }
+};
+
+export const storeObservabilityGroup = async (namespace: string, value: string) => {
+  try {
+    await localForage.setItem(`${namespace}:${OBSERVABILITY_GROUP_KEY}`, value);
+  } catch (err) {
+    log.catch('Failed to store observability group', err);
+  }
+};
+
+export type AppObservabilityOptions = {
+  namespace: string;
+  config: Config;
+  mode?: Mode;
+  tracingEnable?: boolean;
+  replayEnable?: boolean;
+  // TODO(nf): options for providers?
+};
+
+// 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.
+export const initializeAppObservability = async ({
+  namespace,
+  config,
+  mode = 'basic',
+  tracingEnable = true,
+  replayEnable = true,
+}: AppObservabilityOptions): Promise<Observability> => {
+  log('initializeAppObservability', { config });
+
+  /*
+    const platform = (await client.services.services.SystemService?.getPlatform()) as Platform;
+    if (!platform) {
+      log.error('failed to get platform, could not initialize observability');
+      return undefined;
+    }
+    */
+
+  const group = (await getObservabilityGroup(namespace)) ?? undefined;
+  const release = `${namespace}@${config.get('runtime.app.build.version')}`;
+  const environment = config.get('runtime.app.env.DX_ENVIRONMENT');
+
+  const observabilityDisabled = await isObservabilityDisabled(namespace);
+
+  const { Observability } = await import('../observability');
+
+  // TODO(nf): configure mode
+  const observability = new Observability({
+    namespace,
+    group,
+    mode,
+    config,
+    errorLog: {
+      sentryInitOptions: {
+        environment,
+        release,
+        tracing: tracingEnable,
+        replay: replayEnable,
+        // TODO(wittjosiah): Configure these.
+        sampleRate: 1.0,
+        replaySampleRate: 0.1,
+        replaySampleRateOnError: 1.0,
+      },
+    },
+  });
+
+  // global kill switch
+  if (observabilityDisabled) {
+    observability.setMode('disabled');
+    log.info('observability disabled');
+    return observability;
+  }
+
+  try {
+    const getIPData = async (config: Config): Promise<IPData | void> => {
+      const IP_DATA_CACHE_TIMEOUT = 6 * 60 * 60 * 1000; // 6 hours
+      type CachedIPData = {
+        data: IPData;
+        timestamp: number;
+      };
+
+      // Check cache first.
+      const cachedData: null | CachedIPData = await localForage.getItem('dxos:observability:ipdata');
+      if (cachedData && cachedData.timestamp > Date.now() - IP_DATA_CACHE_TIMEOUT) {
+        return cachedData.data;
+      }
+
+      // Fetch data if not cached.
+      const IPDATA_API_KEY = config.get('runtime.app.env.DX_IPDATA_API_KEY');
+      if (IPDATA_API_KEY) {
+        return fetch(`https://api.ipdata.co?api-key=${IPDATA_API_KEY}`)
+          .then((res) => res.json())
+          .then((data) => {
+            // Cache data.
+            localForage
+              .setItem('dxos:observability:ipdata', {
+                data,
+                timestamp: Date.now(),
+              })
+              .catch((err) => observability.captureException(err));
+
+            return data;
+          })
+          .catch((err) => observability.captureException(err));
+      }
+    };
+
+    // 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' && navigator.storage?.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.warn('Failed to run estimate()', error);
+        }
+      }, 10e3);
+    }
+  } catch (err: any) {
+    log.error('Failed to initialize app observability', err);
+  }
+
+  return observability;
+};

package/src/helpers/common.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import type { Client } from '@dxos/client';
+
+// 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.
+export const getTelemetryIdentifier = (client: Client) => {
+  if (!client?.initialized) {
+    return undefined;
+  }
+
+  const identity = client.halo.identity.get();
+  if (identity) {
+    return identity.identityKey.truncate();
+  }
+
+  return undefined;
+};
+
+export type IPData = { city: string; region: string; country: string; latitude: number; longitude: number };

package/src/helpers/index.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+export * from './browser-observability';
+export * from './common';
+export * from './node-observability';
+export * from './map-spaces';
+export * from './setup-telemetry-listeners';

package/src/{util.ts → helpers/map-spaces.ts}

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Space } from '@dxos/client-protocol';
+import type { Space } from '@dxos/client-protocol';
 
 export type MapSpacesOptions = {
   verbose?: boolean;
@@ -29,7 +29,6 @@ export const mapSpaces = (spaces: Space[], options: MapSpacesOptions = { verbose
       // TODO(nf): truncate keys for DD?
       key: space.key.truncate(),
       open: space.isOpen,
-      name: space.properties.name,
       members: space.members.get().length,
       objects: space.db.query().objects.length,
       startup,

package/src/helpers/node-observability.ts

@@ -0,0 +1,151 @@
+//
+// Copyright 2022 DXOS.org
+//
+import yaml from 'js-yaml';
+import { existsSync, statSync } from 'node:fs';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { v4 as uuid, validate as validateUuid } from 'uuid';
+
+import type { Config } from '@dxos/client';
+import { log } from '@dxos/log';
+
+import { Observability, type Mode } from '../observability';
+
+/**
+ * Print observability banner once per installation.
+ */
+export const showObservabilityBanner = async (configDir: string, bannercb: (input: string) => void) => {
+  const path = join(configDir, '.observability-banner-printed');
+  if (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 writeFile(path, '', 'utf-8');
+};
+
+export const getObservabilityState = async (configDir: string): Promise<PersistentObservabilityState> => {
+  // check whether configDir exists and if it's a directory
+
+  if (existsSync(configDir)) {
+    if (!statSync(configDir).isDirectory()) {
+      throw new Error(`Config directory ${configDir} exists but is not a directory`);
+    }
+  } else {
+    await mkdir(configDir, { recursive: true });
+  }
+
+  const idPath = join(configDir, 'observability.yml');
+  if (existsSync(idPath)) {
+    const context = await readFile(idPath, 'utf-8');
+    return validate(context) ?? initializeState(idPath);
+  }
+
+  return initializeState(idPath);
+};
+
+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;
+};
+
+// create initial state and write to file, using environment variables to override defaults.
+const initializeState = async (idPath: string): Promise<PersistentObservabilityState> => {
+  // TODO(nf): read initial values from config or seed file
+  const observabilityState = {
+    installationId: uuid(),
+    group: process.env.DX_TELEMETRY_GROUP ?? undefined,
+    mode: (process.env.DX_DISABLE_TELEMETRY ? 'disabled' : process.env.DX_TELEMETRY_MODE ?? 'basic') as Mode,
+  };
+
+  await writeFile(
+    idPath,
+    '# This file is automatically generated by the @dxos/cli.\n' + yaml.dump(observabilityState),
+    'utf-8',
+  );
+
+  return observabilityState;
+};
+
+const validate = (contextString: string) => {
+  const context = yaml.load(contextString) as PersistentObservabilityState;
+  if (Boolean(context.installationId) && validateUuid(context.installationId!)) {
+    return {
+      ...context,
+      mode: process.env.DX_DISABLE_TELEMETRY ? 'disabled' : context.mode ?? 'basic',
+    };
+  }
+};
+
+export type NodeObservabilityOptions = {
+  installationId: string;
+  group?: string;
+  namespace: string;
+  config: Config;
+  mode?: Mode;
+  tracingEnable?: boolean;
+  replayEnable?: boolean;
+  // TODO(nf): options for providers?
+};
+
+export const initializeNodeObservability = async ({
+  namespace,
+  config,
+  installationId,
+  group,
+  mode = 'basic',
+  tracingEnable = true,
+  replayEnable = true,
+}: NodeObservabilityOptions): Promise<Observability> => {
+  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({
+    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?.captureException(err);
+  }
+  return observability;
+};

package/src/helpers/setup-telemetry-listeners.ts

@@ -0,0 +1,110 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import type { Client } from '@dxos/client';
+
+import { getTelemetryIdentifier } from './common';
+import type { Observability } from '../observability';
+
+let lastFocusEvent = new Date();
+let totalTime = 0;
+
+export const setupTelemetryListeners = (namespace: string, client: Client, observability: Observability) => {
+  const clickCallback = (event: any) => {
+    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(() =>
+      observability.event({
+        identityId: getTelemetryIdentifier(client),
+        name: `${namespace}.window.click`,
+        properties: {
+          href: window.location.href,
+          id: (event.target as HTMLElement)?.id,
+          path: (event.path as HTMLElement[])
+            ?.filter((el) => Boolean(el.tagName))
+            .map((el) => `${el.tagName.toLowerCase()}${el.id ? `#${el.id}` : ''}`)
+            .reverse()
+            .join('>'),
+        },
+      }),
+    );
+  };
+
+  const focusCallback = () => {
+    const now = new Date();
+    setTimeout(() =>
+      observability.event({
+        identityId: getTelemetryIdentifier(client),
+        name: `${namespace}.window.focus`,
+        properties: {
+          href: window.location.href,
+          timeAway: now.getTime() - lastFocusEvent.getTime(),
+        },
+      }),
+    );
+    lastFocusEvent = now;
+  };
+
+  const blurCallback = () => {
+    const now = new Date();
+    const timeSpent = now.getTime() - lastFocusEvent.getTime();
+    setTimeout(() =>
+      observability.event({
+        identityId: getTelemetryIdentifier(client),
+        name: `${namespace}.window.blur`,
+        properties: {
+          href: window.location.href,
+          timeSpent,
+        },
+      }),
+    );
+    lastFocusEvent = now;
+    totalTime = totalTime + timeSpent;
+  };
+
+  const unloadCallback = () => {
+    setTimeout(() =>
+      observability.event({
+        identityId: getTelemetryIdentifier(client),
+        name: `${namespace}.page.unload`,
+        properties: {
+          href: window.location.href,
+          timeSpent: totalTime,
+        },
+      }),
+    );
+  };
+
+  const errorCallback = (event: ErrorEvent) => {
+    setTimeout(() =>
+      observability.event({
+        identityId: getTelemetryIdentifier(client),
+        name: `${namespace}.window.error`,
+        properties: {
+          href: window.location.href,
+          message: event.message,
+          filename: event.filename,
+          stack: (event.error as Error).stack,
+        },
+      }),
+    );
+  };
+
+  window.addEventListener('click', clickCallback, true);
+  window.addEventListener('focus', focusCallback);
+  window.addEventListener('blur', blurCallback);
+  window.addEventListener('beforeunload', unloadCallback);
+  window.addEventListener('error', errorCallback);
+
+  return () => {
+    window.removeEventListener('click', clickCallback, true);
+    window.removeEventListener('focus', focusCallback);
+    window.removeEventListener('blur', blurCallback);
+    window.removeEventListener('beforeunload', unloadCallback);
+    window.removeEventListener('error', errorCallback);
+  };
+};

package/src/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './helpers';
 export * from './observability';