Skip to content

Commit 616951f

Browse files
committed
Remove stringified proto from trace logging
It wasn't proving to be very useful.
1 parent 5a7b0e0 commit 616951f

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

packages/protocol/src/browser/client.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,14 @@ export class Client {
216216
return callbackId;
217217
};
218218

219-
const protoArgs = args.map((a) => argumentToProto(a, storeCallback));
220219
logger.trace(() => [
221220
"sending",
222221
field("id", id),
223222
field("proxyId", proxyId),
224223
field("method", method),
225-
field("args", protoArgs),
226224
]);
227225

228-
proxyMessage.setArgsList(protoArgs);
226+
proxyMessage.setArgsList(args.map((a) => argumentToProto(a, storeCallback)));
229227

230228
const clientMessage = new ClientMessage();
231229
clientMessage.setMethod(message);
@@ -348,7 +346,6 @@ export class Client {
348346
"received event",
349347
field("proxyId", proxyId),
350348
field("event", event),
351-
field("args", eventMessage.getArgsList()),
352349
]);
353350

354351
const args = eventMessage.getArgsList().map((a) => this.protoToArgument(a));
@@ -374,7 +371,6 @@ export class Client {
374371
"running callback",
375372
field("proxyId", proxyId),
376373
field("callbackId", callbackId),
377-
field("args", callbackMessage.getArgsList()),
378374
]);
379375
const args = callbackMessage.getArgsList().map((a) => this.protoToArgument(a));
380376
this.getProxy(proxyId).callbacks.get(callbackId)!(...args);

packages/protocol/src/node/server.ts

+4-13
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ export class Server {
141141
field("id", id),
142142
field("proxyId", proxyId),
143143
field("method", method),
144-
field("args", proxyMessage.getArgsList()),
145144
]);
146145

147146
let response: any;
@@ -183,12 +182,10 @@ export class Server {
183182
* Send a callback to the client.
184183
*/
185184
private sendCallback(proxyId: number | Module, callbackId: number, args: any[]): void {
186-
const protoArgs = args.map((a) => this.argumentToProto(a));
187185
logger.trace(() => [
188186
"sending callback",
189187
field("proxyId", proxyId),
190188
field("callbackId", callbackId),
191-
field("args", protoArgs),
192189
]);
193190

194191
const message = new Callback();
@@ -203,7 +200,7 @@ export class Server {
203200
message.setNumberedCallback(callbackMessage);
204201
}
205202
callbackMessage.setCallbackId(callbackId);
206-
callbackMessage.setArgsList(protoArgs);
203+
callbackMessage.setArgsList(args.map((a) => this.argumentToProto(a)));
207204

208205
const serverMessage = new ServerMessage();
209206
serverMessage.setCallback(message);
@@ -268,12 +265,10 @@ export class Server {
268265
* Send an event to the client.
269266
*/
270267
private sendEvent(proxyId: number | Module, event: string, ...args: any[]): void {
271-
const stringifiedArgs = args.map((a) => this.argumentToProto(a));
272268
logger.trace(() => [
273269
"sending event",
274270
field("proxyId", proxyId),
275271
field("event", event),
276-
field("args", stringifiedArgs),
277272
]);
278273

279274
const message = new Event();
@@ -288,7 +283,7 @@ export class Server {
288283
message.setNumberedEvent(eventMessage);
289284
}
290285
eventMessage.setEvent(event);
291-
eventMessage.setArgsList(stringifiedArgs);
286+
eventMessage.setArgsList(args.map((a) => this.argumentToProto(a)));
292287

293288
const serverMessage = new ServerMessage();
294289
serverMessage.setEvent(message);
@@ -299,16 +294,14 @@ export class Server {
299294
* Send a response back to the client.
300295
*/
301296
private sendResponse(id: number, response: any): void {
302-
const protoResponse = this.argumentToProto(response);
303297
logger.trace(() => [
304298
"sending resolve",
305299
field("id", id),
306-
field("response", protoResponse),
307300
]);
308301

309302
const successMessage = new Method.Success();
310303
successMessage.setId(id);
311-
successMessage.setResponse(protoResponse);
304+
successMessage.setResponse(this.argumentToProto(response));
312305

313306
const serverMessage = new ServerMessage();
314307
serverMessage.setSuccess(successMessage);
@@ -319,16 +312,14 @@ export class Server {
319312
* Send an exception back to the client.
320313
*/
321314
private sendException(id: number, error: Error): void {
322-
const protoError = argumentToProto(error);
323315
logger.trace(() => [
324316
"sending reject",
325317
field("id", id) ,
326-
field("response", protoError),
327318
]);
328319

329320
const failedMessage = new Method.Fail();
330321
failedMessage.setId(id);
331-
failedMessage.setResponse(protoError);
322+
failedMessage.setResponse(argumentToProto(error));
332323

333324
const serverMessage = new ServerMessage();
334325
serverMessage.setFail(failedMessage);

0 commit comments

Comments
 (0)