@dxos/observability 0.8.4-main.67995b8 → 0.8.4-main.a4bbb77

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 (115) hide show
  1. package/dist/lib/browser/{chunk-MWTIKIBZ.mjs → chunk-ICKR6U3G.mjs} +44 -30
  2. package/dist/lib/browser/chunk-ICKR6U3G.mjs.map +7 -0
  3. package/dist/lib/browser/{chunk-YEPQFAES.mjs → chunk-LJO63BXO.mjs} +2 -2
  4. package/dist/lib/browser/{chunk-YEPQFAES.mjs.map → chunk-LJO63BXO.mjs.map} +3 -3
  5. package/dist/lib/browser/{chunk-UG3VTDOH.mjs → chunk-YTRUOREY.mjs} +75 -46
  6. package/dist/lib/browser/chunk-YTRUOREY.mjs.map +7 -0
  7. package/dist/lib/browser/index.mjs +3 -3
  8. package/dist/lib/browser/meta.json +1 -1
  9. package/dist/lib/browser/observability-CQGG3MID.mjs +10 -0
  10. package/dist/lib/browser/{otel-IRDZ7PES.mjs → otel-6FVBNA5F.mjs} +131 -81
  11. package/dist/lib/browser/otel-6FVBNA5F.mjs.map +7 -0
  12. package/dist/lib/browser/segment/index.mjs +2 -2
  13. package/dist/lib/browser/sentry/index.mjs +1 -1
  14. package/dist/lib/browser/{sentry-log-processor-N3QNOQ2O.mjs → sentry-log-processor-RG4CFVGL.mjs} +53 -39
  15. package/dist/lib/browser/{sentry-log-processor-N3QNOQ2O.mjs.map → sentry-log-processor-RG4CFVGL.mjs.map} +3 -3
  16. package/dist/lib/node-esm/{chunk-552KLA6Z.mjs → chunk-24NMRR4E.mjs} +67 -40
  17. package/dist/lib/node-esm/chunk-24NMRR4E.mjs.map +7 -0
  18. package/dist/lib/node-esm/{chunk-WLRNZ2S2.mjs → chunk-4EWQFQ2F.mjs} +75 -46
  19. package/dist/lib/{browser/chunk-UG3VTDOH.mjs.map → node-esm/chunk-4EWQFQ2F.mjs.map} +3 -3
  20. package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs → chunk-QK5IUYVA.mjs} +2 -2
  21. package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs.map → chunk-QK5IUYVA.mjs.map} +3 -3
  22. package/dist/lib/node-esm/index.mjs +3 -3
  23. package/dist/lib/node-esm/meta.json +1 -1
  24. package/dist/lib/node-esm/{observability-F2NNZIF6.mjs → observability-DHNVVRC7.mjs} +4 -4
  25. package/dist/lib/node-esm/{otel-62HYJETM.mjs → otel-KHSGBROB.mjs} +127 -77
  26. package/dist/lib/node-esm/otel-KHSGBROB.mjs.map +7 -0
  27. package/dist/lib/node-esm/segment/index.mjs +2 -2
  28. package/dist/lib/node-esm/sentry/index.mjs +1 -1
  29. package/dist/lib/node-esm/{sentry-log-processor-FN6Y5TNI.mjs → sentry-log-processor-3BDS4BB4.mjs} +53 -39
  30. package/dist/lib/node-esm/{sentry-log-processor-FN6Y5TNI.mjs.map → sentry-log-processor-3BDS4BB4.mjs.map} +3 -3
  31. package/dist/types/src/helpers/browser-observability.d.ts.map +1 -1
  32. package/dist/types/src/helpers/browser-observability.js +4 -6
  33. package/dist/types/src/helpers/browser-observability.js.map +1 -1
  34. package/dist/types/src/helpers/common.js +1 -1
  35. package/dist/types/src/helpers/common.js.map +1 -1
  36. package/dist/types/src/helpers/map-spaces.js +5 -6
  37. package/dist/types/src/helpers/map-spaces.js.map +1 -1
  38. package/dist/types/src/helpers/node-observability.d.ts +1 -1
  39. package/dist/types/src/helpers/node-observability.d.ts.map +1 -1
  40. package/dist/types/src/helpers/node-observability.js +7 -11
  41. package/dist/types/src/helpers/node-observability.js.map +1 -1
  42. package/dist/types/src/helpers/setup-telemetry-listeners.d.ts.map +1 -1
  43. package/dist/types/src/helpers/setup-telemetry-listeners.js +4 -7
  44. package/dist/types/src/helpers/setup-telemetry-listeners.js.map +1 -1
  45. package/dist/types/src/observability.d.ts +1 -1
  46. package/dist/types/src/observability.d.ts.map +1 -1
  47. package/dist/types/src/observability.js +68 -59
  48. package/dist/types/src/observability.js.map +1 -1
  49. package/dist/types/src/otel/logs.d.ts.map +1 -1
  50. package/dist/types/src/otel/logs.js +26 -23
  51. package/dist/types/src/otel/logs.js.map +1 -1
  52. package/dist/types/src/otel/metrics.d.ts +0 -1
  53. package/dist/types/src/otel/metrics.d.ts.map +1 -1
  54. package/dist/types/src/otel/metrics.js +6 -4
  55. package/dist/types/src/otel/metrics.js.map +1 -1
  56. package/dist/types/src/otel/otel.js +1 -1
  57. package/dist/types/src/otel/otel.js.map +1 -1
  58. package/dist/types/src/otel/traces-browser.d.ts.map +1 -1
  59. package/dist/types/src/otel/traces-browser.js +19 -13
  60. package/dist/types/src/otel/traces-browser.js.map +1 -1
  61. package/dist/types/src/otel/traces.d.ts.map +1 -1
  62. package/dist/types/src/otel/traces.js +18 -12
  63. package/dist/types/src/otel/traces.js.map +1 -1
  64. package/dist/types/src/segment/base.d.ts +1 -1
  65. package/dist/types/src/segment/base.d.ts.map +1 -1
  66. package/dist/types/src/segment/base.js +2 -1
  67. package/dist/types/src/segment/base.js.map +1 -1
  68. package/dist/types/src/segment/browser.d.ts +1 -1
  69. package/dist/types/src/segment/browser.d.ts.map +1 -1
  70. package/dist/types/src/segment/browser.js +6 -10
  71. package/dist/types/src/segment/browser.js.map +1 -1
  72. package/dist/types/src/segment/node.d.ts +1 -1
  73. package/dist/types/src/segment/node.d.ts.map +1 -1
  74. package/dist/types/src/segment/node.js +2 -1
  75. package/dist/types/src/segment/node.js.map +1 -1
  76. package/dist/types/src/sentry/browser.d.ts.map +1 -1
  77. package/dist/types/src/sentry/browser.js +4 -6
  78. package/dist/types/src/sentry/browser.js.map +1 -1
  79. package/dist/types/src/sentry/node.d.ts.map +1 -1
  80. package/dist/types/src/sentry/node.js +8 -13
  81. package/dist/types/src/sentry/node.js.map +1 -1
  82. package/dist/types/src/sentry/node.node.test.js +3 -5
  83. package/dist/types/src/sentry/node.node.test.js.map +1 -1
  84. package/dist/types/src/sentry/sentry-log-processor.d.ts.map +1 -1
  85. package/dist/types/src/sentry/sentry-log-processor.js +56 -63
  86. package/dist/types/src/sentry/sentry-log-processor.js.map +1 -1
  87. package/dist/types/src/sentry/sentry.node.test.js +1 -1
  88. package/dist/types/src/sentry/sentry.node.test.js.map +1 -1
  89. package/dist/types/tsconfig.tsbuildinfo +1 -1
  90. package/package.json +33 -33
  91. package/src/helpers/browser-observability.ts +2 -1
  92. package/src/helpers/node-observability.ts +3 -2
  93. package/src/helpers/setup-telemetry-listeners.ts +2 -1
  94. package/src/observability.ts +4 -4
  95. package/src/otel/logs.ts +9 -7
  96. package/src/otel/metrics.ts +5 -12
  97. package/src/otel/otel.ts +1 -1
  98. package/src/otel/traces-browser.ts +23 -20
  99. package/src/otel/traces.ts +22 -19
  100. package/src/segment/base.ts +1 -1
  101. package/src/segment/browser.ts +3 -2
  102. package/src/segment/node.ts +3 -2
  103. package/src/sentry/browser.ts +7 -7
  104. package/src/sentry/node.node.test.ts +2 -1
  105. package/src/sentry/node.ts +3 -3
  106. package/src/sentry/sentry-log-processor.ts +2 -2
  107. package/src/sentry/sentry.node.test.ts +2 -1
  108. package/dist/lib/browser/chunk-MWTIKIBZ.mjs.map +0 -7
  109. package/dist/lib/browser/observability-7LFMAZBF.mjs +0 -10
  110. package/dist/lib/browser/otel-IRDZ7PES.mjs.map +0 -7
  111. package/dist/lib/node-esm/chunk-552KLA6Z.mjs.map +0 -7
  112. package/dist/lib/node-esm/chunk-WLRNZ2S2.mjs.map +0 -7
  113. package/dist/lib/node-esm/otel-62HYJETM.mjs.map +0 -7
  114. /package/dist/lib/browser/{observability-7LFMAZBF.mjs.map → observability-CQGG3MID.mjs.map} +0 -0
  115. /package/dist/lib/node-esm/{observability-F2NNZIF6.mjs.map → observability-DHNVVRC7.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.67995b8",
3
+ "version": "0.8.4-main.a4bbb77",
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,22 +10,22 @@
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
- "node": "./dist/lib/node-esm/index.mjs",
16
- "source": "./src/index.ts"
16
+ "node": "./dist/lib/node-esm/index.mjs"
17
17
  },
18
18
  "./segment": {
19
+ "source": "./src/segment/index.ts",
19
20
  "types": "./dist/types/src/segment/index.d.ts",
20
21
  "browser": "./dist/lib/browser/segment/index.mjs",
21
- "node": "./dist/lib/node-esm/segment/index.mjs",
22
- "source": "./src/segment/index.ts"
22
+ "node": "./dist/lib/node-esm/segment/index.mjs"
23
23
  },
24
24
  "./sentry": {
25
+ "source": "./src/sentry/index.ts",
25
26
  "types": "./dist/types/src/sentry/index.d.ts",
26
27
  "browser": "./dist/lib/browser/sentry/index.mjs",
27
- "node": "./dist/lib/node-esm/sentry/index.mjs",
28
- "source": "./src/sentry/index.ts"
28
+ "node": "./dist/lib/node-esm/sentry/index.mjs"
29
29
  }
30
30
  },
31
31
  "browser": {
@@ -51,18 +51,18 @@
51
51
  ],
52
52
  "dependencies": {
53
53
  "@opentelemetry/api": "^1.9.0",
54
- "@opentelemetry/api-logs": "^0.52.1",
55
- "@opentelemetry/auto-instrumentations-web": "^0.40.0",
56
- "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
57
- "@opentelemetry/exporter-metrics-otlp-http": "^0.52.0",
58
- "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
59
- "@opentelemetry/instrumentation": "^0.52.1",
60
- "@opentelemetry/resources": "^1.25.1",
61
- "@opentelemetry/sdk-logs": "^0.52.1",
62
- "@opentelemetry/sdk-metrics": "^1.25.1",
63
- "@opentelemetry/sdk-trace-base": "^1.25.1",
64
- "@opentelemetry/sdk-trace-web": "^1.25.1",
65
- "@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",
66
66
  "@segment/analytics-node": "^2.1.0",
67
67
  "@segment/snippet": "^4.15.3",
68
68
  "@sentry/browser": "^8.8.0",
@@ -71,20 +71,20 @@
71
71
  "js-yaml": "^4.1.0",
72
72
  "localforage": "^1.10.0",
73
73
  "uuid": "^9.0.0",
74
- "@dxos/client": "0.8.4-main.67995b8",
75
- "@dxos/async": "0.8.4-main.67995b8",
76
- "@dxos/client-protocol": "0.8.4-main.67995b8",
77
- "@dxos/client-services": "0.8.4-main.67995b8",
78
- "@dxos/config": "0.8.4-main.67995b8",
79
- "@dxos/context": "0.8.4-main.67995b8",
80
- "@dxos/debug": "0.8.4-main.67995b8",
81
- "@dxos/invariant": "0.8.4-main.67995b8",
82
- "@dxos/log": "0.8.4-main.67995b8",
83
- "@dxos/network-manager": "0.8.4-main.67995b8",
84
- "@dxos/node-std": "0.8.4-main.67995b8",
85
- "@dxos/protocols": "0.8.4-main.67995b8",
86
- "@dxos/tracing": "0.8.4-main.67995b8",
87
- "@dxos/util": "0.8.4-main.67995b8"
74
+ "@dxos/async": "0.8.4-main.a4bbb77",
75
+ "@dxos/client": "0.8.4-main.a4bbb77",
76
+ "@dxos/client-protocol": "0.8.4-main.a4bbb77",
77
+ "@dxos/client-services": "0.8.4-main.a4bbb77",
78
+ "@dxos/context": "0.8.4-main.a4bbb77",
79
+ "@dxos/config": "0.8.4-main.a4bbb77",
80
+ "@dxos/invariant": "0.8.4-main.a4bbb77",
81
+ "@dxos/debug": "0.8.4-main.a4bbb77",
82
+ "@dxos/log": "0.8.4-main.a4bbb77",
83
+ "@dxos/network-manager": "0.8.4-main.a4bbb77",
84
+ "@dxos/node-std": "0.8.4-main.a4bbb77",
85
+ "@dxos/protocols": "0.8.4-main.a4bbb77",
86
+ "@dxos/tracing": "0.8.4-main.a4bbb77",
87
+ "@dxos/util": "0.8.4-main.a4bbb77"
88
88
  },
89
89
  "devDependencies": {
90
90
  "@sentry/types": "^8.8.0",
@@ -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.
@@ -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
 
@@ -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
 
@@ -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,7 +0,0 @@
1
- {
2
- "version": 3,
3
- "sources": ["../../../src/segment/browser.ts", "../../../src/segment/base.ts", "../../../src/segment/types.ts"],
4
- "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { type IdentifyParams } from '@segment/analytics-node';\nimport snippet from '@segment/snippet';\n\nimport { log } from '@dxos/log';\n\nimport { AbstractSegmentTelemetry } from './base';\nimport type { TrackOptions, SegmentTelemetryOptions, PageOptions } from './types';\nimport { captureException } from '../sentry';\n\n/**\n * Browser telemetry.\n */\n// https://segment.com/docs/connections/sources/catalog/libraries/website/javascript/#basic-tracking-methods\nexport class SegmentTelemetry extends AbstractSegmentTelemetry {\n constructor({ apiKey, batchSize, getTags }: SegmentTelemetryOptions) {\n super(getTags);\n try {\n const contents = snippet.min({ apiKey, page: false });\n const script = document.createElement('script');\n script.innerHTML = contents;\n document.body.append(script);\n } catch (err) {\n log.catch('failed to initialize telemetry', err);\n }\n }\n\n identify(options: IdentifyParams): void {\n try {\n (window as any).analytics?.identify(options.userId, options.traits);\n } catch (err) {\n log.catch('failed to identify', err);\n }\n }\n\n page(options: PageOptions): void {\n try {\n const props = this.createPageProps(options);\n (window as any).analytics?.page(props.category, props.name, props.properties);\n } catch (err) {\n log.catch('failed to track page', err);\n }\n }\n\n track(options: TrackOptions): void {\n try {\n const props = this.createTrackProps(options);\n (window as any).analytics?.track(props.event, props.properties);\n } catch (err) {\n log.catch('failed to track event', err);\n }\n }\n\n async flush(): Promise<void> {\n try {\n await (window as any).analytics?.flush((err: any) => {\n captureException(err);\n });\n } catch (err) {\n log.catch('failed to flush telemetry', err);\n }\n }\n\n async close(): Promise<void> {}\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type TrackParams, type PageParams, type IdentifyParams } from '@segment/analytics-node';\n\nimport { log } from '@dxos/log';\n\nimport {\n type IdentityOptions,\n type PageOptions,\n type SegmentIdentityOptions,\n type Tags,\n TelemetryEvent,\n type TrackOptions,\n} from './types';\n\n/**\n * NOTE: Segment provides a default ID if we don't provide one.\n */\nconst getIdentityOptions = ({ did, installationId }: IdentityOptions): SegmentIdentityOptions => {\n if (!did && !installationId) {\n log.warn('No telemetry identifier provided.');\n }\n\n return {\n userId: did,\n anonymousId: installationId,\n } as SegmentIdentityOptions;\n};\n\n/**\n * Base class for Node and BrowserSegment telemetry.\n */\nexport abstract class AbstractSegmentTelemetry {\n constructor(private readonly _getTags: () => Tags) {}\n\n abstract identify(options: IdentifyParams): void;\n\n abstract page(options: PageOptions): void;\n\n abstract track(options: TrackOptions): void;\n\n protected createPageProps(options: PageOptions): PageParams {\n const { properties, ...rest } = options;\n return {\n ...getIdentityOptions(options),\n ...rest,\n properties: {\n common: this._getTags(),\n custom: properties,\n },\n };\n }\n\n protected createTrackProps(options: TrackOptions): TrackParams {\n const { event, action, properties, ...rest } = options;\n return {\n ...getIdentityOptions(options),\n ...rest,\n event: event ?? TelemetryEvent.ACTION,\n properties: {\n action,\n common: this._getTags(),\n custom: properties,\n },\n };\n }\n}\n", "//\n// Copyright 2022 DXOS.org\n//\n\nexport type Tags = Record<string, string>;\n\nexport type SegmentTelemetryOptions = {\n apiKey?: string;\n batchSize?: number;\n enable?: boolean;\n getTags: () => Tags;\n};\n\n// Copied from @segment/analytics-node.\nexport type SegmentIdentityOptions =\n | { userId: string; anonymousId?: string }\n | { userId?: string; anonymousId: string };\n\n// TODO(burdon): Should require one or the other.\nexport type IdentityOptions = { did?: string; installationId?: string };\n\nexport type CommonOptions = IdentityOptions & {\n timestamp?: Date;\n properties?: Record<string, unknown>;\n};\n\n/**\n * Page views.\n * https://segment.com/docs/connections/sources/catalog/libraries/server/node/#page\n */\nexport type PageOptions = CommonOptions & {\n category?: string;\n name?: string;\n};\n\n/**\n * Track actions.\n * https://segment.com/docs/connections/sources/catalog/libraries/server/node/#track\n */\nexport type TrackOptions = CommonOptions & {\n event?: TelemetryEvent;\n action: string;\n};\n\n/**\n * Each event will be mapped to a different Postgres table via segment.\n */\nexport enum TelemetryEvent {\n /**\n * Use actions.\n */\n ACTION = 'action',\n /**\n * High-volume technical metrics.\n */\n METRICS = 'metrics',\n}\n"],
5
- "mappings": ";;;;;AAKA,OAAOA,aAAa;AAEpB,SAASC,OAAAA,YAAW;;;ACDpB,SAASC,WAAW;;;ACyCb,IAAKC,iBAAAA,yBAAAA,iBAAAA;AAGT,EAAAA,gBAAA,QAAA,IAAA;AAIA,EAAAA,gBAAA,SAAA,IAAA;SAPSA;;;;;AD3BZ,IAAMC,qBAAqB,CAAC,EAAEC,KAAKC,eAAc,MAAmB;AAClE,MAAI,CAACD,OAAO,CAACC,gBAAgB;AAC3BC,QAAIC,KAAK,qCAAA,QAAA;;;;;;EACX;AAEA,SAAO;IACLC,QAAQJ;IACRK,aAAaJ;EACf;AACF;AAKO,IAAeK,2BAAf,MAAeA;EACpB,YAA6BC,UAAsB;SAAtBA,WAAAA;EAAuB;EAQ1CC,gBAAgBC,SAAkC;AAC1D,UAAM,EAAEC,YAAY,GAAGC,KAAAA,IAASF;AAChC,WAAO;MACL,GAAGV,mBAAmBU,OAAAA;MACtB,GAAGE;MACHD,YAAY;QACVE,QAAQ,KAAKL,SAAQ;QACrBM,QAAQH;MACV;IACF;EACF;EAEUI,iBAAiBL,SAAoC;AAC7D,UAAM,EAAEM,OAAOC,QAAQN,YAAY,GAAGC,KAAAA,IAASF;AAC/C,WAAO;MACL,GAAGV,mBAAmBU,OAAAA;MACtB,GAAGE;MACHI,OAAOA,SAASE,eAAeC;MAC/BR,YAAY;QACVM;QACAJ,QAAQ,KAAKL,SAAQ;QACrBM,QAAQH;MACV;IACF;EACF;AACF;;;;ADnDO,IAAMS,mBAAN,cAA+BC,yBAAAA;EACpC,YAAY,EAAEC,QAAQC,WAAWC,QAAO,GAA6B;AACnE,UAAMA,OAAAA;AACN,QAAI;AACF,YAAMC,WAAWC,QAAQC,IAAI;QAAEL;QAAQM,MAAM;MAAM,CAAA;AACnD,YAAMC,SAASC,SAASC,cAAc,QAAA;AACtCF,aAAOG,YAAYP;AACnBK,eAASG,KAAKC,OAAOL,MAAAA;IACvB,SAASM,KAAK;AACZC,MAAAA,KAAIC,MAAM,kCAAkCF,KAAAA;;;;;;IAC9C;EACF;EAEAG,SAASC,SAA+B;AACtC,QAAI;AACDC,aAAeC,WAAWH,SAASC,QAAQG,QAAQH,QAAQI,MAAM;IACpE,SAASR,KAAK;AACZC,MAAAA,KAAIC,MAAM,sBAAsBF,KAAAA;;;;;;IAClC;EACF;EAEAP,KAAKW,SAA4B;AAC/B,QAAI;AACF,YAAMK,QAAQ,KAAKC,gBAAgBN,OAAAA;AAClCC,aAAeC,WAAWb,KAAKgB,MAAME,UAAUF,MAAMG,MAAMH,MAAMI,UAAU;IAC9E,SAASb,KAAK;AACZC,MAAAA,KAAIC,MAAM,wBAAwBF,KAAAA;;;;;;IACpC;EACF;EAEAc,MAAMV,SAA6B;AACjC,QAAI;AACF,YAAMK,QAAQ,KAAKM,iBAAiBX,OAAAA;AACnCC,aAAeC,WAAWQ,MAAML,MAAMO,OAAOP,MAAMI,UAAU;IAChE,SAASb,KAAK;AACZC,MAAAA,KAAIC,MAAM,yBAAyBF,KAAAA;;;;;;IACrC;EACF;EAEA,MAAMiB,QAAuB;AAC3B,QAAI;AACF,YAAOZ,OAAeC,WAAWW,MAAM,CAACjB,QAAAA;AACtCkB,yBAAiBlB,GAAAA;MACnB,CAAA;IACF,SAASA,KAAK;AACZC,MAAAA,KAAIC,MAAM,6BAA6BF,KAAAA;;;;;;IACzC;EACF;EAEA,MAAMmB,QAAuB;EAAC;AAChC;",
6
- "names": ["snippet", "log", "log", "TelemetryEvent", "getIdentityOptions", "did", "installationId", "log", "warn", "userId", "anonymousId", "AbstractSegmentTelemetry", "_getTags", "createPageProps", "options", "properties", "rest", "common", "custom", "createTrackProps", "event", "action", "TelemetryEvent", "ACTION", "SegmentTelemetry", "AbstractSegmentTelemetry", "apiKey", "batchSize", "getTags", "contents", "snippet", "min", "page", "script", "document", "createElement", "innerHTML", "body", "append", "err", "log", "catch", "identify", "options", "window", "analytics", "userId", "traits", "props", "createPageProps", "category", "name", "properties", "track", "createTrackProps", "event", "flush", "captureException", "close"]
7
- }
@@ -1,10 +0,0 @@
1
- import {
2
- Observability
3
- } from "./chunk-UG3VTDOH.mjs";
4
- import "./chunk-MWTIKIBZ.mjs";
5
- import "./chunk-5ICT2XF2.mjs";
6
- import "./chunk-YEPQFAES.mjs";
7
- export {
8
- Observability
9
- };
10
- //# sourceMappingURL=observability-7LFMAZBF.mjs.map
@@ -1,7 +0,0 @@
1
- {
2
- "version": 3,
3
- "sources": ["../../../src/otel/otel.ts", "../../../src/otel/logs.ts", "../../../src/otel/metrics.ts", "../../../src/otel/traces-browser.ts"],
4
- "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';\n\nexport type OtelOptions = {\n endpoint: string;\n authorizationHeader: string;\n serviceName: string; // For the Otel API, the name of the entity for which signals (metrics or trace) are collected.\n serviceVersion: string; // For the Otel API, The name of the entity for which signals (metrics or trace) are collected.\n getTags: () => { [key: string]: string };\n consoleDiagLogLevel?: string;\n};\n\nexport const setDiagLogger = (level?: string) => {\n const logLevel = DiagLogLevel[level as keyof typeof DiagLogLevel];\n if (logLevel) {\n diag.setLogger(new DiagConsoleLogger(), logLevel);\n }\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { SeverityNumber } from '@opentelemetry/api-logs';\nimport { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';\nimport { Resource } from '@opentelemetry/resources';\nimport { BatchLogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs';\nimport { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';\n\nimport {\n getContextFromEntry,\n getRelativeFilename,\n type LogConfig,\n type LogEntry,\n LogLevel,\n type LogProcessor,\n} from '@dxos/log';\nimport { jsonlogify } from '@dxos/util';\n\nimport { type OtelOptions, setDiagLogger } from './otel';\n\nexport type OtelLogOptions = OtelOptions & {\n logLevel: LogLevel;\n /**\n * Set `true` to capture logs sent through LoggingService from shared worker.\n * Better to set to `false` because shared worker is initializing its own logger.\n */\n includeSharedWorkerLogs: boolean;\n};\n\nexport class OtelLogs {\n private _loggerProvider: LoggerProvider;\n constructor(private readonly options: OtelLogOptions) {\n setDiagLogger(options.consoleDiagLogLevel);\n const resource = Resource.default().merge(\n new Resource({\n [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,\n [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,\n }),\n );\n const logExporter = new OTLPLogExporter({\n url: this.options.endpoint + '/v1/logs',\n headers: {\n Authorization: this.options.authorizationHeader,\n },\n concurrencyLimit: 10, // an optional limit on pending requests\n });\n this._loggerProvider = new LoggerProvider({ resource });\n this._loggerProvider.addLogRecordProcessor(new BatchLogRecordProcessor(logExporter));\n }\n\n public readonly logProcessor: LogProcessor = (config: LogConfig, entry: LogEntry) => {\n const logger = this._loggerProvider.getLogger('dxos-observability', this.options.serviceVersion);\n\n if (\n entry.level < this.options.logLevel ||\n (!this.options.includeSharedWorkerLogs && entry.meta?.S?.remoteSessionId)\n ) {\n return;\n }\n\n const record = {\n ...entry,\n ...(entry.meta ? { meta: { file: getRelativeFilename(entry.meta.F), line: entry.meta.L } } : {}),\n context: jsonlogify(getContextFromEntry(entry)),\n };\n\n logger.emit({\n severityNumber: convertLevel(entry.level),\n body: JSON.stringify(record),\n attributes: this.options.getTags(),\n });\n };\n\n flush(): Promise<void> {\n return this._loggerProvider.forceFlush();\n }\n\n close(): Promise<void> {\n return this._loggerProvider.shutdown();\n }\n}\n\nconst convertLevel = (level: LogLevel): SeverityNumber => {\n switch (level) {\n case LogLevel.DEBUG:\n return SeverityNumber.DEBUG;\n case LogLevel.VERBOSE:\n return SeverityNumber.INFO;\n case LogLevel.INFO:\n return SeverityNumber.INFO;\n case LogLevel.WARN:\n return SeverityNumber.WARN;\n case LogLevel.ERROR:\n return SeverityNumber.ERROR;\n default:\n return SeverityNumber.ERROR;\n }\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Attributes, type Meter, type ObservableGauge } from '@opentelemetry/api';\nimport { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';\nimport { Resource } from '@opentelemetry/resources';\nimport { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';\nimport { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';\n\nimport { log } from '@dxos/log';\nimport { TRACE_PROCESSOR, type MetricData } from '@dxos/tracing';\n\nimport { type OtelOptions, setDiagLogger } from './otel';\n\nconst EXPORT_INTERVAL = 60 * 1000;\n\ntype SynchronousGauge = {\n gauge: ObservableGauge<Attributes>;\n nextValue: number;\n nextTags?: any;\n};\n\nexport class OtelMetrics {\n private _meterProvider: MeterProvider;\n private _meter: Meter;\n private _gauges = new Map<string, SynchronousGauge>();\n\n constructor(private readonly options: OtelOptions) {\n // TODO: improve error handling/logging\n // https://github.com/open-telemetry/opentelemetry-js/issues/4823\n setDiagLogger(options.consoleDiagLogLevel);\n const resource = Resource.default().merge(\n new Resource({\n [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,\n [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,\n }),\n );\n\n const grafanaMetricReader = new PeriodicExportingMetricReader({\n exporter: new OTLPMetricExporter({\n url: this.options.endpoint + '/v1/metrics',\n headers: {\n Authorization: this.options.authorizationHeader,\n },\n }),\n exportIntervalMillis: EXPORT_INTERVAL,\n });\n\n this._meterProvider = new MeterProvider({\n resource,\n readers: [grafanaMetricReader],\n });\n this._meter = this._meterProvider.getMeter('dxos-observability');\n\n const metrics = {\n // TODO: update metrics names and remove prefix?\n increment: (name: string, value?: number, data?: MetricData) => {\n this.increment(name, value, convertTags(data));\n },\n distribution: (name: string, value: number, data?: MetricData) => {\n this.distribution(name, value, convertTags(data));\n },\n set: (name: string, value: number | string, data?: MetricData) => {\n // Not implemented, not part of Otel spec.\n },\n gauge: (name: string, value: number, data?: MetricData) => {\n this.gauge(name, value, convertTags(data));\n },\n };\n\n TRACE_PROCESSOR.remoteMetrics.registerProcessor(metrics);\n }\n\n gauge(name: string, value: number, tags?: any): void {\n const gauge = this._meter.createGauge(name);\n log('otel gauge', { name, value, tags: { ...this.options.getTags(), ...tags } });\n gauge.record(value, { ...this.options.getTags(), ...tags });\n }\n\n increment(name: string, value?: number, tags?: any): void {\n const counter = this._meter.createCounter(name);\n log('otel counter', { name, value, tags: { ...this.options.getTags(), ...tags } });\n counter.add(value ?? 1, { ...this.options.getTags(), ...tags });\n }\n\n distribution(name: string, value: number, tags?: any): void {\n const distribution = this._meter.createHistogram(name);\n log('otel distribution', { name, value, tags: { ...this.options.getTags(), ...tags } });\n distribution.record(value, { ...this.options.getTags(), ...tags });\n }\n\n flush(): Promise<void> {\n return this._meterProvider.forceFlush();\n }\n\n close(): Promise<void> {\n return this._meterProvider.shutdown();\n }\n}\n\nconst convertTags = (data?: MetricData) => {\n if (data && data.tags) {\n return Object.entries(data.tags).reduce<{ [key: string]: any }>((obj, [key, value]) => {\n obj[key] = value;\n return obj;\n }, {});\n } else {\n return {};\n }\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { trace, type Tracer } from '@opentelemetry/api';\nimport { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';\nimport { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';\nimport { registerInstrumentations } from '@opentelemetry/instrumentation';\nimport { Resource } from '@opentelemetry/resources';\nimport { ConsoleSpanExporter, SimpleSpanProcessor, BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';\nimport { WebTracerProvider } from '@opentelemetry/sdk-trace-web';\nimport { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';\n\nimport { log } from '@dxos/log';\nimport { TRACE_PROCESSOR, type StartSpanOptions } from '@dxos/tracing';\n\nimport { type OtelOptions } from './otel';\n\nexport class OtelTraces {\n private _tracer: Tracer;\n constructor(private readonly options: OtelOptions) {\n const resource = Resource.default().merge(\n new Resource({\n [SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,\n [SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,\n }),\n );\n\n const tracerProvider = new WebTracerProvider({ resource });\n tracerProvider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));\n tracerProvider.addSpanProcessor(\n new BatchSpanProcessor(\n new OTLPTraceExporter({\n url: this.options.endpoint + '/v1/traces',\n headers: {\n Authorization: this.options.authorizationHeader,\n },\n concurrencyLimit: 10, // an optional limit on pending requests\n }),\n ),\n );\n // TODO(nf): ContextManager? Propogator?\n tracerProvider.register({});\n this._tracer = trace.getTracer('dxos-observability', this.options.serviceVersion);\n }\n\n public start(): void {\n registerInstrumentations({\n instrumentations: [getWebAutoInstrumentations()],\n });\n log('trace processor registered');\n TRACE_PROCESSOR.remoteTracing.registerProcessor({\n startSpan: (options: StartSpanOptions) => {\n log('begin otel trace', { options });\n return this._tracer.startSpan(options.name, options);\n },\n });\n }\n}\n"],
5
- "mappings": "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",
6
- "names": ["diag", "DiagConsoleLogger", "DiagLogLevel", "setDiagLogger", "level", "logLevel", "DiagLogLevel", "diag", "setLogger", "DiagConsoleLogger", "SeverityNumber", "OTLPLogExporter", "Resource", "BatchLogRecordProcessor", "LoggerProvider", "SEMRESATTRS_SERVICE_NAME", "SEMRESATTRS_SERVICE_VERSION", "getContextFromEntry", "getRelativeFilename", "LogLevel", "jsonlogify", "OtelLogs", "options", "logProcessor", "config", "entry", "logger", "_loggerProvider", "getLogger", "serviceVersion", "level", "logLevel", "includeSharedWorkerLogs", "meta", "S", "remoteSessionId", "record", "file", "getRelativeFilename", "F", "line", "L", "context", "jsonlogify", "getContextFromEntry", "emit", "severityNumber", "convertLevel", "body", "JSON", "stringify", "attributes", "getTags", "setDiagLogger", "consoleDiagLogLevel", "resource", "Resource", "default", "merge", "SEMRESATTRS_SERVICE_NAME", "serviceName", "SEMRESATTRS_SERVICE_VERSION", "logExporter", "OTLPLogExporter", "url", "endpoint", "headers", "Authorization", "authorizationHeader", "concurrencyLimit", "LoggerProvider", "addLogRecordProcessor", "BatchLogRecordProcessor", "flush", "forceFlush", "close", "shutdown", "LogLevel", "DEBUG", "SeverityNumber", "VERBOSE", "INFO", "WARN", "ERROR", "OTLPMetricExporter", "Resource", "MeterProvider", "PeriodicExportingMetricReader", "SEMRESATTRS_SERVICE_NAME", "SEMRESATTRS_SERVICE_VERSION", "log", "TRACE_PROCESSOR", "EXPORT_INTERVAL", "OtelMetrics", "options", "_gauges", "Map", "setDiagLogger", "consoleDiagLogLevel", "resource", "Resource", "default", "merge", "SEMRESATTRS_SERVICE_NAME", "serviceName", "SEMRESATTRS_SERVICE_VERSION", "serviceVersion", "grafanaMetricReader", "PeriodicExportingMetricReader", "exporter", "OTLPMetricExporter", "url", "endpoint", "headers", "Authorization", "authorizationHeader", "exportIntervalMillis", "_meterProvider", "MeterProvider", "readers", "_meter", "getMeter", "metrics", "increment", "name", "value", "data", "convertTags", "distribution", "set", "gauge", "TRACE_PROCESSOR", "remoteMetrics", "registerProcessor", "tags", "createGauge", "log", "getTags", "record", "counter", "createCounter", "add", "createHistogram", "flush", "forceFlush", "close", "shutdown", "Object", "entries", "reduce", "obj", "key", "trace", "getWebAutoInstrumentations", "OTLPTraceExporter", "registerInstrumentations", "Resource", "ConsoleSpanExporter", "SimpleSpanProcessor", "BatchSpanProcessor", "WebTracerProvider", "SEMRESATTRS_SERVICE_NAME", "SEMRESATTRS_SERVICE_VERSION", "log", "TRACE_PROCESSOR", "OtelTraces", "options", "resource", "default", "merge", "serviceName", "serviceVersion", "tracerProvider", "addSpanProcessor", "url", "endpoint", "headers", "Authorization", "authorizationHeader", "concurrencyLimit", "register", "_tracer", "getTracer", "start", "instrumentations", "remoteTracing", "registerProcessor", "startSpan", "name"]
7
- }