@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.
- package/dist/lib/browser/chunk-5ICT2XF2.mjs +1 -0
- package/dist/lib/browser/{chunk-33TCMAUB.mjs → chunk-VIGEEYDR.mjs} +53 -30
- package/dist/lib/browser/chunk-VIGEEYDR.mjs.map +7 -0
- package/dist/lib/browser/{chunk-MWTIKIBZ.mjs → chunk-XNAF22QM.mjs} +10 -9
- package/dist/lib/browser/chunk-XNAF22QM.mjs.map +7 -0
- package/dist/lib/browser/{chunk-YEPQFAES.mjs → chunk-ZI3ZS3PA.mjs} +2 -2
- package/dist/lib/browser/chunk-ZI3ZS3PA.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/observability-I65SW7NE.mjs +10 -0
- package/dist/lib/browser/{otel-IRDZ7PES.mjs → otel-UH7ZRWC2.mjs} +59 -49
- package/dist/lib/browser/otel-UH7ZRWC2.mjs.map +7 -0
- package/dist/lib/browser/segment/index.mjs +3 -3
- package/dist/lib/browser/sentry/index.mjs +2 -2
- package/dist/lib/browser/{sentry-log-processor-3F3SBJXM.mjs → sentry-log-processor-5VGDTKZN.mjs} +53 -53
- package/dist/lib/browser/sentry-log-processor-5VGDTKZN.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-EYW4X3O6.mjs → chunk-MTKIPRBH.mjs} +53 -30
- package/dist/lib/{browser/chunk-33TCMAUB.mjs.map → node-esm/chunk-MTKIPRBH.mjs.map} +3 -3
- package/dist/lib/node-esm/{chunk-552KLA6Z.mjs → chunk-OJV247NY.mjs} +16 -14
- package/dist/lib/node-esm/chunk-OJV247NY.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs → chunk-QK5IUYVA.mjs} +2 -2
- package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs.map → chunk-QK5IUYVA.mjs.map} +3 -3
- package/dist/lib/node-esm/{chunk-MRAK2H7O.mjs → chunk-QUZL7LKE.mjs} +1 -1
- package/dist/lib/node-esm/index.mjs +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/observability-5KKD7B6J.mjs +11 -0
- package/dist/lib/node-esm/{otel-62HYJETM.mjs → otel-7PUCFSTY.mjs} +56 -46
- package/dist/lib/node-esm/otel-7PUCFSTY.mjs.map +7 -0
- package/dist/lib/node-esm/segment/index.mjs +3 -3
- package/dist/lib/node-esm/sentry/index.mjs +2 -2
- package/dist/lib/node-esm/{sentry-log-processor-JAYRA23C.mjs → sentry-log-processor-A2EV7P3Y.mjs} +53 -53
- package/dist/lib/node-esm/sentry-log-processor-A2EV7P3Y.mjs.map +7 -0
- package/dist/types/src/helpers/browser-observability.d.ts.map +1 -1
- package/dist/types/src/helpers/browser-observability.js +4 -6
- package/dist/types/src/helpers/browser-observability.js.map +1 -1
- package/dist/types/src/helpers/common.js +1 -1
- package/dist/types/src/helpers/common.js.map +1 -1
- package/dist/types/src/helpers/map-spaces.js +5 -6
- package/dist/types/src/helpers/map-spaces.js.map +1 -1
- package/dist/types/src/helpers/node-observability.d.ts +1 -1
- package/dist/types/src/helpers/node-observability.d.ts.map +1 -1
- package/dist/types/src/helpers/node-observability.js +7 -11
- package/dist/types/src/helpers/node-observability.js.map +1 -1
- package/dist/types/src/helpers/setup-telemetry-listeners.d.ts.map +1 -1
- package/dist/types/src/helpers/setup-telemetry-listeners.js +4 -7
- package/dist/types/src/helpers/setup-telemetry-listeners.js.map +1 -1
- package/dist/types/src/observability.d.ts +1 -1
- package/dist/types/src/observability.d.ts.map +1 -1
- package/dist/types/src/observability.js +68 -59
- package/dist/types/src/observability.js.map +1 -1
- package/dist/types/src/otel/logs.d.ts.map +1 -1
- package/dist/types/src/otel/logs.js +26 -23
- package/dist/types/src/otel/logs.js.map +1 -1
- package/dist/types/src/otel/metrics.d.ts +0 -1
- package/dist/types/src/otel/metrics.d.ts.map +1 -1
- package/dist/types/src/otel/metrics.js +6 -4
- package/dist/types/src/otel/metrics.js.map +1 -1
- package/dist/types/src/otel/otel.js +1 -1
- package/dist/types/src/otel/otel.js.map +1 -1
- package/dist/types/src/otel/traces-browser.d.ts.map +1 -1
- package/dist/types/src/otel/traces-browser.js +19 -13
- package/dist/types/src/otel/traces-browser.js.map +1 -1
- package/dist/types/src/otel/traces.d.ts.map +1 -1
- package/dist/types/src/otel/traces.js +18 -12
- package/dist/types/src/otel/traces.js.map +1 -1
- package/dist/types/src/segment/base.d.ts +1 -1
- package/dist/types/src/segment/base.d.ts.map +1 -1
- package/dist/types/src/segment/base.js +2 -1
- package/dist/types/src/segment/base.js.map +1 -1
- package/dist/types/src/segment/browser.d.ts +1 -1
- package/dist/types/src/segment/browser.d.ts.map +1 -1
- package/dist/types/src/segment/browser.js +6 -10
- package/dist/types/src/segment/browser.js.map +1 -1
- package/dist/types/src/segment/node.d.ts +1 -1
- package/dist/types/src/segment/node.d.ts.map +1 -1
- package/dist/types/src/segment/node.js +2 -1
- package/dist/types/src/segment/node.js.map +1 -1
- package/dist/types/src/sentry/browser.d.ts.map +1 -1
- package/dist/types/src/sentry/browser.js +5 -7
- package/dist/types/src/sentry/browser.js.map +1 -1
- package/dist/types/src/sentry/index.d.ts +1 -1
- package/dist/types/src/sentry/index.d.ts.map +1 -1
- package/dist/types/src/sentry/index.js +0 -1
- package/dist/types/src/sentry/index.js.map +1 -1
- package/dist/types/src/sentry/node.d.ts.map +1 -1
- package/dist/types/src/sentry/node.js +8 -13
- package/dist/types/src/sentry/node.js.map +1 -1
- package/dist/types/src/sentry/node.node.test.js +3 -5
- package/dist/types/src/sentry/node.node.test.js.map +1 -1
- package/dist/types/src/sentry/sentry-log-processor.d.ts.map +1 -1
- package/dist/types/src/sentry/sentry-log-processor.js +58 -63
- package/dist/types/src/sentry/sentry-log-processor.js.map +1 -1
- package/dist/types/src/sentry/sentry.node.test.js +1 -1
- package/dist/types/src/sentry/sentry.node.test.js.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +30 -30
- package/src/helpers/browser-observability.ts +2 -1
- package/src/helpers/node-observability.ts +5 -4
- package/src/helpers/setup-telemetry-listeners.ts +2 -1
- package/src/observability.ts +4 -4
- package/src/otel/logs.ts +9 -7
- package/src/otel/metrics.ts +5 -12
- package/src/otel/otel.ts +1 -1
- package/src/otel/traces-browser.ts +23 -20
- package/src/otel/traces.ts +22 -19
- package/src/segment/base.ts +1 -1
- package/src/segment/browser.ts +3 -2
- package/src/segment/node.ts +3 -2
- package/src/sentry/browser.ts +8 -8
- package/src/sentry/index.ts +1 -1
- package/src/sentry/node.node.test.ts +2 -1
- package/src/sentry/node.ts +3 -3
- package/src/sentry/sentry-log-processor.ts +17 -7
- package/src/sentry/sentry.node.test.ts +2 -1
- package/dist/lib/browser/chunk-5OQYI27L.mjs +0 -1
- package/dist/lib/browser/chunk-MWTIKIBZ.mjs.map +0 -7
- package/dist/lib/browser/chunk-YEPQFAES.mjs.map +0 -7
- package/dist/lib/browser/observability-EEM6BEY6.mjs +0 -10
- package/dist/lib/browser/otel-IRDZ7PES.mjs.map +0 -7
- package/dist/lib/browser/sentry-log-processor-3F3SBJXM.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-552KLA6Z.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-EYW4X3O6.mjs.map +0 -7
- package/dist/lib/node-esm/observability-DAXZGOBS.mjs +0 -11
- package/dist/lib/node-esm/otel-62HYJETM.mjs.map +0 -7
- package/dist/lib/node-esm/sentry-log-processor-JAYRA23C.mjs.map +0 -7
- /package/dist/lib/browser/{chunk-5OQYI27L.mjs.map → chunk-5ICT2XF2.mjs.map} +0 -0
- /package/dist/lib/browser/{observability-EEM6BEY6.mjs.map → observability-I65SW7NE.mjs.map} +0 -0
- /package/dist/lib/node-esm/{chunk-MRAK2H7O.mjs.map → chunk-QUZL7LKE.mjs.map} +0 -0
- /package/dist/lib/node-esm/{observability-DAXZGOBS.mjs.map → observability-5KKD7B6J.mjs.map} +0 -0
|
@@ -5,7 +5,7 @@ import { Event, scheduleTaskInterval } from '@dxos/async';
|
|
|
5
5
|
import { PublicKey } from '@dxos/client';
|
|
6
6
|
import { Context } from '@dxos/context';
|
|
7
7
|
import { invariant } from '@dxos/invariant';
|
|
8
|
-
import {
|
|
8
|
+
import { LogLevel, log } from '@dxos/log';
|
|
9
9
|
import { ConnectionState } from '@dxos/network-manager';
|
|
10
10
|
import { DeviceKind, Platform } from '@dxos/protocols/proto/dxos/client/services';
|
|
11
11
|
import { isNode } from '@dxos/util';
|
|
@@ -39,25 +39,35 @@ const NETWORK_METRICS_MIN_INTERVAL = 1000 * 60 * 5; // 5 minutes
|
|
|
39
39
|
* https://dxosorg.grafana.net/explore
|
|
40
40
|
*/
|
|
41
41
|
export class Observability {
|
|
42
|
+
_mode;
|
|
43
|
+
_namespace;
|
|
44
|
+
_config;
|
|
45
|
+
_group;
|
|
46
|
+
_secrets;
|
|
47
|
+
_tags = new Map();
|
|
48
|
+
// TODO(wittjosiah): Generic metrics interface.
|
|
49
|
+
_otelMetrics;
|
|
50
|
+
_otelTraces;
|
|
51
|
+
// TODO(wittjosiah): Generic telemetry interface.
|
|
52
|
+
_telemetryBatchSize;
|
|
53
|
+
_telemetry;
|
|
54
|
+
// TODO(wittjosiah): Generic error logging interface.
|
|
55
|
+
_sentryLogProcessor;
|
|
56
|
+
_otelLogs;
|
|
57
|
+
_errorReportingOptions;
|
|
58
|
+
_captureException;
|
|
59
|
+
_captureUserFeedback;
|
|
60
|
+
_lastNetworkStatus;
|
|
61
|
+
_ctx = new Context();
|
|
42
62
|
// TODO(nf): make platform a required extension?
|
|
43
63
|
constructor({ mode, namespace, environment, release, config, group, secrets, telemetry, errorLog, }) {
|
|
44
|
-
var _a;
|
|
45
|
-
this._tags = new Map();
|
|
46
|
-
this._ctx = new Context();
|
|
47
|
-
this.setIPDataTelemetryTags = (ipData) => {
|
|
48
|
-
this.setTag('city', ipData.city, 'telemetry');
|
|
49
|
-
this.setTag('region', ipData.region, 'telemetry');
|
|
50
|
-
this.setTag('country', ipData.country, 'telemetry');
|
|
51
|
-
ipData.latitude && this.setTag('latitude', ipData.latitude.toString(), 'telemetry');
|
|
52
|
-
ipData.longitude && this.setTag('longitude', ipData.longitude.toString(), 'telemetry');
|
|
53
|
-
};
|
|
54
64
|
this._mode = mode;
|
|
55
65
|
this._namespace = namespace;
|
|
56
66
|
this._config = config;
|
|
57
67
|
this._group = group;
|
|
58
68
|
this._secrets = this._loadSecrets(config, secrets);
|
|
59
|
-
this._telemetryBatchSize =
|
|
60
|
-
this._errorReportingOptions = errorLog
|
|
69
|
+
this._telemetryBatchSize = telemetry?.batchSize ?? 30;
|
|
70
|
+
this._errorReportingOptions = errorLog?.sentryInitOptions;
|
|
61
71
|
// Tags.
|
|
62
72
|
this.setTag('mode', this._mode);
|
|
63
73
|
this.setTag('namespace', this._namespace);
|
|
@@ -93,13 +103,13 @@ export class Observability {
|
|
|
93
103
|
else {
|
|
94
104
|
log('config', { rtc: this._secrets, config });
|
|
95
105
|
return {
|
|
96
|
-
DX_ENVIRONMENT: config
|
|
97
|
-
DX_RELEASE: config
|
|
98
|
-
SENTRY_DESTINATION: config
|
|
99
|
-
TELEMETRY_API_KEY: config
|
|
100
|
-
IPDATA_API_KEY: config
|
|
101
|
-
OTEL_ENDPOINT: config
|
|
102
|
-
OTEL_AUTHORIZATION: config
|
|
106
|
+
DX_ENVIRONMENT: config?.get('runtime.app.env.DX_ENVIRONMENT'),
|
|
107
|
+
DX_RELEASE: config?.get('runtime.app.env.DX_RELEASE'),
|
|
108
|
+
SENTRY_DESTINATION: config?.get('runtime.app.env.DX_SENTRY_DESTINATION'),
|
|
109
|
+
TELEMETRY_API_KEY: config?.get('runtime.app.env.DX_TELEMETRY_API_KEY'),
|
|
110
|
+
IPDATA_API_KEY: config?.get('runtime.app.env.DX_IPDATA_API_KEY'),
|
|
111
|
+
OTEL_ENDPOINT: config?.get('runtime.app.env.DX_OTEL_ENDPOINT'),
|
|
112
|
+
OTEL_AUTHORIZATION: config?.get('runtime.app.env.DX_OTEL_AUTHORIZATION'),
|
|
103
113
|
...secrets,
|
|
104
114
|
};
|
|
105
115
|
}
|
|
@@ -124,16 +134,20 @@ export class Observability {
|
|
|
124
134
|
setMode(mode) {
|
|
125
135
|
this._mode = mode;
|
|
126
136
|
}
|
|
137
|
+
//
|
|
138
|
+
// Tags
|
|
139
|
+
//
|
|
140
|
+
/** Callback (e.g., to share tags with Sentry.) */
|
|
141
|
+
_setTag;
|
|
127
142
|
/**
|
|
128
143
|
* camelCase keys are converted to snake_case in Segment.
|
|
129
144
|
*/
|
|
130
145
|
setTag(key, value, scope) {
|
|
131
|
-
var _a;
|
|
132
146
|
if (value === undefined) {
|
|
133
147
|
return;
|
|
134
148
|
}
|
|
135
149
|
if (this.enabled && (scope === undefined || scope === 'all' || scope === 'errors')) {
|
|
136
|
-
|
|
150
|
+
this._setTag?.(key, value);
|
|
137
151
|
}
|
|
138
152
|
if (!scope) {
|
|
139
153
|
scope = 'all';
|
|
@@ -147,18 +161,16 @@ export class Observability {
|
|
|
147
161
|
async setIdentityTags(clientServices) {
|
|
148
162
|
if (clientServices.IdentityService) {
|
|
149
163
|
clientServices.IdentityService.queryIdentity().subscribe((idqr) => {
|
|
150
|
-
|
|
151
|
-
if (!((_a = idqr === null || idqr === void 0 ? void 0 : idqr.identity) === null || _a === void 0 ? void 0 : _a.did)) {
|
|
164
|
+
if (!idqr?.identity?.did) {
|
|
152
165
|
log('empty response from identity service', { idqr });
|
|
153
166
|
return;
|
|
154
167
|
}
|
|
155
168
|
this.setTag('did', idqr.identity.did);
|
|
156
|
-
|
|
169
|
+
this._telemetry?.identify({ userId: idqr.identity.did });
|
|
157
170
|
});
|
|
158
171
|
}
|
|
159
172
|
if (clientServices.DevicesService) {
|
|
160
173
|
clientServices.DevicesService.queryDevices().subscribe((dqr) => {
|
|
161
|
-
var _a;
|
|
162
174
|
if (!dqr || !dqr.devices || dqr.devices.length === 0) {
|
|
163
175
|
log('empty response from device service', { device: dqr });
|
|
164
176
|
return;
|
|
@@ -170,24 +182,30 @@ export class Observability {
|
|
|
170
182
|
return;
|
|
171
183
|
}
|
|
172
184
|
this.setTag('deviceKey', thisDevice.deviceKey.truncate());
|
|
173
|
-
if (
|
|
185
|
+
if (thisDevice.profile?.label) {
|
|
174
186
|
this.setTag('deviceProfile', thisDevice.profile.label);
|
|
175
187
|
}
|
|
176
188
|
});
|
|
177
189
|
}
|
|
178
190
|
}
|
|
191
|
+
setIPDataTelemetryTags = (ipData) => {
|
|
192
|
+
this.setTag('city', ipData.city, 'telemetry');
|
|
193
|
+
this.setTag('region', ipData.region, 'telemetry');
|
|
194
|
+
this.setTag('country', ipData.country, 'telemetry');
|
|
195
|
+
ipData.latitude && this.setTag('latitude', ipData.latitude.toString(), 'telemetry');
|
|
196
|
+
ipData.longitude && this.setTag('longitude', ipData.longitude.toString(), 'telemetry');
|
|
197
|
+
};
|
|
179
198
|
//
|
|
180
199
|
// Logs
|
|
181
200
|
//
|
|
182
201
|
async _initLogs() {
|
|
183
|
-
var _a, _b;
|
|
184
202
|
if (this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION && this._mode !== 'disabled') {
|
|
185
203
|
const { OtelLogs } = await import('./otel');
|
|
186
204
|
this._otelLogs = new OtelLogs({
|
|
187
205
|
endpoint: this._secrets.OTEL_ENDPOINT,
|
|
188
206
|
authorizationHeader: this._secrets.OTEL_AUTHORIZATION,
|
|
189
207
|
serviceName: this._namespace,
|
|
190
|
-
serviceVersion:
|
|
208
|
+
serviceVersion: this.getTag('release')?.value ?? '0.0.0',
|
|
191
209
|
getTags: () => Object.fromEntries(Array.from(this._tags)
|
|
192
210
|
.filter(([key, value]) => {
|
|
193
211
|
return value.scope === 'all' || value.scope === 'errors';
|
|
@@ -207,14 +225,13 @@ export class Observability {
|
|
|
207
225
|
// Metrics
|
|
208
226
|
//
|
|
209
227
|
async _initMetrics() {
|
|
210
|
-
var _a, _b;
|
|
211
228
|
if (this.enabled && this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION) {
|
|
212
229
|
const { OtelMetrics } = await import('./otel');
|
|
213
230
|
this._otelMetrics = new OtelMetrics({
|
|
214
231
|
endpoint: this._secrets.OTEL_ENDPOINT,
|
|
215
232
|
authorizationHeader: this._secrets.OTEL_AUTHORIZATION,
|
|
216
233
|
serviceName: this._namespace,
|
|
217
|
-
serviceVersion:
|
|
234
|
+
serviceVersion: this.getTag('release')?.value ?? '0.0.0',
|
|
218
235
|
getTags: () => Object.fromEntries(Array.from(this._tags)
|
|
219
236
|
.filter(([key, value]) => {
|
|
220
237
|
return value.scope === 'all' || value.scope === 'metrics';
|
|
@@ -233,8 +250,7 @@ export class Observability {
|
|
|
233
250
|
* The default implementation uses OpenTelemetry
|
|
234
251
|
*/
|
|
235
252
|
gauge(name, value, extraTags) {
|
|
236
|
-
|
|
237
|
-
(_a = this._otelMetrics) === null || _a === void 0 ? void 0 : _a.gauge(name, value, extraTags);
|
|
253
|
+
this._otelMetrics?.gauge(name, value, extraTags);
|
|
238
254
|
}
|
|
239
255
|
// TODO(nf): Refactor into ObservabilityExtensions.
|
|
240
256
|
startNetworkMetrics(clientServices) {
|
|
@@ -244,9 +260,8 @@ export class Observability {
|
|
|
244
260
|
// TODO(nf): support type in debounce()
|
|
245
261
|
const updateSignalMetrics = new Event().debounce(NETWORK_METRICS_MIN_INTERVAL);
|
|
246
262
|
updateSignalMetrics.on(this._ctx, async () => {
|
|
247
|
-
var _a, _b, _c, _d;
|
|
248
263
|
log('send signal metrics');
|
|
249
|
-
|
|
264
|
+
this._lastNetworkStatus?.signaling?.forEach(({ server, state }) => {
|
|
250
265
|
this.gauge('dxos.client.network.signal.connectionState', state, { server });
|
|
251
266
|
});
|
|
252
267
|
let swarmCount = 0;
|
|
@@ -257,20 +272,19 @@ export class Observability {
|
|
|
257
272
|
let totalReadBufferSize = 0;
|
|
258
273
|
let totalWriteBufferSize = 0;
|
|
259
274
|
let totalChannelBufferSize = 0;
|
|
260
|
-
|
|
261
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
275
|
+
this._lastNetworkStatus?.connectionInfo?.forEach((connectionInfo) => {
|
|
262
276
|
swarmCount++;
|
|
263
|
-
for (const conn of
|
|
264
|
-
connectionStates.set(conn.state, (
|
|
265
|
-
totalReadBufferSize +=
|
|
266
|
-
totalWriteBufferSize +=
|
|
267
|
-
for (const stream of
|
|
268
|
-
totalChannelBufferSize +=
|
|
277
|
+
for (const conn of connectionInfo.connections ?? []) {
|
|
278
|
+
connectionStates.set(conn.state, (connectionStates.get(conn.state) ?? 0) + 1);
|
|
279
|
+
totalReadBufferSize += conn.readBufferSize ?? 0;
|
|
280
|
+
totalWriteBufferSize += conn.writeBufferSize ?? 0;
|
|
281
|
+
for (const stream of conn.streams ?? []) {
|
|
282
|
+
totalChannelBufferSize += stream.writeBufferSize ?? 0;
|
|
269
283
|
}
|
|
270
284
|
}
|
|
271
285
|
this.gauge('dxos.client.network.swarm.count', swarmCount);
|
|
272
286
|
for (const state in ConnectionState) {
|
|
273
|
-
this.gauge('dxos.client.network.connection.count',
|
|
287
|
+
this.gauge('dxos.client.network.connection.count', connectionStates.get(state) ?? 0, { state });
|
|
274
288
|
}
|
|
275
289
|
this.gauge('dxos.client.network.totalReadBufferSize', totalReadBufferSize);
|
|
276
290
|
this.gauge('dxos.client.network.totalWriteBufferSize', totalWriteBufferSize);
|
|
@@ -331,8 +345,7 @@ export class Observability {
|
|
|
331
345
|
scheduleTaskInterval(this._ctx, async () => updateSpaceMetrics.emit(), NETWORK_METRICS_MIN_INTERVAL);
|
|
332
346
|
}
|
|
333
347
|
async startRuntimeMetrics(client, frequency = NETWORK_METRICS_MIN_INTERVAL) {
|
|
334
|
-
|
|
335
|
-
const platform = await ((_a = client.services.services.SystemService) === null || _a === void 0 ? void 0 : _a.getPlatform());
|
|
348
|
+
const platform = await client.services.services.SystemService?.getPlatform();
|
|
336
349
|
invariant(platform, 'platform is required');
|
|
337
350
|
this.setTag('platformType', Platform.PLATFORM_TYPE[platform.type].toLowerCase());
|
|
338
351
|
if (this._mode === 'full') {
|
|
@@ -347,7 +360,6 @@ export class Observability {
|
|
|
347
360
|
}
|
|
348
361
|
}
|
|
349
362
|
scheduleTaskInterval(this._ctx, async () => {
|
|
350
|
-
var _a;
|
|
351
363
|
if (client.services.constructor.name === 'WorkerClientServices') {
|
|
352
364
|
const memory = window.performance.memory;
|
|
353
365
|
if (memory) {
|
|
@@ -356,13 +368,15 @@ export class Observability {
|
|
|
356
368
|
this.gauge('dxos.client.runtime.heapSizeLimit', memory.jsHeapSizeLimit);
|
|
357
369
|
}
|
|
358
370
|
}
|
|
359
|
-
|
|
371
|
+
client.services.services.SystemService?.getPlatform()
|
|
372
|
+
.then((platform) => {
|
|
360
373
|
if (platform.memory) {
|
|
361
374
|
this.gauge('dxos.client.services.runtime.rss', platform.memory.rss);
|
|
362
375
|
this.gauge('dxos.client.services.runtime.heapTotal', platform.memory.heapTotal);
|
|
363
376
|
this.gauge('dxos.client.services.runtime.heapUsed', platform.memory.heapUsed);
|
|
364
377
|
}
|
|
365
|
-
})
|
|
378
|
+
})
|
|
379
|
+
.catch((error) => log('platform error', { error }));
|
|
366
380
|
}, frequency);
|
|
367
381
|
}
|
|
368
382
|
//
|
|
@@ -390,16 +404,14 @@ export class Observability {
|
|
|
390
404
|
* The default implementation uses Segment.
|
|
391
405
|
*/
|
|
392
406
|
page(options) {
|
|
393
|
-
|
|
394
|
-
(_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.page(options);
|
|
407
|
+
this._telemetry?.page(options);
|
|
395
408
|
}
|
|
396
409
|
/**
|
|
397
410
|
* Submit telemetry user action.
|
|
398
411
|
* The default implementation uses Segment.
|
|
399
412
|
*/
|
|
400
413
|
track(options) {
|
|
401
|
-
|
|
402
|
-
(_a = this._telemetry) === null || _a === void 0 ? void 0 : _a.track(options);
|
|
414
|
+
this._telemetry?.track(options);
|
|
403
415
|
}
|
|
404
416
|
//
|
|
405
417
|
// Error Logs
|
|
@@ -443,14 +455,13 @@ export class Observability {
|
|
|
443
455
|
}
|
|
444
456
|
// TODO(nf): Refactor init based on providers and their capabilities.
|
|
445
457
|
async _initTraces() {
|
|
446
|
-
var _a, _b;
|
|
447
458
|
if (this._secrets.OTEL_ENDPOINT && this._secrets.OTEL_AUTHORIZATION && this._mode !== 'disabled') {
|
|
448
459
|
const { OtelTraces } = await import('./otel');
|
|
449
460
|
this._otelTraces = new OtelTraces({
|
|
450
461
|
endpoint: this._secrets.OTEL_ENDPOINT,
|
|
451
462
|
authorizationHeader: this._secrets.OTEL_AUTHORIZATION,
|
|
452
463
|
serviceName: this._namespace,
|
|
453
|
-
serviceVersion:
|
|
464
|
+
serviceVersion: this.getTag('release')?.value ?? '0.0.0',
|
|
454
465
|
getTags: () => Object.fromEntries(Array.from(this._tags)
|
|
455
466
|
.filter(([key, value]) => {
|
|
456
467
|
return value.scope === 'all' || value.scope === 'metrics';
|
|
@@ -464,9 +475,8 @@ export class Observability {
|
|
|
464
475
|
* The default implementation uses Sentry.
|
|
465
476
|
*/
|
|
466
477
|
captureException(err) {
|
|
467
|
-
var _a;
|
|
468
478
|
if (this.enabled) {
|
|
469
|
-
|
|
479
|
+
this._captureException?.(err);
|
|
470
480
|
}
|
|
471
481
|
}
|
|
472
482
|
/**
|
|
@@ -474,7 +484,6 @@ export class Observability {
|
|
|
474
484
|
* The default implementation uses Sentry.
|
|
475
485
|
*/
|
|
476
486
|
captureUserFeedback(message) {
|
|
477
|
-
var _a;
|
|
478
487
|
if (!this._secrets.SENTRY_DESTINATION) {
|
|
479
488
|
log.info('Feedback submitted without Sentry destination', { message });
|
|
480
489
|
return;
|
|
@@ -482,7 +491,7 @@ export class Observability {
|
|
|
482
491
|
// TODO(Zan): Should this respect telemetry mode? Sending feedback is explicitly user-initiated.
|
|
483
492
|
// - Maybe if telemetry is disable we shouldn't enable replay.
|
|
484
493
|
// - (Check the browser.ts implementation for reference).
|
|
485
|
-
void
|
|
494
|
+
void this._captureUserFeedback?.(message);
|
|
486
495
|
}
|
|
487
496
|
}
|
|
488
497
|
//# sourceMappingURL=observability.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observability.js","sourceRoot":"","sources":["../../../src/observability.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"observability.js","sourceRoot":"","sources":["../../../src/observability.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAA4B,SAAS,EAAE,MAAM,cAAc,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAsB,QAAQ,EAAE,MAAM,4CAA4C,CAAC;AACtG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,OAAO,YAAY,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAe,oBAAoB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEzE,OAAO,EAA2C,cAAc,EAAqB,MAAM,WAAW,CAAC;AAIvG,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,WAAW;AACzD,MAAM,4BAA4B,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS;AAC9D,MAAM,4BAA4B,GAAG,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY;AA8ChE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,OAAO,aAAa;IAChB,KAAK,CAAO;IACH,UAAU,CAAS;IACnB,OAAO,CAAU;IACjB,MAAM,CAAU;IAChB,QAAQ,CAAuB;IAC/B,KAAK,GAAG,IAAI,GAAG,EAA8C,CAAC;IAE/E,+CAA+C;IACvC,YAAY,CAAe;IAC3B,WAAW,CAAc;IACjC,iDAAiD;IACzC,mBAAmB,CAAS;IAC5B,UAAU,CAAoB;IACtC,qDAAqD;IAC7C,mBAAmB,CAAsB;IACzC,SAAS,CAAY;IACrB,sBAAsB,CAAe;IACrC,iBAAiB,CAAiC;IAClD,oBAAoB,CAAsC;IAC1D,kBAAkB,CAAiB;IAEnC,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC;IAE7B,gDAAgD;IAChD,YAAY,EACV,IAAI,EACJ,SAAS,EACT,WAAW,EACX,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,SAAS,EACT,QAAQ,GACa;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,mBAAmB,GAAG,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,sBAAsB,GAAG,QAAQ,EAAE,iBAAiB,CAAC;QAE1D,QAAQ;QACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC;IACnC,CAAC;IAEO,YAAY,CAAC,MAA0B,EAAE,OAAgC;QAC/E,IAAI,MAAM,EAAE,EAAE,CAAC;YACb,MAAM,aAAa,GAAG;gBACpB,GAAI,YAAqC;gBACzC,GAAG,OAAO;aACX,CAAC;YAEF,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC1F,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,aAAa,CAAC,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC9E,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,aAAa,CAAC,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACtG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACnG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC1F,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,aAAa,CAAC,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC7F,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,aAAa,CAAC,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAE5G,OAAO,aAAa,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9C,OAAO;gBACL,cAAc,EAAE,MAAM,EAAE,GAAG,CAAC,gCAAgC,CAAC;gBAC7D,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,4BAA4B,CAAC;gBACrD,kBAAkB,EAAE,MAAM,EAAE,GAAG,CAAC,uCAAuC,CAAC;gBACxE,iBAAiB,EAAE,MAAM,EAAE,GAAG,CAAC,sCAAsC,CAAC;gBACtE,cAAc,EAAE,MAAM,EAAE,GAAG,CAAC,mCAAmC,CAAC;gBAChE,aAAa,EAAE,MAAM,EAAE,GAAG,CAAC,kCAAkC,CAAC;gBAC9D,kBAAkB,EAAE,MAAM,EAAE,GAAG,CAAC,uCAAuC,CAAC;gBACxE,GAAG,OAAO;aACX,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACvB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,GAAG,CAAC,YAAY,CAAC,CAAC;QAClB,MAAM,MAAM,GAAoB,EAAE,CAAC;QACnC,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;QAEtD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,IAAU;QAChB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,EAAE;IACF,OAAO;IACP,EAAE;IAEF,kDAAkD;IAC1C,OAAO,CAAwC;IAEvD;;OAEG;IACH,MAAM,CAAC,GAAW,EAAE,KAAyB,EAAE,KAAgB;QAC7D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,QAAQ,CAAC,EAAE,CAAC;YACnF,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,KAAK,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,4FAA4F;IAC5F,KAAK,CAAC,eAAe,CAAC,cAAuC;QAC3D,IAAI,cAAc,CAAC,eAAe,EAAE,CAAC;YACnC,cAAc,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;oBACzB,GAAG,CAAC,sCAAsC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;oBACtD,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC;YAClC,cAAc,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC7D,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACrD,GAAG,CAAC,oCAAoC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC3D,OAAO;gBACT,CAAC;gBAED,SAAS,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAC;gBACrD,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,CAAC,CAAC;gBACpF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,GAAG,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC1C,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC1D,IAAI,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;oBAC9B,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;QAC1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACpD,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;QACpF,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;IACzF,CAAC,CAAC;IAEF,EAAE;IACF,OAAO;IACP,EAAE;IAEM,KAAK,CAAC,SAAS;QACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACjG,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,CAAC;gBAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa;gBACrC,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB;gBACrD,WAAW,EAAE,IAAI,CAAC,UAAU;gBAC5B,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,OAAO;gBACxD,OAAO,EAAE,GAAG,EAAE,CACZ,MAAM,CAAC,WAAW,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;qBACnB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACvB,OAAO,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC;gBAC3D,CAAC,CAAC;qBACD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAC7C;gBACH,QAAQ,EAAE,QAAQ,CAAC,OAAO;gBAC1B,uBAAuB,EAAE,KAAK;aAC/B,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YACjF,GAAG,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,EAAE;IACF,UAAU;IACV,EAAE;IAEM,KAAK,CAAC,YAAY;QACxB,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YACpF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,CAAC,YAAY,GAAG,IAAI,WAAW,CAAC;gBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa;gBACrC,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB;gBACrD,WAAW,EAAE,IAAI,CAAC,UAAU;gBAC5B,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,OAAO;gBACxD,OAAO,EAAE,GAAG,EAAE,CACZ,MAAM,CAAC,WAAW,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;qBACnB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACvB,OAAO,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC;gBAC5D,CAAC,CAAC;qBACD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAC7C;aACJ,CAAC,CAAC;YACH,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAY,EAAE,KAAmB,EAAE,SAAe;QACtD,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,mDAAmD;IAEnD,mBAAmB,CAAC,cAAuC;QACzD,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QACD,uCAAuC;QACvC,MAAM,mBAAmB,GAAG,IAAI,KAAK,EAAiB,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAC9F,mBAAmB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;YAC3C,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAC1B,IAAI,CAAC,kBAAkB,EAAE,SAAoC,EAAE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC5F,IAAI,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;YAEH,IAAI,UAAU,GAAG,CAAC,CAAC;YACnB,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;YACnD,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;gBACpC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;YAED,IAAI,mBAAmB,GAAG,CAAC,CAAC;YAC5B,IAAI,oBAAoB,GAAG,CAAC,CAAC;YAC7B,IAAI,sBAAsB,GAAG,CAAC,CAAC;YAE/B,IAAI,CAAC,kBAAkB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBAClE,UAAU,EAAE,CAAC;gBAEb,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;oBACpD,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC9E,mBAAmB,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;oBAChD,oBAAoB,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC;oBAClD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;wBACxC,sBAAsB,IAAI,MAAM,CAAC,eAAe,IAAI,CAAC,CAAC;oBACxD,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,KAAK,CAAC,iCAAiC,EAAE,UAAU,CAAC,CAAC;gBAC1D,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;oBACpC,IAAI,CAAC,KAAK,CAAC,sCAAsC,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAClG,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,yCAAyC,EAAE,mBAAmB,CAAC,CAAC;gBAC3E,IAAI,CAAC,KAAK,CAAC,0CAA0C,EAAE,oBAAoB,CAAC,CAAC;gBAC7E,IAAI,CAAC,KAAK,CAAC,4CAA4C,EAAE,sBAAsB,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,EAAE;YACtE,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC;YACxC,mBAAmB,CAAC,IAAI,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAC;IACxG,CAAC;IAED,kBAAkB,CAAC,MAAc,EAAE,SAAiB;QAClD,8CAA8C;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuC,CAAC;QACrE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAE/F,MAAM,kBAAkB,GAAG,IAAI,KAAK,EAAS,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;QACnF,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;YAC1C,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAC1B,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;gBAC7D,IAAI,CAAC,KAAK,CAAC,2BAA2B,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACzE,IAAI,CAAC,KAAK,CAAC,2BAA2B,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACzE,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACrE,IAAI,CAAC,KAAK,CAAC,wCAAwC,EAAE,IAAI,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACrG,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,IAAI,KAAK,EAAS,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QACvF,oBAAoB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;YAC5C,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAC5B,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;gBAC7D,IAAI,CAAC,KAAK,CAAC;oBACT,GAAG,oBAAoB,CAAC,MAAM,CAAC;oBAC/B,KAAK,EAAE,cAAc,CAAC,OAAO;oBAC7B,MAAM,EAAE,cAAc;oBACtB,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAE,EAAE,CAC9C,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvB,IAAI,EAAE,GAAG,EAAE;gBACT,kBAAkB,CAAC,IAAI,EAAE,CAAC;gBAC1B,oBAAoB,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;QAEL,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YACtB,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBACrB,MAAM;qBACH,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;qBAC/C,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBACjB,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;YACP,CAAC;SACF,CAAC,CAAC;QAEH,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAC;IACvG,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAc,EAAE,YAAoB,4BAA4B;QACxF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;QAC7E,SAAS,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3F,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;YAC1B,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC7C,CAAC;YACD,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,oBAAoB,CAClB,IAAI,CAAC,IAAI,EACT,KAAK,IAAI,EAAE;YACT,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;gBAChE,MAAM,MAAM,GAAI,MAAM,CAAC,WAAmB,CAAC,MAAM,CAAC;gBAClD,IAAI,MAAM,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,+BAA+B,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;oBACpE,IAAI,CAAC,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;oBAClE,IAAI,CAAC,KAAK,CAAC,mCAAmC,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YACD,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE;iBAClD,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjB,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACpB,IAAI,CAAC,KAAK,CAAC,kCAAkC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACpE,IAAI,CAAC,KAAK,CAAC,wCAAwC,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;oBAChF,IAAI,CAAC,KAAK,CAAC,uCAAuC,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC,EACD,SAAS,CACV,CAAC;IACJ,CAAC;IAED,EAAE;IACF,YAAY;IACZ,EAAE;IAEM,KAAK,CAAC,cAAc;QAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;YACpG,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;YACvD,IAAI,CAAC,UAAU,GAAG,IAAI,gBAAgB,CAAC;gBACrC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB;gBACvC,SAAS,EAAE,IAAI,CAAC,mBAAmB;gBACnC,OAAO,EAAE,GAAG,EAAE,CACZ,MAAM,CAAC,WAAW,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;qBACnB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACvB,OAAO,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,WAAW,CAAC;gBAC9D,CAAC,CAAC;qBACD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAC7C;aACJ,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,OAAoB;QACvB,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAqB;QACzB,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,EAAE;IACF,aAAa;IACb,EAAE;IAEM,KAAK,CAAC,cAAc;QAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAClE,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;YAC7E,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;YAC1C,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;YAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;YAEtB,4CAA4C;YAC5C,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBAC9B,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB;gBACtC,OAAO,EAAE,IAAI,CAAC,sBAAsB;aACrC,CAAC,CAAC;YACH,IAAI,CAAC,mBAAmB,GAAG,IAAI,kBAAkB,EAAE,CAAC;YACpD,IAAI,CAAC;gBACH,GAAG,IAAI,CAAC,sBAAsB;gBAC9B,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB;gBAC7C,cAAc,EAAE,IAAI,CAAC,KAAK,KAAK,MAAM;gBACrC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAoB,CAAC,mBAAmB,CAAC,KAAK,CAAC;aACzE,CAAC,CAAC;YAEH,4DAA4D;YAC5D,qEAAqE;YACrE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1B,IAAI,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9C,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,mBAAmB,IAAI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACvG,CAAC;IAED,WAAW;QACT,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC/C,CAAC;IAED,qEAAqE;IAC7D,KAAK,CAAC,WAAW;QACvB,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,kBAAkB,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACjG,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC;gBAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa;gBACrC,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB;gBACrD,WAAW,EAAE,IAAI,CAAC,UAAU;gBAC5B,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,OAAO;gBACxD,OAAO,EAAE,GAAG,EAAE,CACZ,MAAM,CAAC,WAAW,CAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;qBACnB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACvB,OAAO,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC;gBAC5D,CAAC,CAAC;qBACD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAC7C;aACJ,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,GAAQ;QACvB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,OAAe;QACjC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,+CAA+C,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YACvE,OAAO;QACT,CAAC;QAED,gGAAgG;QAChG,8DAA8D;QAC9D,yDAAyD;QACzD,KAAK,IAAI,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../../src/otel/logs.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../../src/otel/logs.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,QAAQ,EACR,KAAK,YAAY,EAGlB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,QAAQ,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IACzC,QAAQ,EAAE,QAAQ,CAAC;IACnB;;;OAGG;IACH,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,qBAAa,QAAQ;IAEP,OAAO,CAAC,QAAQ,CAAC,OAAO;IADpC,OAAO,CAAC,eAAe,CAAiB;gBACX,OAAO,EAAE,cAAc;IAqBpD,SAAgB,YAAY,EAAE,YAAY,CAqBxC;IAEF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB"}
|
|
@@ -3,35 +3,19 @@
|
|
|
3
3
|
//
|
|
4
4
|
import { SeverityNumber } from '@opentelemetry/api-logs';
|
|
5
5
|
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
|
|
6
|
-
import {
|
|
6
|
+
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
|
|
7
7
|
import { BatchLogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs';
|
|
8
8
|
import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
|
|
9
|
-
import { getContextFromEntry, getRelativeFilename,
|
|
9
|
+
import { LogLevel, getContextFromEntry, getRelativeFilename, } from '@dxos/log';
|
|
10
10
|
import { jsonlogify } from '@dxos/util';
|
|
11
11
|
import { setDiagLogger } from './otel';
|
|
12
12
|
export class OtelLogs {
|
|
13
|
+
options;
|
|
14
|
+
_loggerProvider;
|
|
13
15
|
constructor(options) {
|
|
14
16
|
this.options = options;
|
|
15
|
-
this.logProcessor = (config, entry) => {
|
|
16
|
-
var _a, _b;
|
|
17
|
-
const logger = this._loggerProvider.getLogger('dxos-observability', this.options.serviceVersion);
|
|
18
|
-
if (entry.level < this.options.logLevel ||
|
|
19
|
-
(!this.options.includeSharedWorkerLogs && ((_b = (_a = entry.meta) === null || _a === void 0 ? void 0 : _a.S) === null || _b === void 0 ? void 0 : _b.remoteSessionId))) {
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
const record = {
|
|
23
|
-
...entry,
|
|
24
|
-
...(entry.meta ? { meta: { file: getRelativeFilename(entry.meta.F), line: entry.meta.L } } : {}),
|
|
25
|
-
context: jsonlogify(getContextFromEntry(entry)),
|
|
26
|
-
};
|
|
27
|
-
logger.emit({
|
|
28
|
-
severityNumber: convertLevel(entry.level),
|
|
29
|
-
body: JSON.stringify(record),
|
|
30
|
-
attributes: this.options.getTags(),
|
|
31
|
-
});
|
|
32
|
-
};
|
|
33
17
|
setDiagLogger(options.consoleDiagLogLevel);
|
|
34
|
-
const resource =
|
|
18
|
+
const resource = defaultResource().merge(resourceFromAttributes({
|
|
35
19
|
[SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
|
|
36
20
|
[SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
|
|
37
21
|
}));
|
|
@@ -42,9 +26,28 @@ export class OtelLogs {
|
|
|
42
26
|
},
|
|
43
27
|
concurrencyLimit: 10, // an optional limit on pending requests
|
|
44
28
|
});
|
|
45
|
-
this._loggerProvider = new LoggerProvider({
|
|
46
|
-
|
|
29
|
+
this._loggerProvider = new LoggerProvider({
|
|
30
|
+
resource,
|
|
31
|
+
processors: [new BatchLogRecordProcessor(logExporter)],
|
|
32
|
+
});
|
|
47
33
|
}
|
|
34
|
+
logProcessor = (config, entry) => {
|
|
35
|
+
const logger = this._loggerProvider.getLogger('dxos-observability', this.options.serviceVersion);
|
|
36
|
+
if (entry.level < this.options.logLevel ||
|
|
37
|
+
(!this.options.includeSharedWorkerLogs && entry.meta?.S?.remoteSessionId)) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const record = {
|
|
41
|
+
...entry,
|
|
42
|
+
...(entry.meta ? { meta: { file: getRelativeFilename(entry.meta.F), line: entry.meta.L } } : {}),
|
|
43
|
+
context: jsonlogify(getContextFromEntry(entry)),
|
|
44
|
+
};
|
|
45
|
+
logger.emit({
|
|
46
|
+
severityNumber: convertLevel(entry.level),
|
|
47
|
+
body: JSON.stringify(record),
|
|
48
|
+
attributes: this.options.getTags(),
|
|
49
|
+
});
|
|
50
|
+
};
|
|
48
51
|
flush() {
|
|
49
52
|
return this._loggerProvider.forceFlush();
|
|
50
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../../src/otel/logs.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../../src/otel/logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ export declare class OtelMetrics {
|
|
|
3
3
|
private readonly options;
|
|
4
4
|
private _meterProvider;
|
|
5
5
|
private _meter;
|
|
6
|
-
private _gauges;
|
|
7
6
|
constructor(options: OtelOptions);
|
|
8
7
|
gauge(name: string, value: number, tags?: any): void;
|
|
9
8
|
increment(name: string, value?: number, tags?: any): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../../src/otel/metrics.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../../src/otel/metrics.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,QAAQ,CAAC;AAIzD,qBAAa,WAAW;IAIV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAQ;gBAEO,OAAO,EAAE,WAAW;IA8CjD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;IAMpD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;IAMzD,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;IAM3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
5
|
-
import {
|
|
5
|
+
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
|
|
6
6
|
import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
|
|
7
7
|
import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
|
|
8
8
|
import { log } from '@dxos/log';
|
|
@@ -10,13 +10,15 @@ import { TRACE_PROCESSOR } from '@dxos/tracing';
|
|
|
10
10
|
import { setDiagLogger } from './otel';
|
|
11
11
|
const EXPORT_INTERVAL = 60 * 1000;
|
|
12
12
|
export class OtelMetrics {
|
|
13
|
+
options;
|
|
14
|
+
_meterProvider;
|
|
15
|
+
_meter;
|
|
13
16
|
constructor(options) {
|
|
14
17
|
this.options = options;
|
|
15
|
-
this._gauges = new Map();
|
|
16
18
|
// TODO: improve error handling/logging
|
|
17
19
|
// https://github.com/open-telemetry/opentelemetry-js/issues/4823
|
|
18
20
|
setDiagLogger(options.consoleDiagLogLevel);
|
|
19
|
-
const resource =
|
|
21
|
+
const resource = defaultResource().merge(resourceFromAttributes({
|
|
20
22
|
[SEMRESATTRS_SERVICE_NAME]: this.options.serviceName,
|
|
21
23
|
[SEMRESATTRS_SERVICE_VERSION]: this.options.serviceVersion,
|
|
22
24
|
}));
|
|
@@ -59,7 +61,7 @@ export class OtelMetrics {
|
|
|
59
61
|
increment(name, value, tags) {
|
|
60
62
|
const counter = this._meter.createCounter(name);
|
|
61
63
|
log('otel counter', { name, value, tags: { ...this.options.getTags(), ...tags } });
|
|
62
|
-
counter.add(value
|
|
64
|
+
counter.add(value ?? 1, { ...this.options.getTags(), ...tags });
|
|
63
65
|
}
|
|
64
66
|
distribution(name, value, tags) {
|
|
65
67
|
const distribution = this._meter.createHistogram(name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/otel/metrics.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAGF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/otel/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
//
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
|
-
import {
|
|
4
|
+
import { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
|
|
5
5
|
export const setDiagLogger = (level) => {
|
|
6
6
|
const logLevel = DiagLogLevel[level];
|
|
7
7
|
if (logLevel) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../../../src/otel/otel.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../../../src/otel/otel.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAW3E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,EAAE;IAC9C,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAkC,CAAC,CAAC;IAClE,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,CAAC,IAAI,iBAAiB,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces-browser.d.ts","sourceRoot":"","sources":["../../../../src/otel/traces-browser.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,OAAO;IADpC,OAAO,CAAC,OAAO,CAAS;gBACK,OAAO,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"traces-browser.d.ts","sourceRoot":"","sources":["../../../../src/otel/traces-browser.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,OAAO;IADpC,OAAO,CAAC,OAAO,CAAS;gBACK,OAAO,EAAE,WAAW;IA6B1C,KAAK,IAAI,IAAI;CAYrB"}
|