@fluidframework/telemetry-utils 2.0.0-internal.3.0.5 → 2.0.0-internal.3.1.1
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/.eslintrc.js +11 -13
- package/.mocharc.js +2 -2
- package/api-extractor.json +2 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -3
- package/dist/config.js.map +1 -1
- package/dist/debugLogger.d.ts.map +1 -1
- package/dist/debugLogger.js.map +1 -1
- package/dist/errorLogging.d.ts +5 -5
- package/dist/errorLogging.d.ts.map +1 -1
- package/dist/errorLogging.js +20 -18
- package/dist/errorLogging.js.map +1 -1
- package/dist/eventEmitterWithErrorHandling.d.ts.map +1 -1
- package/dist/eventEmitterWithErrorHandling.js.map +1 -1
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js.map +1 -1
- package/dist/fluidErrorBase.d.ts.map +1 -1
- package/dist/fluidErrorBase.js +4 -4
- package/dist/fluidErrorBase.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +13 -12
- package/dist/logger.js.map +1 -1
- package/dist/mockLogger.d.ts +5 -5
- package/dist/mockLogger.d.ts.map +1 -1
- package/dist/mockLogger.js +5 -5
- package/dist/mockLogger.js.map +1 -1
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/dist/sampledTelemetryHelper.d.ts.map +1 -1
- package/dist/sampledTelemetryHelper.js.map +1 -1
- package/dist/telemetryTypes.d.ts.map +1 -1
- package/dist/telemetryTypes.js.map +1 -1
- package/dist/thresholdCounter.d.ts.map +1 -1
- package/dist/thresholdCounter.js.map +1 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js.map +1 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js +3 -3
- package/lib/config.js.map +1 -1
- package/lib/debugLogger.d.ts.map +1 -1
- package/lib/debugLogger.js +1 -1
- package/lib/debugLogger.js.map +1 -1
- package/lib/errorLogging.d.ts +5 -5
- package/lib/errorLogging.d.ts.map +1 -1
- package/lib/errorLogging.js +20 -18
- package/lib/errorLogging.js.map +1 -1
- package/lib/eventEmitterWithErrorHandling.d.ts.map +1 -1
- package/lib/eventEmitterWithErrorHandling.js.map +1 -1
- package/lib/events.d.ts.map +1 -1
- package/lib/events.js.map +1 -1
- package/lib/fluidErrorBase.d.ts.map +1 -1
- package/lib/fluidErrorBase.js +4 -4
- package/lib/fluidErrorBase.js.map +1 -1
- package/lib/index.d.ts +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +14 -13
- package/lib/logger.js.map +1 -1
- package/lib/mockLogger.d.ts +5 -5
- package/lib/mockLogger.d.ts.map +1 -1
- package/lib/mockLogger.js +5 -5
- package/lib/mockLogger.js.map +1 -1
- package/lib/packageVersion.d.ts +1 -1
- package/lib/packageVersion.js +1 -1
- package/lib/packageVersion.js.map +1 -1
- package/lib/sampledTelemetryHelper.d.ts.map +1 -1
- package/lib/sampledTelemetryHelper.js.map +1 -1
- package/lib/telemetryTypes.d.ts.map +1 -1
- package/lib/telemetryTypes.js.map +1 -1
- package/lib/thresholdCounter.d.ts.map +1 -1
- package/lib/thresholdCounter.js.map +1 -1
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js.map +1 -1
- package/package.json +107 -106
- package/prettier.config.cjs +1 -1
- package/src/config.ts +173 -172
- package/src/debugLogger.ts +118 -111
- package/src/errorLogging.ts +302 -299
- package/src/eventEmitterWithErrorHandling.ts +16 -12
- package/src/events.ts +26 -26
- package/src/fluidErrorBase.ts +42 -38
- package/src/index.ts +26 -16
- package/src/logger.ts +541 -533
- package/src/mockLogger.ts +113 -107
- package/src/packageVersion.ts +1 -1
- package/src/sampledTelemetryHelper.ts +122 -122
- package/src/telemetryTypes.ts +37 -37
- package/src/thresholdCounter.ts +34 -34
- package/src/utils.ts +15 -15
- package/tsconfig.esnext.json +6 -6
- package/tsconfig.json +9 -13
package/src/debugLogger.ts
CHANGED
|
@@ -4,123 +4,130 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
ITelemetryBaseEvent,
|
|
8
|
+
ITelemetryBaseLogger,
|
|
9
|
+
ITelemetryProperties,
|
|
10
10
|
} from "@fluidframework/common-definitions";
|
|
11
11
|
import { performance } from "@fluidframework/common-utils";
|
|
12
12
|
import { debug as registerDebug, IDebugger } from "debug";
|
|
13
|
-
import {
|
|
13
|
+
import {
|
|
14
|
+
TelemetryLogger,
|
|
15
|
+
MultiSinkLogger,
|
|
16
|
+
ChildLogger,
|
|
17
|
+
ITelemetryLoggerPropertyBags,
|
|
18
|
+
} from "./logger";
|
|
14
19
|
|
|
15
20
|
/**
|
|
16
21
|
* Implementation of debug logger
|
|
17
22
|
*/
|
|
18
23
|
export class DebugLogger extends TelemetryLogger {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Create debug logger - all events are output to debug npm library
|
|
26
|
+
* @param namespace - Telemetry event name prefix to add to all events
|
|
27
|
+
* @param properties - Base properties to add to all events
|
|
28
|
+
* @param propertyGetters - Getters to add additional properties to all events
|
|
29
|
+
*/
|
|
30
|
+
public static create(
|
|
31
|
+
namespace: string,
|
|
32
|
+
properties?: ITelemetryLoggerPropertyBags,
|
|
33
|
+
): TelemetryLogger {
|
|
34
|
+
// Setup base logger upfront, such that host can disable it (if needed)
|
|
35
|
+
const debug = registerDebug(namespace);
|
|
36
|
+
|
|
37
|
+
const debugErr = registerDebug(namespace);
|
|
38
|
+
debugErr.log = console.error.bind(console);
|
|
39
|
+
debugErr.enabled = true;
|
|
40
|
+
|
|
41
|
+
return new DebugLogger(debug, debugErr, properties);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Mix in debug logger with another logger.
|
|
46
|
+
* Returned logger will output events to both newly created debug logger, as well as base logger
|
|
47
|
+
* @param namespace - Telemetry event name prefix to add to all events
|
|
48
|
+
* @param properties - Base properties to add to all events
|
|
49
|
+
* @param propertyGetters - Getters to add additional properties to all events
|
|
50
|
+
* @param baseLogger - Base logger to output events (in addition to debug logger being created). Can be undefined.
|
|
51
|
+
*/
|
|
52
|
+
public static mixinDebugLogger(
|
|
53
|
+
namespace: string,
|
|
54
|
+
baseLogger?: ITelemetryBaseLogger,
|
|
55
|
+
properties?: ITelemetryLoggerPropertyBags,
|
|
56
|
+
): TelemetryLogger {
|
|
57
|
+
if (!baseLogger) {
|
|
58
|
+
return DebugLogger.create(namespace, properties);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const multiSinkLogger = new MultiSinkLogger(undefined, properties);
|
|
62
|
+
multiSinkLogger.addLogger(
|
|
63
|
+
DebugLogger.create(namespace, this.tryGetBaseLoggerProps(baseLogger)),
|
|
64
|
+
);
|
|
65
|
+
multiSinkLogger.addLogger(ChildLogger.create(baseLogger, namespace));
|
|
66
|
+
|
|
67
|
+
return multiSinkLogger;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
private static tryGetBaseLoggerProps(baseLogger?: ITelemetryBaseLogger) {
|
|
71
|
+
if (baseLogger instanceof TelemetryLogger) {
|
|
72
|
+
return (baseLogger as any as { properties: ITelemetryLoggerPropertyBags }).properties;
|
|
73
|
+
}
|
|
74
|
+
return undefined;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
constructor(
|
|
78
|
+
private readonly debug: IDebugger,
|
|
79
|
+
private readonly debugErr: IDebugger,
|
|
80
|
+
properties?: ITelemetryLoggerPropertyBags,
|
|
81
|
+
) {
|
|
82
|
+
super(undefined, properties);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Send an event to debug loggers
|
|
87
|
+
*
|
|
88
|
+
* @param event - the event to send
|
|
89
|
+
*/
|
|
90
|
+
public send(event: ITelemetryBaseEvent): void {
|
|
91
|
+
const newEvent: ITelemetryProperties = this.prepareEvent(event);
|
|
92
|
+
const isError = newEvent.category === "error";
|
|
93
|
+
let logger = isError ? this.debugErr : this.debug;
|
|
94
|
+
|
|
95
|
+
// Use debug's coloring schema for base of the event
|
|
96
|
+
const index = event.eventName.lastIndexOf(TelemetryLogger.eventNamespaceSeparator);
|
|
97
|
+
const name = event.eventName.substring(index + 1);
|
|
98
|
+
if (index > 0) {
|
|
99
|
+
logger = logger.extend(event.eventName.substring(0, index));
|
|
100
|
+
}
|
|
101
|
+
newEvent.eventName = undefined;
|
|
102
|
+
|
|
103
|
+
let tick = "";
|
|
104
|
+
tick = `tick=${TelemetryLogger.formatTick(performance.now())}`;
|
|
105
|
+
|
|
106
|
+
// Extract stack to put it last, but also to avoid escaping '\n' in it by JSON.stringify below
|
|
107
|
+
const stack = newEvent.stack ? newEvent.stack : "";
|
|
108
|
+
newEvent.stack = undefined;
|
|
109
|
+
|
|
110
|
+
// Watch out for circular references - they can come from two sources
|
|
111
|
+
// 1) error object - we do not control it and should remove it and retry
|
|
112
|
+
// 2) properties supplied by telemetry caller - that's a bug that should be addressed!
|
|
113
|
+
let payload: string;
|
|
114
|
+
try {
|
|
115
|
+
payload = JSON.stringify(newEvent);
|
|
116
|
+
} catch (error) {
|
|
117
|
+
newEvent.error = undefined;
|
|
118
|
+
payload = JSON.stringify(newEvent);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if (payload === "{}") {
|
|
122
|
+
payload = "";
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
// Force errors out, to help with diagnostics
|
|
126
|
+
if (isError) {
|
|
127
|
+
logger.enabled = true;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
// Print multi-line.
|
|
131
|
+
logger(`${name} ${payload} ${tick} ${stack}`);
|
|
132
|
+
}
|
|
126
133
|
}
|