@dxos/observability 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (129) hide show
  1. package/dist/lib/browser/chunk-5ICT2XF2.mjs +1 -0
  2. package/dist/lib/browser/{chunk-33TCMAUB.mjs → chunk-VIGEEYDR.mjs} +53 -30
  3. package/dist/lib/browser/chunk-VIGEEYDR.mjs.map +7 -0
  4. package/dist/lib/browser/{chunk-MWTIKIBZ.mjs → chunk-XNAF22QM.mjs} +10 -9
  5. package/dist/lib/browser/chunk-XNAF22QM.mjs.map +7 -0
  6. package/dist/lib/browser/{chunk-YEPQFAES.mjs → chunk-ZI3ZS3PA.mjs} +2 -2
  7. package/dist/lib/browser/chunk-ZI3ZS3PA.mjs.map +7 -0
  8. package/dist/lib/browser/index.mjs +4 -4
  9. package/dist/lib/browser/meta.json +1 -1
  10. package/dist/lib/browser/observability-I65SW7NE.mjs +10 -0
  11. package/dist/lib/browser/{otel-IRDZ7PES.mjs → otel-UH7ZRWC2.mjs} +59 -49
  12. package/dist/lib/browser/otel-UH7ZRWC2.mjs.map +7 -0
  13. package/dist/lib/browser/segment/index.mjs +3 -3
  14. package/dist/lib/browser/sentry/index.mjs +2 -2
  15. package/dist/lib/browser/{sentry-log-processor-3F3SBJXM.mjs → sentry-log-processor-5VGDTKZN.mjs} +53 -53
  16. package/dist/lib/browser/sentry-log-processor-5VGDTKZN.mjs.map +7 -0
  17. package/dist/lib/node-esm/{chunk-EYW4X3O6.mjs → chunk-MTKIPRBH.mjs} +53 -30
  18. package/dist/lib/{browser/chunk-33TCMAUB.mjs.map → node-esm/chunk-MTKIPRBH.mjs.map} +3 -3
  19. package/dist/lib/node-esm/{chunk-552KLA6Z.mjs → chunk-OJV247NY.mjs} +16 -14
  20. package/dist/lib/node-esm/chunk-OJV247NY.mjs.map +7 -0
  21. package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs → chunk-QK5IUYVA.mjs} +2 -2
  22. package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs.map → chunk-QK5IUYVA.mjs.map} +3 -3
  23. package/dist/lib/node-esm/{chunk-MRAK2H7O.mjs → chunk-QUZL7LKE.mjs} +1 -1
  24. package/dist/lib/node-esm/index.mjs +4 -4
  25. package/dist/lib/node-esm/meta.json +1 -1
  26. package/dist/lib/node-esm/observability-5KKD7B6J.mjs +11 -0
  27. package/dist/lib/node-esm/{otel-62HYJETM.mjs → otel-7PUCFSTY.mjs} +56 -46
  28. package/dist/lib/node-esm/otel-7PUCFSTY.mjs.map +7 -0
  29. package/dist/lib/node-esm/segment/index.mjs +3 -3
  30. package/dist/lib/node-esm/sentry/index.mjs +2 -2
  31. package/dist/lib/node-esm/{sentry-log-processor-JAYRA23C.mjs → sentry-log-processor-A2EV7P3Y.mjs} +53 -53
  32. package/dist/lib/node-esm/sentry-log-processor-A2EV7P3Y.mjs.map +7 -0
  33. package/dist/types/src/helpers/browser-observability.d.ts.map +1 -1
  34. package/dist/types/src/helpers/browser-observability.js +4 -6
  35. package/dist/types/src/helpers/browser-observability.js.map +1 -1
  36. package/dist/types/src/helpers/common.js +1 -1
  37. package/dist/types/src/helpers/common.js.map +1 -1
  38. package/dist/types/src/helpers/map-spaces.js +5 -6
  39. package/dist/types/src/helpers/map-spaces.js.map +1 -1
  40. package/dist/types/src/helpers/node-observability.d.ts +1 -1
  41. package/dist/types/src/helpers/node-observability.d.ts.map +1 -1
  42. package/dist/types/src/helpers/node-observability.js +7 -11
  43. package/dist/types/src/helpers/node-observability.js.map +1 -1
  44. package/dist/types/src/helpers/setup-telemetry-listeners.d.ts.map +1 -1
  45. package/dist/types/src/helpers/setup-telemetry-listeners.js +4 -7
  46. package/dist/types/src/helpers/setup-telemetry-listeners.js.map +1 -1
  47. package/dist/types/src/observability.d.ts +1 -1
  48. package/dist/types/src/observability.d.ts.map +1 -1
  49. package/dist/types/src/observability.js +68 -59
  50. package/dist/types/src/observability.js.map +1 -1
  51. package/dist/types/src/otel/logs.d.ts.map +1 -1
  52. package/dist/types/src/otel/logs.js +26 -23
  53. package/dist/types/src/otel/logs.js.map +1 -1
  54. package/dist/types/src/otel/metrics.d.ts +0 -1
  55. package/dist/types/src/otel/metrics.d.ts.map +1 -1
  56. package/dist/types/src/otel/metrics.js +6 -4
  57. package/dist/types/src/otel/metrics.js.map +1 -1
  58. package/dist/types/src/otel/otel.js +1 -1
  59. package/dist/types/src/otel/otel.js.map +1 -1
  60. package/dist/types/src/otel/traces-browser.d.ts.map +1 -1
  61. package/dist/types/src/otel/traces-browser.js +19 -13
  62. package/dist/types/src/otel/traces-browser.js.map +1 -1
  63. package/dist/types/src/otel/traces.d.ts.map +1 -1
  64. package/dist/types/src/otel/traces.js +18 -12
  65. package/dist/types/src/otel/traces.js.map +1 -1
  66. package/dist/types/src/segment/base.d.ts +1 -1
  67. package/dist/types/src/segment/base.d.ts.map +1 -1
  68. package/dist/types/src/segment/base.js +2 -1
  69. package/dist/types/src/segment/base.js.map +1 -1
  70. package/dist/types/src/segment/browser.d.ts +1 -1
  71. package/dist/types/src/segment/browser.d.ts.map +1 -1
  72. package/dist/types/src/segment/browser.js +6 -10
  73. package/dist/types/src/segment/browser.js.map +1 -1
  74. package/dist/types/src/segment/node.d.ts +1 -1
  75. package/dist/types/src/segment/node.d.ts.map +1 -1
  76. package/dist/types/src/segment/node.js +2 -1
  77. package/dist/types/src/segment/node.js.map +1 -1
  78. package/dist/types/src/sentry/browser.d.ts.map +1 -1
  79. package/dist/types/src/sentry/browser.js +5 -7
  80. package/dist/types/src/sentry/browser.js.map +1 -1
  81. package/dist/types/src/sentry/index.d.ts +1 -1
  82. package/dist/types/src/sentry/index.d.ts.map +1 -1
  83. package/dist/types/src/sentry/index.js +0 -1
  84. package/dist/types/src/sentry/index.js.map +1 -1
  85. package/dist/types/src/sentry/node.d.ts.map +1 -1
  86. package/dist/types/src/sentry/node.js +8 -13
  87. package/dist/types/src/sentry/node.js.map +1 -1
  88. package/dist/types/src/sentry/node.node.test.js +3 -5
  89. package/dist/types/src/sentry/node.node.test.js.map +1 -1
  90. package/dist/types/src/sentry/sentry-log-processor.d.ts.map +1 -1
  91. package/dist/types/src/sentry/sentry-log-processor.js +58 -63
  92. package/dist/types/src/sentry/sentry-log-processor.js.map +1 -1
  93. package/dist/types/src/sentry/sentry.node.test.js +1 -1
  94. package/dist/types/src/sentry/sentry.node.test.js.map +1 -1
  95. package/dist/types/tsconfig.tsbuildinfo +1 -1
  96. package/package.json +30 -30
  97. package/src/helpers/browser-observability.ts +2 -1
  98. package/src/helpers/node-observability.ts +5 -4
  99. package/src/helpers/setup-telemetry-listeners.ts +2 -1
  100. package/src/observability.ts +4 -4
  101. package/src/otel/logs.ts +9 -7
  102. package/src/otel/metrics.ts +5 -12
  103. package/src/otel/otel.ts +1 -1
  104. package/src/otel/traces-browser.ts +23 -20
  105. package/src/otel/traces.ts +22 -19
  106. package/src/segment/base.ts +1 -1
  107. package/src/segment/browser.ts +3 -2
  108. package/src/segment/node.ts +3 -2
  109. package/src/sentry/browser.ts +8 -8
  110. package/src/sentry/index.ts +1 -1
  111. package/src/sentry/node.node.test.ts +2 -1
  112. package/src/sentry/node.ts +3 -3
  113. package/src/sentry/sentry-log-processor.ts +17 -7
  114. package/src/sentry/sentry.node.test.ts +2 -1
  115. package/dist/lib/browser/chunk-5OQYI27L.mjs +0 -1
  116. package/dist/lib/browser/chunk-MWTIKIBZ.mjs.map +0 -7
  117. package/dist/lib/browser/chunk-YEPQFAES.mjs.map +0 -7
  118. package/dist/lib/browser/observability-EEM6BEY6.mjs +0 -10
  119. package/dist/lib/browser/otel-IRDZ7PES.mjs.map +0 -7
  120. package/dist/lib/browser/sentry-log-processor-3F3SBJXM.mjs.map +0 -7
  121. package/dist/lib/node-esm/chunk-552KLA6Z.mjs.map +0 -7
  122. package/dist/lib/node-esm/chunk-EYW4X3O6.mjs.map +0 -7
  123. package/dist/lib/node-esm/observability-DAXZGOBS.mjs +0 -11
  124. package/dist/lib/node-esm/otel-62HYJETM.mjs.map +0 -7
  125. package/dist/lib/node-esm/sentry-log-processor-JAYRA23C.mjs.map +0 -7
  126. /package/dist/lib/browser/{chunk-5OQYI27L.mjs.map → chunk-5ICT2XF2.mjs.map} +0 -0
  127. /package/dist/lib/browser/{observability-EEM6BEY6.mjs.map → observability-I65SW7NE.mjs.map} +0 -0
  128. /package/dist/lib/node-esm/{chunk-MRAK2H7O.mjs.map → chunk-QUZL7LKE.mjs.map} +0 -0
  129. /package/dist/lib/node-esm/{observability-DAXZGOBS.mjs.map → observability-5KKD7B6J.mjs.map} +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/observability",
3
- "version": "0.8.4-main.f9ba587",
3
+ "version": "0.8.4-main.fffef41",
4
4
  "description": "Provides a common interface for app and platform observability",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,19 @@
10
10
  "type": "module",
11
11
  "exports": {
12
12
  ".": {
13
+ "source": "./src/index.ts",
13
14
  "types": "./dist/types/src/index.d.ts",
14
15
  "browser": "./dist/lib/browser/index.mjs",
15
16
  "node": "./dist/lib/node-esm/index.mjs"
16
17
  },
17
18
  "./segment": {
19
+ "source": "./src/segment/index.ts",
18
20
  "types": "./dist/types/src/segment/index.d.ts",
19
21
  "browser": "./dist/lib/browser/segment/index.mjs",
20
22
  "node": "./dist/lib/node-esm/segment/index.mjs"
21
23
  },
22
24
  "./sentry": {
25
+ "source": "./src/sentry/index.ts",
23
26
  "types": "./dist/types/src/sentry/index.d.ts",
24
27
  "browser": "./dist/lib/browser/sentry/index.mjs",
25
28
  "node": "./dist/lib/node-esm/sentry/index.mjs"
@@ -48,18 +51,18 @@
48
51
  ],
49
52
  "dependencies": {
50
53
  "@opentelemetry/api": "^1.9.0",
51
- "@opentelemetry/api-logs": "^0.52.1",
52
- "@opentelemetry/auto-instrumentations-web": "^0.40.0",
53
- "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
54
- "@opentelemetry/exporter-metrics-otlp-http": "^0.52.0",
55
- "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
56
- "@opentelemetry/instrumentation": "^0.52.1",
57
- "@opentelemetry/resources": "^1.25.1",
58
- "@opentelemetry/sdk-logs": "^0.52.1",
59
- "@opentelemetry/sdk-metrics": "^1.25.1",
60
- "@opentelemetry/sdk-trace-base": "^1.25.1",
61
- "@opentelemetry/sdk-trace-web": "^1.25.1",
62
- "@opentelemetry/semantic-conventions": "^1.25.0",
54
+ "@opentelemetry/api-logs": "^0.203.0",
55
+ "@opentelemetry/auto-instrumentations-web": "^0.51.0",
56
+ "@opentelemetry/exporter-logs-otlp-http": "^0.203.0",
57
+ "@opentelemetry/exporter-metrics-otlp-http": "^0.203.0",
58
+ "@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
59
+ "@opentelemetry/instrumentation": "^0.203.0",
60
+ "@opentelemetry/resources": "^2.1.0",
61
+ "@opentelemetry/sdk-logs": "^0.203.0",
62
+ "@opentelemetry/sdk-metrics": "^2.1.0",
63
+ "@opentelemetry/sdk-trace-base": "^2.1.0",
64
+ "@opentelemetry/sdk-trace-web": "^2.1.0",
65
+ "@opentelemetry/semantic-conventions": "^1.37.0",
63
66
  "@segment/analytics-node": "^2.1.0",
64
67
  "@segment/snippet": "^4.15.3",
65
68
  "@sentry/browser": "^8.8.0",
@@ -68,20 +71,20 @@
68
71
  "js-yaml": "^4.1.0",
69
72
  "localforage": "^1.10.0",
70
73
  "uuid": "^9.0.0",
71
- "@dxos/async": "0.8.4-main.f9ba587",
72
- "@dxos/client-protocol": "0.8.4-main.f9ba587",
73
- "@dxos/client": "0.8.4-main.f9ba587",
74
- "@dxos/client-services": "0.8.4-main.f9ba587",
75
- "@dxos/config": "0.8.4-main.f9ba587",
76
- "@dxos/context": "0.8.4-main.f9ba587",
77
- "@dxos/debug": "0.8.4-main.f9ba587",
78
- "@dxos/invariant": "0.8.4-main.f9ba587",
79
- "@dxos/log": "0.8.4-main.f9ba587",
80
- "@dxos/network-manager": "0.8.4-main.f9ba587",
81
- "@dxos/protocols": "0.8.4-main.f9ba587",
82
- "@dxos/node-std": "0.8.4-main.f9ba587",
83
- "@dxos/tracing": "0.8.4-main.f9ba587",
84
- "@dxos/util": "0.8.4-main.f9ba587"
74
+ "@dxos/async": "0.8.4-main.fffef41",
75
+ "@dxos/client": "0.8.4-main.fffef41",
76
+ "@dxos/client-protocol": "0.8.4-main.fffef41",
77
+ "@dxos/config": "0.8.4-main.fffef41",
78
+ "@dxos/context": "0.8.4-main.fffef41",
79
+ "@dxos/client-services": "0.8.4-main.fffef41",
80
+ "@dxos/debug": "0.8.4-main.fffef41",
81
+ "@dxos/log": "0.8.4-main.fffef41",
82
+ "@dxos/network-manager": "0.8.4-main.fffef41",
83
+ "@dxos/protocols": "0.8.4-main.fffef41",
84
+ "@dxos/node-std": "0.8.4-main.fffef41",
85
+ "@dxos/tracing": "0.8.4-main.fffef41",
86
+ "@dxos/invariant": "0.8.4-main.fffef41",
87
+ "@dxos/util": "0.8.4-main.fffef41"
85
88
  },
86
89
  "devDependencies": {
87
90
  "@sentry/types": "^8.8.0",
@@ -92,8 +95,5 @@
92
95
  },
93
96
  "publishConfig": {
94
97
  "access": "public"
95
- },
96
- "scripts": {
97
- "api-keys": "./scripts/inject_api_keys.mjs"
98
98
  }
99
99
  }
@@ -11,9 +11,10 @@ import * as localForage from 'localforage';
11
11
  import type { Config } from '@dxos/client';
12
12
  import { log } from '@dxos/log';
13
13
 
14
- import type { IPData } from './common';
15
14
  import type { Mode, Observability } from '../observability';
16
15
 
16
+ import type { IPData } from './common';
17
+
17
18
  export const OBSERVABILITY_DISABLED_KEY = 'observability-disabled';
18
19
  export const OBSERVABILITY_GROUP_KEY = 'observability-group';
19
20
 
@@ -1,16 +1,17 @@
1
1
  //
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
- import yaml from 'js-yaml';
5
4
  import { existsSync, statSync } from 'node:fs';
6
5
  import { mkdir, readFile, writeFile } from 'node:fs/promises';
7
6
  import { join } from 'node:path';
7
+
8
+ import yaml from 'js-yaml';
8
9
  import { v4 as uuid, validate as validateUuid } from 'uuid';
9
10
 
10
11
  import type { Config } from '@dxos/client';
11
12
  import { log } from '@dxos/log';
12
13
 
13
- import { Observability, type Mode } from '../observability';
14
+ import { type Mode, Observability } from '../observability';
14
15
 
15
16
  /**
16
17
  * Print observability banner once per installation.
@@ -63,7 +64,7 @@ const initializeState = async (idPath: string): Promise<PersistentObservabilityS
63
64
  const observabilityState = {
64
65
  installationId: uuid(),
65
66
  group: process.env.DX_OBSERVABILITY_GROUP ?? undefined,
66
- mode: (process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : process.env.DX_OBSERVABILITY_MODE ?? 'basic') as Mode,
67
+ mode: (process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : (process.env.DX_OBSERVABILITY_MODE ?? 'basic')) as Mode,
67
68
  };
68
69
 
69
70
  await writeFile(
@@ -80,7 +81,7 @@ const validate = (contextString: string) => {
80
81
  if (Boolean(context.installationId) && validateUuid(context.installationId!)) {
81
82
  return {
82
83
  ...context,
83
- mode: process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : context.mode ?? 'basic',
84
+ mode: process.env.DX_DISABLE_OBSERVABILITY ? 'disabled' : (context.mode ?? 'basic'),
84
85
  };
85
86
  }
86
87
  };
@@ -4,9 +4,10 @@
4
4
 
5
5
  import type { Client } from '@dxos/client';
6
6
 
7
- import { getTelemetryIdentity } from './common';
8
7
  import { type Observability } from '../observability';
9
8
 
9
+ import { getTelemetryIdentity } from './common';
10
+
10
11
  let lastFocusEvent = new Date();
11
12
  let totalTime = 0;
12
13
 
@@ -3,19 +3,19 @@
3
3
  //
4
4
 
5
5
  import { Event, scheduleTaskInterval } from '@dxos/async';
6
- import { PublicKey, type Client, type Config } from '@dxos/client';
6
+ import { type Client, type Config, PublicKey } from '@dxos/client';
7
7
  import { type ClientServices, type Space } from '@dxos/client-protocol';
8
8
  import { Context } from '@dxos/context';
9
9
  import { invariant } from '@dxos/invariant';
10
- import { log, LogLevel } from '@dxos/log';
10
+ import { LogLevel, log } from '@dxos/log';
11
11
  import { ConnectionState } from '@dxos/network-manager';
12
12
  import { DeviceKind, type NetworkStatus, Platform } from '@dxos/protocols/proto/dxos/client/services';
13
13
  import { isNode } from '@dxos/util';
14
14
 
15
15
  import buildSecrets from './cli-observability-secrets.json';
16
- import { getTelemetryIdentity, type IPData, mapSpaces } from './helpers';
16
+ import { type IPData, getTelemetryIdentity, mapSpaces } from './helpers';
17
17
  import { type OtelLogs, type OtelMetrics, type OtelTraces } from './otel';
18
- import { type SegmentTelemetry, type TrackOptions, type PageOptions, TelemetryEvent } from './segment';
18
+ import { type PageOptions, type SegmentTelemetry, TelemetryEvent, type TrackOptions } from './segment';
19
19
  import { type InitOptions, type captureException as SentryCaptureException } from './sentry';
20
20
  import { type SentryLogProcessor } from './sentry/sentry-log-processor';
21
21
 
package/src/otel/logs.ts CHANGED
@@ -4,17 +4,17 @@
4
4
 
5
5
  import { SeverityNumber } from '@opentelemetry/api-logs';
6
6
  import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
7
- import { Resource } from '@opentelemetry/resources';
7
+ import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
8
8
  import { BatchLogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs';
9
9
  import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
10
10
 
11
11
  import {
12
- getContextFromEntry,
13
- getRelativeFilename,
14
12
  type LogConfig,
15
13
  type LogEntry,
16
14
  LogLevel,
17
15
  type LogProcessor,
16
+ getContextFromEntry,
17
+ getRelativeFilename,
18
18
  } from '@dxos/log';
19
19
  import { jsonlogify } from '@dxos/util';
20
20
 
@@ -33,8 +33,8 @@ export class OtelLogs {
33
33
  private _loggerProvider: LoggerProvider;
34
34
  constructor(private readonly options: OtelLogOptions) {
35
35
  setDiagLogger(options.consoleDiagLogLevel);
36
- const resource = Resource.default().merge(
37
- new Resource({
36
+ const resource = defaultResource().merge(
37
+ resourceFromAttributes({
38
38
  [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
39
39
  [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
40
40
  }),
@@ -46,8 +46,10 @@ export class OtelLogs {
46
46
  },
47
47
  concurrencyLimit: 10, // an optional limit on pending requests
48
48
  });
49
- this._loggerProvider = new LoggerProvider({ resource });
50
- this._loggerProvider.addLogRecordProcessor(new BatchLogRecordProcessor(logExporter));
49
+ this._loggerProvider = new LoggerProvider({
50
+ resource,
51
+ processors: [new BatchLogRecordProcessor(logExporter)],
52
+ });
51
53
  }
52
54
 
53
55
  public readonly logProcessor: LogProcessor = (config: LogConfig, entry: LogEntry) => {
@@ -2,36 +2,29 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { type Attributes, type Meter, type ObservableGauge } from '@opentelemetry/api';
5
+ import { type Meter } from '@opentelemetry/api';
6
6
  import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
7
- import { Resource } from '@opentelemetry/resources';
7
+ import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
8
8
  import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
9
9
  import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
10
10
 
11
11
  import { log } from '@dxos/log';
12
- import { TRACE_PROCESSOR, type MetricData } from '@dxos/tracing';
12
+ import { type MetricData, TRACE_PROCESSOR } from '@dxos/tracing';
13
13
 
14
14
  import { type OtelOptions, setDiagLogger } from './otel';
15
15
 
16
16
  const EXPORT_INTERVAL = 60 * 1000;
17
17
 
18
- type SynchronousGauge = {
19
- gauge: ObservableGauge<Attributes>;
20
- nextValue: number;
21
- nextTags?: any;
22
- };
23
-
24
18
  export class OtelMetrics {
25
19
  private _meterProvider: MeterProvider;
26
20
  private _meter: Meter;
27
- private _gauges = new Map<string, SynchronousGauge>();
28
21
 
29
22
  constructor(private readonly options: OtelOptions) {
30
23
  // TODO: improve error handling/logging
31
24
  // https://github.com/open-telemetry/opentelemetry-js/issues/4823
32
25
  setDiagLogger(options.consoleDiagLogLevel);
33
- const resource = Resource.default().merge(
34
- new Resource({
26
+ const resource = defaultResource().merge(
27
+ resourceFromAttributes({
35
28
  [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
36
29
  [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
37
30
  }),
package/src/otel/otel.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
5
+ import { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
6
6
 
7
7
  export type OtelOptions = {
8
8
  endpoint: string;
@@ -2,45 +2,48 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { trace, type Tracer } from '@opentelemetry/api';
5
+ import { type Tracer, trace } from '@opentelemetry/api';
6
6
  import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';
7
7
  import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
8
8
  import { registerInstrumentations } from '@opentelemetry/instrumentation';
9
- import { Resource } from '@opentelemetry/resources';
10
- import { ConsoleSpanExporter, SimpleSpanProcessor, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
9
+ import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
10
+ import { BatchSpanProcessor, ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
11
11
  import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
12
12
  import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
13
13
 
14
14
  import { log } from '@dxos/log';
15
- import { TRACE_PROCESSOR, type StartSpanOptions } from '@dxos/tracing';
15
+ import { type StartSpanOptions, TRACE_PROCESSOR } from '@dxos/tracing';
16
16
 
17
17
  import { type OtelOptions } from './otel';
18
18
 
19
19
  export class OtelTraces {
20
20
  private _tracer: Tracer;
21
21
  constructor(private readonly options: OtelOptions) {
22
- const resource = Resource.default().merge(
23
- new Resource({
22
+ const resource = defaultResource().merge(
23
+ resourceFromAttributes({
24
24
  [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
25
25
  [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
26
26
  }),
27
27
  );
28
28
 
29
- const tracerProvider = new WebTracerProvider({ resource });
30
- tracerProvider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
31
- tracerProvider.addSpanProcessor(
32
- new BatchSpanProcessor(
33
- new OTLPTraceExporter({
34
- url: this.options.endpoint + '/v1/traces',
35
- headers: {
36
- Authorization: this.options.authorizationHeader,
37
- },
38
- concurrencyLimit: 10, // an optional limit on pending requests
39
- }),
40
- ),
41
- );
29
+ const tracerProvider = new WebTracerProvider({
30
+ resource,
31
+ spanProcessors: [
32
+ new SimpleSpanProcessor(new ConsoleSpanExporter()),
33
+ new BatchSpanProcessor(
34
+ new OTLPTraceExporter({
35
+ url: this.options.endpoint + '/v1/traces',
36
+ headers: {
37
+ Authorization: this.options.authorizationHeader,
38
+ },
39
+ concurrencyLimit: 10, // an optional limit on pending requests
40
+ }),
41
+ ),
42
+ ],
43
+ });
44
+
42
45
  // TODO(nf): ContextManager? Propogator?
43
- tracerProvider.register({});
46
+ trace.setGlobalTracerProvider(tracerProvider);
44
47
  this._tracer = trace.getTracer('dxos-observability', this.options.serviceVersion);
45
48
  }
46
49
 
@@ -2,9 +2,9 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { trace, type Tracer } from '@opentelemetry/api';
5
+ import { type Tracer, trace } from '@opentelemetry/api';
6
6
  import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
7
- import { Resource } from '@opentelemetry/resources';
7
+ import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
8
8
  import {
9
9
  BasicTracerProvider,
10
10
  BatchSpanProcessor,
@@ -14,34 +14,37 @@ import {
14
14
  import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
15
15
  import { log } from 'debug';
16
16
 
17
- import { TRACE_PROCESSOR, type StartSpanOptions } from '@dxos/tracing';
17
+ import { type StartSpanOptions, TRACE_PROCESSOR } from '@dxos/tracing';
18
18
 
19
19
  import { type OtelOptions } from './otel';
20
20
 
21
21
  export class OtelTraces {
22
22
  private _tracer: Tracer;
23
23
  constructor(private readonly options: OtelOptions) {
24
- const resource = Resource.default().merge(
25
- new Resource({
24
+ const resource = defaultResource().merge(
25
+ resourceFromAttributes({
26
26
  [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
27
27
  [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
28
28
  }),
29
29
  );
30
30
 
31
- const tracerProvider = new BasicTracerProvider({ resource });
32
- tracerProvider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
33
- tracerProvider.addSpanProcessor(
34
- new BatchSpanProcessor(
35
- new OTLPTraceExporter({
36
- url: this.options.endpoint + '/v1/traces',
37
- headers: {
38
- Authorization: this.options.authorizationHeader,
39
- },
40
- concurrencyLimit: 10, // an optional limit on pending requests
41
- }),
42
- ),
43
- );
44
- tracerProvider.register();
31
+ const tracerProvider = new BasicTracerProvider({
32
+ resource,
33
+ spanProcessors: [
34
+ new SimpleSpanProcessor(new ConsoleSpanExporter()),
35
+ new BatchSpanProcessor(
36
+ new OTLPTraceExporter({
37
+ url: this.options.endpoint + '/v1/traces',
38
+ headers: {
39
+ Authorization: this.options.authorizationHeader,
40
+ },
41
+ concurrencyLimit: 10, // an optional limit on pending requests
42
+ }),
43
+ ),
44
+ ],
45
+ });
46
+
47
+ trace.setGlobalTracerProvider(tracerProvider);
45
48
  this._tracer = trace.getTracer('dxos-observability', this.options.serviceVersion);
46
49
  }
47
50
 
@@ -2,7 +2,7 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { type TrackParams, type PageParams, type IdentifyParams } from '@segment/analytics-node';
5
+ import { type IdentifyParams, type PageParams, type TrackParams } from '@segment/analytics-node';
6
6
 
7
7
  import { log } from '@dxos/log';
8
8
 
@@ -7,10 +7,11 @@ import snippet from '@segment/snippet';
7
7
 
8
8
  import { log } from '@dxos/log';
9
9
 
10
- import { AbstractSegmentTelemetry } from './base';
11
- import type { TrackOptions, SegmentTelemetryOptions, PageOptions } from './types';
12
10
  import { captureException } from '../sentry';
13
11
 
12
+ import { AbstractSegmentTelemetry } from './base';
13
+ import type { PageOptions, SegmentTelemetryOptions, TrackOptions } from './types';
14
+
14
15
  /**
15
16
  * Browser telemetry.
16
17
  */
@@ -7,10 +7,11 @@ import { Analytics, type IdentifyParams } from '@segment/analytics-node';
7
7
  import { invariant } from '@dxos/invariant';
8
8
  import { log } from '@dxos/log';
9
9
 
10
- import { AbstractSegmentTelemetry } from './base';
11
- import type { SegmentTelemetryOptions, PageOptions, TrackOptions } from './types';
12
10
  import { captureException } from '../sentry';
13
11
 
12
+ import { AbstractSegmentTelemetry } from './base';
13
+ import type { PageOptions, SegmentTelemetryOptions, TrackOptions } from './types';
14
+
14
15
  /**
15
16
  * Node telemetry.
16
17
  */
@@ -3,19 +3,19 @@
3
3
  //
4
4
 
5
5
  import {
6
- init as naturalInit,
7
- setTag,
6
+ breadcrumbsIntegration,
7
+ browserTracingIntegration,
8
+ feedbackIntegration,
9
+ httpClientIntegration,
10
+ metrics,
8
11
  addBreadcrumb as naturalAddBreadcrumb,
9
12
  captureException as naturalCaptureException,
10
13
  captureMessage as naturalCaptureMessage,
14
+ init as naturalInit,
11
15
  sendFeedback as naturalSendFeedback,
12
16
  withScope as naturalWithScope,
13
- breadcrumbsIntegration,
14
- browserTracingIntegration,
15
- feedbackIntegration,
16
- httpClientIntegration,
17
17
  replayIntegration,
18
- metrics,
18
+ setTag,
19
19
  startInactiveSpan,
20
20
  } from '@sentry/browser';
21
21
 
@@ -57,7 +57,7 @@ export const init = (options: InitOptions) => {
57
57
  replaysSessionSampleRate: options.replaySampleRate,
58
58
  replaysOnErrorSampleRate: options.replaySampleRateOnError,
59
59
  tracesSampleRate: options.sampleRate,
60
- transport: options.transport,
60
+ transport: options.transport as any, // TODO(dmaretskyi): Fix
61
61
  beforeSend: (event) => {
62
62
  options.onError?.(event);
63
63
  return event;
@@ -3,4 +3,4 @@
3
3
  //
4
4
 
5
5
  export * from './node';
6
- export * from './types';
6
+ export type * from './types';
@@ -5,9 +5,10 @@
5
5
  import type { Stacktrace } from '@sentry/types';
6
6
  import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
7
7
 
8
- import * as Sentry from './node';
9
8
  import { sentryTestkit } from '../testing';
10
9
 
10
+ import * as Sentry from './node';
11
+
11
12
  const { testkit, sentryTransport } = sentryTestkit();
12
13
 
13
14
  // TODO(burdon): https://example.com?
@@ -4,13 +4,13 @@
4
4
 
5
5
  import {
6
6
  type Event,
7
- init as naturalInit,
8
- setTag,
7
+ metrics,
9
8
  addBreadcrumb as naturalAddBreadcrumb,
10
9
  captureException as naturalCaptureException,
11
10
  captureMessage as naturalCaptureMessage,
11
+ init as naturalInit,
12
12
  withScope as naturalWithScope,
13
- metrics,
13
+ setTag,
14
14
  startInactiveSpan,
15
15
  } from '@sentry/node';
16
16
 
@@ -2,13 +2,13 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import type { Breadcrumb, SeverityLevel, Event } from '@sentry/types';
5
+ import type { Breadcrumb, Event, SeverityLevel } from '@sentry/types';
6
6
 
7
7
  import { InvariantViolation } from '@dxos/invariant';
8
8
  import { type LogConfig, type LogEntry, LogLevel, type LogProcessor, shouldLog } from '@dxos/log';
9
9
  import { CircularBuffer, getDebugName } from '@dxos/util';
10
10
 
11
- import { withScope, captureException, captureMessage } from './node';
11
+ import { captureException, captureMessage, withScope } from './node';
12
12
 
13
13
  const MAX_LOG_BREADCRUMBS = 150;
14
14
 
@@ -17,13 +17,20 @@ export class SentryLogProcessor {
17
17
 
18
18
  public readonly logProcessor: LogProcessor = (config: LogConfig, entry: LogEntry) => {
19
19
  const { level, meta, error } = entry;
20
+
20
21
  // Don't forward logs from remote sessions.
21
22
  if (!shouldLog(entry, config.captureFilters) || meta?.S?.remoteSessionId) {
22
23
  if (entry.level > LogLevel.DEBUG) {
23
- this._addBreadcrumb(undefined, entry.message, convertLevel(entry.level), undefined);
24
+ this._addBreadcrumb(
25
+ undefined,
26
+ entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : ''),
27
+ convertLevel(entry.level),
28
+ undefined,
29
+ );
24
30
  }
25
31
  return;
26
32
  }
33
+
27
34
  if (entry.level !== LogLevel.WARN && entry.level !== LogLevel.ERROR) {
28
35
  return;
29
36
  }
@@ -66,7 +73,8 @@ export class SentryLogProcessor {
66
73
  return;
67
74
  }
68
75
 
69
- scope.setFingerprint([entry.message]);
76
+ const message = entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : '');
77
+ scope.setFingerprint([message]);
70
78
  const eventId = captureMessage(extendedMessage);
71
79
  this._addBreadcrumb(eventId, extendedMessage, severity, entry.context);
72
80
  });
@@ -117,18 +125,20 @@ export class SentryLogProcessor {
117
125
  }
118
126
  }
119
127
 
120
- const formatMessageForSentry = (entry: LogEntry) => {
128
+ const formatMessageForSentry = (entry: LogEntry): string => {
129
+ const message = entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : '');
130
+
121
131
  let scopePrefix: string | undefined;
122
132
  if (entry.meta?.S) {
123
133
  const scope = entry.meta?.S;
124
134
  scopePrefix = scope.name || getDebugName(scope);
125
135
  }
126
136
  if (scopePrefix == null) {
127
- return entry.message;
137
+ return message;
128
138
  }
129
139
 
130
140
  const workerPrefix = entry.meta?.S?.hostSessionId ? '[worker] ' : '';
131
- return `${workerPrefix}${scopePrefix} ${entry.message}`;
141
+ return `${workerPrefix}${scopePrefix} ${message}`;
132
142
  };
133
143
 
134
144
  const convertLevel = (level: LogLevel): SeverityLevel => {
@@ -4,9 +4,10 @@
4
4
 
5
5
  import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
6
6
 
7
- import * as Sentry from './node';
8
7
  import { sentryTestkit } from '../testing';
9
8
 
9
+ import * as Sentry from './node';
10
+
10
11
  const { testkit, sentryTransport } = sentryTestkit();
11
12
 
12
13
  const MOCK_DESTINATION = 'https://acacaeaccacacacabcaacdacdacadaca@sentry.io/000001';
@@ -1 +0,0 @@
1
- //# sourceMappingURL=chunk-5OQYI27L.mjs.map