snyk-broker 5.13.0 → 5.13.2
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/broker-workload/clientLocalRequests.js +4 -0
- package/dist/lib/broker-workload/clientLocalRequests.js.map +1 -1
- package/dist/lib/broker-workload/websocketRequests.js +61 -32
- package/dist/lib/broker-workload/websocketRequests.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/connectionsManager/synchronizer.js +2 -2
- package/dist/lib/hybrid-sdk/client/connectionsManager/synchronizer.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/index.js +28 -9
- package/dist/lib/hybrid-sdk/client/index.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/metrics/noopClient.js +17 -6
- package/dist/lib/hybrid-sdk/client/metrics/noopClient.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/metrics/otelClient.js +144 -0
- package/dist/lib/hybrid-sdk/client/metrics/otelClient.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socket.js +29 -8
- package/dist/lib/hybrid-sdk/client/socket.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/closeHandler.js +4 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/closeHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/openHandler.js +2 -1
- package/dist/lib/hybrid-sdk/client/socketHandlers/openHandler.js.map +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.js +1 -1
- package/dist/lib/hybrid-sdk/server/routesHandlers/httpRequestHandler.js.map +1 -1
- package/dist/package.json +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -8,6 +8,7 @@ const interpolateRequestWithConfigData_1 = require("../hybrid-sdk/interpolateReq
|
|
|
8
8
|
const node_crypto_1 = require("node:crypto");
|
|
9
9
|
const workloadFactory_1 = require("../hybrid-sdk/workloadFactory");
|
|
10
10
|
const metrics_1 = require("../hybrid-sdk/common/utils/metrics");
|
|
11
|
+
const noopClient_1 = require("../hybrid-sdk/client/metrics/noopClient");
|
|
11
12
|
const token_1 = require("../hybrid-sdk/common/utils/token");
|
|
12
13
|
/**
|
|
13
14
|
* Handler for a single incoming HTTP request from a local client (e.g. Snyk CLI) or webhook.
|
|
@@ -20,6 +21,7 @@ class BrokerClientRequestWorkload extends workloadFactory_1.Workload {
|
|
|
20
21
|
this.req = req;
|
|
21
22
|
this.res = res;
|
|
22
23
|
this.options = options;
|
|
24
|
+
this.metricsClient = options.metricsClient ?? new noopClient_1.NoopClient();
|
|
23
25
|
}
|
|
24
26
|
async handler(data) {
|
|
25
27
|
const hybridClientRequestHandler = new clientRequestHelpers_1.HybridClientRequestHandler(this.req, this.res);
|
|
@@ -44,6 +46,7 @@ class BrokerClientRequestWorkload extends workloadFactory_1.Workload {
|
|
|
44
46
|
};
|
|
45
47
|
if (!matchedFilterRule) {
|
|
46
48
|
(0, metrics_1.incrementHttpRequestsTotal)(true, 'inbound-request');
|
|
49
|
+
this.metricsClient.recordRequest('local-client', false);
|
|
47
50
|
const reason = 'Request does not match any accept rule, blocking HTTP request';
|
|
48
51
|
hybridClientRequestHandler.logContext.error = 'blocked';
|
|
49
52
|
logger_1.log.warn(hybridClientRequestHandler.logContext, reason);
|
|
@@ -55,6 +58,7 @@ class BrokerClientRequestWorkload extends workloadFactory_1.Workload {
|
|
|
55
58
|
else {
|
|
56
59
|
hybridClientRequestHandler.makeRequest((0, interpolateRequestWithConfigData_1.getInterpolatedRequest)(null, matchedFilterRule, this.req, logContext, this.options.config, 'upstream'), data.makeRequestOverHttp);
|
|
57
60
|
(0, metrics_1.incrementHttpRequestsTotal)(false, 'inbound-request');
|
|
61
|
+
this.metricsClient.recordRequest('local-client', true);
|
|
58
62
|
}
|
|
59
63
|
}
|
|
60
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientLocalRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientLocalRequests.ts"],"names":[],"mappings":";;;AACA,6EAAgF;AAEhF,yDAAyD;AACzD,2CAA+C;AAC/C,qGAAwF;AACxF,6CAAyC;AACzC,mEAIuC;AAEvC,gEAAgF;
|
|
1
|
+
{"version":3,"file":"clientLocalRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/clientLocalRequests.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,10 @@ const workloadFactory_1 = require("../hybrid-sdk/workloadFactory");
|
|
|
15
15
|
const prepareRequest_1 = require("./prepareRequest");
|
|
16
16
|
const metrics_1 = require("../hybrid-sdk/common/utils/metrics");
|
|
17
17
|
const token_1 = require("../hybrid-sdk/common/utils/token");
|
|
18
|
+
// Converts status code to string like 5xx
|
|
19
|
+
function statusClass(statusCode) {
|
|
20
|
+
return statusCode != null ? `${String(statusCode)[0]}xx` : 'unknown';
|
|
21
|
+
}
|
|
18
22
|
/**
|
|
19
23
|
* Handler for a single request received over the WebSocket connection. Checks the request against
|
|
20
24
|
* accept rules; if it matches, performs the downstream HTTP request and sends the response back
|
|
@@ -70,9 +74,11 @@ class BrokerWorkload extends workloadFactory_1.Workload {
|
|
|
70
74
|
const simplifiedContext = structuredClone(logContext);
|
|
71
75
|
delete simplifiedContext.requestHeaders;
|
|
72
76
|
logger_1.log.info(simplifiedContext, `[Websocket Flow] Received request from ${process.env.BROKER_TYPE == 'client' ? 'client' : 'server'}`);
|
|
77
|
+
const metricsClient = this.options.metricsClient;
|
|
73
78
|
const matchedFilterRule = (0, requestFiltering_1.filterRequest)(payload, this.options, this.websocketConnectionHandler);
|
|
74
79
|
if (!matchedFilterRule) {
|
|
75
80
|
(0, metrics_1.incrementWebSocketRequestsTotal)(true, 'inbound-request');
|
|
81
|
+
metricsClient?.recordRequest('broker-server', false);
|
|
76
82
|
const reason = '[Websocket Flow][Blocked Request] Does not match any accept rule';
|
|
77
83
|
logContext.error = 'Blocked by filter rules';
|
|
78
84
|
logger_1.log.warn(logContext, reason);
|
|
@@ -89,6 +95,9 @@ class BrokerWorkload extends workloadFactory_1.Workload {
|
|
|
89
95
|
else {
|
|
90
96
|
const urlInterpolated = (0, interpolateRequestWithConfigData_1.getInterpolatedRequest)(this.connectionIdentifier, matchedFilterRule, payload, logContext, this.options.config, 'downstream');
|
|
91
97
|
(0, metrics_1.incrementWebSocketRequestsTotal)(false, 'inbound-request');
|
|
98
|
+
metricsClient?.recordRequest('broker-server', true);
|
|
99
|
+
const streaming = Boolean(payload.streamingID);
|
|
100
|
+
metricsClient?.recordDownstreamRequest(streaming);
|
|
92
101
|
const contextId = payload.headers['x-snyk-broker-context-id'] ?? null;
|
|
93
102
|
// mutates the payload
|
|
94
103
|
const preparedRequest = await (0, prepareRequest_1.prepareRequest)(urlInterpolated, payload, logContext, this.options, this.connectionIdentifier, this.websocketConnectionHandler?.socketType);
|
|
@@ -100,42 +109,62 @@ class BrokerWorkload extends workloadFactory_1.Workload {
|
|
|
100
109
|
preparedRequest.req.headers['x-snyk-broker'] = `${(0, token_1.maskToken)(this.connectionIdentifier)}`;
|
|
101
110
|
}
|
|
102
111
|
(0, metrics_1.incrementHttpRequestsTotal)(false, 'outbound-request');
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
requestId: logContext.requestId,
|
|
127
|
-
}, `[Websocket Flow][Inbound] Unexpected status code for relayed request.`);
|
|
112
|
+
try {
|
|
113
|
+
metricsClient?.incrementInflight();
|
|
114
|
+
if (streaming) {
|
|
115
|
+
// indicates server supports streaming
|
|
116
|
+
try {
|
|
117
|
+
const start = performance.now();
|
|
118
|
+
const downstreamRequestIncomingResponse = await (0, request_1.makeStreamingRequestToDownstream)(preparedRequest.req);
|
|
119
|
+
metricsClient?.recordDownstreamDuration(true, (performance.now() - start) / 1000);
|
|
120
|
+
const contentLength = downstreamRequestIncomingResponse.headers['content-length'];
|
|
121
|
+
if (contentLength) {
|
|
122
|
+
const bytes = parseInt(contentLength, 10);
|
|
123
|
+
if (!isNaN(bytes)) {
|
|
124
|
+
metricsClient?.recordUpstreamResponseBytes(bytes);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
responseHandler.streamDataResponse(downstreamRequestIncomingResponse);
|
|
128
|
+
}
|
|
129
|
+
catch (e) {
|
|
130
|
+
logger_1.log.error({
|
|
131
|
+
...logContext,
|
|
132
|
+
error: e,
|
|
133
|
+
stackTrace: new Error('stacktrace generator').stack,
|
|
134
|
+
}, '[Downstream] Caught error making streaming request to downstream ');
|
|
128
135
|
}
|
|
129
|
-
responseHandler.sendDataResponse(response, logContext);
|
|
130
136
|
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
+
else {
|
|
138
|
+
// here if request against server had header x-broker-ws-response:true
|
|
139
|
+
const start = performance.now();
|
|
140
|
+
try {
|
|
141
|
+
const response = await (0, request_1.makeRequestToDownstream)(preparedRequest.req);
|
|
142
|
+
metricsClient?.recordDownstreamDuration(false, (performance.now() - start) / 1000);
|
|
143
|
+
metricsClient?.recordDownstreamStatus(statusClass(response?.statusCode));
|
|
144
|
+
const status = (response && response.statusCode) || 500;
|
|
145
|
+
if (status > 404) {
|
|
146
|
+
logger_1.log.warn({
|
|
147
|
+
statusCode: response.statusCode,
|
|
148
|
+
url: preparedRequest.req.url,
|
|
149
|
+
requestId: logContext.requestId,
|
|
150
|
+
}, `[Websocket Flow][Inbound] Unexpected status code for relayed request.`);
|
|
151
|
+
}
|
|
152
|
+
responseHandler.sendDataResponse(response, logContext);
|
|
153
|
+
}
|
|
154
|
+
catch (error) {
|
|
155
|
+
metricsClient?.recordDownstreamDuration(false, (performance.now() - start) / 1000);
|
|
156
|
+
metricsClient?.recordDownstreamStatus('5xx');
|
|
157
|
+
(0, log_1.logError)(logContext, error);
|
|
158
|
+
return responseHandler.sendResponse({
|
|
159
|
+
status: 500,
|
|
160
|
+
body: error,
|
|
161
|
+
});
|
|
162
|
+
}
|
|
137
163
|
}
|
|
138
164
|
}
|
|
165
|
+
finally {
|
|
166
|
+
metricsClient?.decrementInflight();
|
|
167
|
+
}
|
|
139
168
|
}
|
|
140
169
|
}
|
|
141
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/websocketRequests.ts"],"names":[],"mappings":";;;AAAA,0FAA8F;AAC9F,qDAAwD;AACxD,uEAAgE;AAEhE,2CAA+C;AAC/C,mEAAsE;AACtE,+DAAsE;AACtE,yDAAmD;AACnD,wDAGoC;AACpC,qCAAuC;AACvC,qGAAwF;AACxF,mEAIuC;AACvC,qDAAkD;AAElD,gEAG4C;
|
|
1
|
+
{"version":3,"file":"websocketRequests.js","sourceRoot":"","sources":["../../../lib/broker-workload/websocketRequests.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ const syncClientConfig = async (clientOpts, websocketConnections, globalIdentify
|
|
|
70
70
|
if (currentWebsocketConnectionIndex < 0) {
|
|
71
71
|
logger_1.log.info({ connectionName: key }, 'Creating configured connection.');
|
|
72
72
|
await (0, pluginManager_1.runStartupPlugins)(clientOpts, key);
|
|
73
|
-
const [primary, secondary] = await (0, socket_1.createWebSocketConnectionPairs)(clientOpts, globalIdentifyingMetadata, key);
|
|
73
|
+
const [primary, secondary] = await (0, socket_1.createWebSocketConnectionPairs)(clientOpts, globalIdentifyingMetadata, key, clientOpts.metricsClient);
|
|
74
74
|
websocketConnections.push(primary, secondary);
|
|
75
75
|
}
|
|
76
76
|
else if (
|
|
@@ -82,7 +82,7 @@ const syncClientConfig = async (clientOpts, websocketConnections, globalIdentify
|
|
|
82
82
|
(0, connectionHelpers_1.shutDownConnectionPair)(websocketConnections, integrationsKeys.indexOf(key));
|
|
83
83
|
// setup new tunnels
|
|
84
84
|
await (0, pluginManager_1.runStartupPlugins)(clientOpts, key);
|
|
85
|
-
const [primary, secondary] = await (0, socket_1.createWebSocketConnectionPairs)(clientOpts, globalIdentifyingMetadata, key);
|
|
85
|
+
const [primary, secondary] = await (0, socket_1.createWebSocketConnectionPairs)(clientOpts, globalIdentifyingMetadata, key, clientOpts.metricsClient);
|
|
86
86
|
websocketConnections.push(primary, secondary);
|
|
87
87
|
}
|
|
88
88
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/connectionsManager/synchronizer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/connectionsManager/synchronizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,14 +47,12 @@ const config_1 = require("../common/config/config");
|
|
|
47
47
|
const filterLoading_1 = require("./utils/filterLoading");
|
|
48
48
|
const metrics = __importStar(require("./metrics"));
|
|
49
49
|
const ONEDAY = 24 * 3600 * 1000; // 24h in ms
|
|
50
|
+
// Minimal early handler — active until main() registers the full metrics-aware
|
|
51
|
+
// handler below. Ensures structured logging for crashes during boot/init.
|
|
52
|
+
// NOTE: If main() is called more than once, additional listeners will accumulate.
|
|
50
53
|
process.on('uncaughtException', (error) => {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
logger_1.log.error({ msg: error.message, stackTrace: error.stack }, 'Uncaught exception:', error.message);
|
|
56
|
-
process.exit(1);
|
|
57
|
-
}
|
|
54
|
+
logger_1.log.error({ msg: error.message, stackTrace: error.stack }, 'Uncaught exception (pre-init):', error.message);
|
|
55
|
+
process.exit(1);
|
|
58
56
|
});
|
|
59
57
|
const getWebsocketConnections = () => {
|
|
60
58
|
return exports.websocketConnections;
|
|
@@ -78,6 +76,27 @@ const main = async (clientOpts) => {
|
|
|
78
76
|
process.exit(1);
|
|
79
77
|
}
|
|
80
78
|
metricsClient.incrementBrokerClientMetric();
|
|
79
|
+
// Make metricsClient available to workload handlers via clientOpts.
|
|
80
|
+
clientOpts.metricsClient = metricsClient;
|
|
81
|
+
// Replace the early module-scope handler with the full metrics-aware handler.
|
|
82
|
+
// NOTE: If main() is called more than once, additional listeners will
|
|
83
|
+
// accumulate after this point — each call registers a new handler on top.
|
|
84
|
+
process.removeAllListeners('uncaughtException');
|
|
85
|
+
process.on('uncaughtException', (error) => {
|
|
86
|
+
const isEconnreset = error.message === 'read ECONNRESET';
|
|
87
|
+
metricsClient.recordUncaughtException(error.code ?? error.message ?? 'unknown');
|
|
88
|
+
if (isEconnreset) {
|
|
89
|
+
logger_1.log.error({ msg: error.message, stackTrace: error.stack }, 'ECONNRESETs Catch all:', error.message);
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
metricsClient.recordProcessExit('uncaught_exception');
|
|
93
|
+
logger_1.log.error({ msg: error.message, stackTrace: error.stack }, 'Uncaught exception:', error.message);
|
|
94
|
+
const flushTimeout = new Promise((resolve) => setTimeout(resolve, 2000));
|
|
95
|
+
Promise.race([metricsClient.forceFlush(), flushTimeout])
|
|
96
|
+
.catch((err) => logger_1.log.warn({ err }, 'Failed to flush metrics before exit.'))
|
|
97
|
+
.finally(() => process.exit(1));
|
|
98
|
+
}
|
|
99
|
+
});
|
|
81
100
|
clientOpts.config.API_BASE_URL =
|
|
82
101
|
clientOpts.config.API_BASE_URL ??
|
|
83
102
|
clientOpts.config.BROKER_DISPATCHER_BASE_URL ??
|
|
@@ -122,8 +141,8 @@ const main = async (clientOpts) => {
|
|
|
122
141
|
exports.websocketConnections = await (0, manager_1.manageWebsocketConnections)(clientOpts, globalIdentifyingMetadata);
|
|
123
142
|
}
|
|
124
143
|
else {
|
|
125
|
-
exports.websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.primary));
|
|
126
|
-
exports.websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.secondary));
|
|
144
|
+
exports.websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.primary, metricsClient));
|
|
145
|
+
exports.websocketConnections.push((0, socket_1.createWebSocket)(clientOpts, globalIdentifyingMetadata, client_1.Role.secondary, metricsClient));
|
|
127
146
|
}
|
|
128
147
|
// start the local webserver to listen for relay requests
|
|
129
148
|
const { app, server } = (0, webserver_1.webserver)(clientOpts.config, clientOpts.port);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAoC;AACpC,qCAA2C;AAC3C,8CAAkD;AAClD,mGAAgG;AAChG,wDAAqD;AACrD,sEAA8C;AAC9C,gEAGqC;AACrC,2EAAwE;AACxE,2EAAwE;AACxE,2CAKwB;AACxB,+DAGsC;AACtC,yDAA4D;AAE5D,mGAAuG;AACvG,0DAAiE;AACjE,uEAAkE;AAClE,0DAA0E;AAC1E,oDAA2D;AAC3D,yDAA+D;AAC/D,mDAAqC;AAErC,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,YAAY;AAE7C,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;IACxC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/hybrid-sdk/client/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,23 @@ exports.NoopClient = void 0;
|
|
|
6
6
|
* Used when no metrics endpoint is configured.
|
|
7
7
|
*/
|
|
8
8
|
class NoopClient {
|
|
9
|
-
incrementBrokerClientMetric() {
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
9
|
+
incrementBrokerClientMetric() { }
|
|
10
|
+
async shutdown() { }
|
|
11
|
+
async forceFlush() { }
|
|
12
|
+
setConnectionState() { }
|
|
13
|
+
recordReconnect() { }
|
|
14
|
+
recordProcessExit() { }
|
|
15
|
+
recordAuthRenewalFailure() { }
|
|
16
|
+
recordUncaughtException() { }
|
|
17
|
+
recordRequest() { }
|
|
18
|
+
recordDownstreamRequest() { }
|
|
19
|
+
recordDownstreamDuration() { }
|
|
20
|
+
recordDownstreamStatus() { }
|
|
21
|
+
recordConnectionDuration() { }
|
|
22
|
+
recordUpstreamResponseBytes() { }
|
|
23
|
+
incrementInflight() { }
|
|
24
|
+
decrementInflight() { }
|
|
25
|
+
recordPingLatency() { }
|
|
15
26
|
}
|
|
16
27
|
exports.NoopClient = NoopClient;
|
|
17
28
|
//# sourceMappingURL=noopClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"noopClient.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/metrics/noopClient.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,MAAa,UAAU;IACrB,2BAA2B;
|
|
1
|
+
{"version":3,"file":"noopClient.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/metrics/noopClient.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,MAAa,UAAU;IACrB,2BAA2B,KAAU,CAAC;IACtC,KAAK,CAAC,QAAQ,KAAmB,CAAC;IAClC,KAAK,CAAC,UAAU,KAAmB,CAAC;IAEpC,kBAAkB,KAAU,CAAC;IAC7B,eAAe,KAAU,CAAC;IAC1B,iBAAiB,KAAU,CAAC;IAC5B,wBAAwB,KAAU,CAAC;IACnC,uBAAuB,KAAU,CAAC;IAElC,aAAa,KAAU,CAAC;IACxB,uBAAuB,KAAU,CAAC;IAClC,wBAAwB,KAAU,CAAC;IACnC,sBAAsB,KAAU,CAAC;IACjC,wBAAwB,KAAU,CAAC;IACnC,2BAA2B,KAAU,CAAC;IACtC,iBAAiB,KAAU,CAAC;IAC5B,iBAAiB,KAAU,CAAC;IAC5B,iBAAiB,KAAU,CAAC;CAC7B;AApBD,gCAoBC"}
|
|
@@ -6,6 +6,7 @@ const instrumentation_1 = require("@opentelemetry/instrumentation");
|
|
|
6
6
|
const instrumentation_runtime_node_1 = require("@opentelemetry/instrumentation-runtime-node");
|
|
7
7
|
const exporter_metrics_otlp_grpc_1 = require("@opentelemetry/exporter-metrics-otlp-grpc");
|
|
8
8
|
const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
|
|
9
|
+
const CONNECTION_STATES = ['connected', 'reconnecting', 'failed'];
|
|
9
10
|
/**
|
|
10
11
|
* {@link Client} implementation backed by OpenTelemetry.
|
|
11
12
|
* Exports metrics to an OTLP/gRPC endpoint using delta temporality.
|
|
@@ -52,18 +53,161 @@ class OtelClient {
|
|
|
52
53
|
instrumentations: [this.runtimeInstrumentation],
|
|
53
54
|
});
|
|
54
55
|
const meter = this.meterProvider.getMeter('broker-client');
|
|
56
|
+
// --- Process Health ---
|
|
55
57
|
this.brokerClientInitializedCounter = meter.createCounter('broker.client.initialized', {
|
|
56
58
|
description: 'Count of broker client initializations',
|
|
57
59
|
valueType: api_1.ValueType.INT,
|
|
58
60
|
});
|
|
61
|
+
this.connectionStateGauge = meter.createGauge('broker.client.connection.state', {
|
|
62
|
+
description: 'Current state of each websocket connection (1 = active state, 0 = inactive). Attributes: state (connected|reconnecting|failed), role (primary|secondary).',
|
|
63
|
+
valueType: api_1.ValueType.INT,
|
|
64
|
+
});
|
|
65
|
+
this.reconnectCounter = meter.createCounter('broker.client.reconnect.total', {
|
|
66
|
+
description: 'Number of websocket reconnect attempts scheduled',
|
|
67
|
+
valueType: api_1.ValueType.INT,
|
|
68
|
+
});
|
|
69
|
+
this.processExitCounter = meter.createCounter('broker.client.process_exit.total', {
|
|
70
|
+
description: 'Count of process exits by reason (reconnect_exhaustion, auth_4xx, uncaught_exception).',
|
|
71
|
+
valueType: api_1.ValueType.INT,
|
|
72
|
+
});
|
|
73
|
+
this.authRenewalFailureCounter = meter.createCounter('broker.client.auth_renewal_failure.total', {
|
|
74
|
+
description: 'Auth renewal HTTP failures by status code.',
|
|
75
|
+
valueType: api_1.ValueType.INT,
|
|
76
|
+
});
|
|
77
|
+
this.uncaughtExceptionCounter = meter.createCounter('broker.client.uncaught_exception.total', {
|
|
78
|
+
description: 'Uncaught exceptions by error code (ECONNRESET, ETIMEDOUT, etc.)',
|
|
79
|
+
valueType: api_1.ValueType.INT,
|
|
80
|
+
});
|
|
81
|
+
// Uptime: ObservableGauge backed by process.uptime()
|
|
82
|
+
meter
|
|
83
|
+
.createObservableGauge('broker.client.uptime_seconds', {
|
|
84
|
+
description: 'Seconds since the broker client process started. Short uptimes signal restart loops.',
|
|
85
|
+
unit: 's',
|
|
86
|
+
})
|
|
87
|
+
.addCallback((result) => {
|
|
88
|
+
result.observe(process.uptime());
|
|
89
|
+
});
|
|
90
|
+
// --- Request Flow ---
|
|
91
|
+
this.requestCounter = meter.createCounter('broker.client.request.total', {
|
|
92
|
+
description: 'Total requests received, tagged by filter flow (broker-server=WS from server, local-client=HTTP from local client) and filter outcome',
|
|
93
|
+
valueType: api_1.ValueType.INT,
|
|
94
|
+
});
|
|
95
|
+
this.downstreamRequestCounter = meter.createCounter('broker.client.downstream.request.total', {
|
|
96
|
+
description: 'Requests forwarded to downstream after passing filter rules',
|
|
97
|
+
valueType: api_1.ValueType.INT,
|
|
98
|
+
});
|
|
99
|
+
this.downstreamDurationHistogram = meter.createHistogram('broker.client.downstream.duration.seconds', {
|
|
100
|
+
description: 'Duration of downstream HTTP calls in seconds. Non-streaming: full round-trip. Streaming: time to response headers.',
|
|
101
|
+
unit: 's',
|
|
102
|
+
advice: {
|
|
103
|
+
explicitBucketBoundaries: [0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30],
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
this.downstreamStatusCounter = meter.createCounter('broker.client.downstream.status', {
|
|
107
|
+
description: 'Downstream response status class distribution (non-streaming only)',
|
|
108
|
+
valueType: api_1.ValueType.INT,
|
|
109
|
+
});
|
|
110
|
+
this.connectionDurationHistogram = meter.createHistogram('broker.client.ws.duration.seconds', {
|
|
111
|
+
description: 'Websocket connection duration from open to close, in seconds',
|
|
112
|
+
unit: 's',
|
|
113
|
+
advice: {
|
|
114
|
+
explicitBucketBoundaries: [
|
|
115
|
+
1, 5, 10, 15, 30, 60, 300, 900, 3600, 14400, 43200, 86400,
|
|
116
|
+
],
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
this.upstreamResponseBytesHistogram = meter.createHistogram('broker.client.upstream.response.bytes', {
|
|
120
|
+
description: 'Byte size of response bodies sent back to the broker server',
|
|
121
|
+
unit: 'By',
|
|
122
|
+
advice: {
|
|
123
|
+
explicitBucketBoundaries: [
|
|
124
|
+
1024, 10240, 102400, 524288, 1048576, 5242880, 10485760, 20971520,
|
|
125
|
+
],
|
|
126
|
+
},
|
|
127
|
+
});
|
|
128
|
+
this.inflightRequestsCounter = meter.createUpDownCounter('broker.client.inflight.requests', {
|
|
129
|
+
description: 'Number of downstream requests currently in progress',
|
|
130
|
+
valueType: api_1.ValueType.INT,
|
|
131
|
+
});
|
|
132
|
+
// TODO: These buckets might not make sense
|
|
133
|
+
this.pingLatencyHistogram = meter.createHistogram('broker.client.ws.ping.latency.seconds', {
|
|
134
|
+
description: 'Websocket heartbeat (ping/pong) round-trip latency in seconds',
|
|
135
|
+
unit: 's',
|
|
136
|
+
advice: {
|
|
137
|
+
explicitBucketBoundaries: [
|
|
138
|
+
0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10,
|
|
139
|
+
],
|
|
140
|
+
},
|
|
141
|
+
});
|
|
59
142
|
}
|
|
143
|
+
// --- Existing ---
|
|
60
144
|
incrementBrokerClientMetric() {
|
|
61
145
|
this.brokerClientInitializedCounter.add(1);
|
|
62
146
|
}
|
|
147
|
+
async forceFlush() {
|
|
148
|
+
await this.meterProvider.forceFlush();
|
|
149
|
+
}
|
|
63
150
|
async shutdown() {
|
|
64
151
|
this.runtimeInstrumentation.disable();
|
|
65
152
|
await this.meterProvider.shutdown();
|
|
66
153
|
}
|
|
154
|
+
// --- Process Health ---
|
|
155
|
+
/**
|
|
156
|
+
* Set the connection state gauge for a given role.
|
|
157
|
+
* Sets the active state attribute to 1 and all other state attributes to 0.
|
|
158
|
+
*/
|
|
159
|
+
setConnectionState(state, role) {
|
|
160
|
+
for (const s of CONNECTION_STATES) {
|
|
161
|
+
this.connectionStateGauge.record(s === state ? 1 : 0, {
|
|
162
|
+
state: s,
|
|
163
|
+
role,
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
recordReconnect() {
|
|
168
|
+
this.reconnectCounter.add(1);
|
|
169
|
+
}
|
|
170
|
+
recordProcessExit(reason) {
|
|
171
|
+
this.processExitCounter.add(1, { reason });
|
|
172
|
+
}
|
|
173
|
+
recordAuthRenewalFailure(statusCode) {
|
|
174
|
+
this.authRenewalFailureCounter.add(1, {
|
|
175
|
+
status_code: String(statusCode),
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
recordUncaughtException(errorCode) {
|
|
179
|
+
this.uncaughtExceptionCounter.add(1, { error_code: errorCode });
|
|
180
|
+
}
|
|
181
|
+
// --- Request Flow ---
|
|
182
|
+
recordRequest(flow, allowed) {
|
|
183
|
+
this.requestCounter.add(1, { flow, allowed: String(allowed) });
|
|
184
|
+
}
|
|
185
|
+
recordDownstreamRequest(streaming) {
|
|
186
|
+
this.downstreamRequestCounter.add(1, { streaming: String(streaming) });
|
|
187
|
+
}
|
|
188
|
+
recordDownstreamDuration(streaming, durationSeconds) {
|
|
189
|
+
this.downstreamDurationHistogram.record(durationSeconds, {
|
|
190
|
+
streaming: String(streaming),
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
recordDownstreamStatus(statusClass) {
|
|
194
|
+
this.downstreamStatusCounter.add(1, { status_class: statusClass });
|
|
195
|
+
}
|
|
196
|
+
recordConnectionDuration(role, durationSeconds) {
|
|
197
|
+
this.connectionDurationHistogram.record(durationSeconds, { role });
|
|
198
|
+
}
|
|
199
|
+
recordUpstreamResponseBytes(bytes) {
|
|
200
|
+
this.upstreamResponseBytesHistogram.record(bytes);
|
|
201
|
+
}
|
|
202
|
+
incrementInflight() {
|
|
203
|
+
this.inflightRequestsCounter.add(1);
|
|
204
|
+
}
|
|
205
|
+
decrementInflight() {
|
|
206
|
+
this.inflightRequestsCounter.add(-1);
|
|
207
|
+
}
|
|
208
|
+
recordPingLatency(durationSeconds) {
|
|
209
|
+
this.pingLatencyHistogram.record(durationSeconds);
|
|
210
|
+
}
|
|
67
211
|
}
|
|
68
212
|
exports.OtelClient = OtelClient;
|
|
69
213
|
//# sourceMappingURL=otelClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otelClient.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/metrics/otelClient.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"otelClient.js","sourceRoot":"","sources":["../../../../../lib/hybrid-sdk/client/metrics/otelClient.ts"],"names":[],"mappings":"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"}
|