Skip to content

Commit 694230f

Browse files
authored
Merge pull request #2599 from murgatroid99/grpc-js_trace_version_pid
grpc-js: Include library version and PID in all trace logs
2 parents 065ac2f + 0f8ebbd commit 694230f

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

doc/environment_variables.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ can be set.
4242
- `subchannel_internals` - Traces HTTP/2 session state. Includes per-call logs.
4343
- `channel_stacktrace` - Traces channel construction events with stack traces.
4444
- `keepalive` - Traces gRPC keepalive pings
45-
- `index` - Traces module loading
4645
- `outlier_detection` - Traces outlier detection events
4746

4847
The following tracers are added by the `@grpc/grpc-js-xds` library:
@@ -62,4 +61,4 @@ can be set.
6261
- DEBUG - log all gRPC messages
6362
- INFO - log INFO and ERROR message
6463
- ERROR - log only errors (default)
65-
- NONE - won't log any
64+
- NONE - won't log any

packages/grpc-js/src/index.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,7 @@ import * as load_balancer_outlier_detection from './load-balancer-outlier-detect
273273
import * as channelz from './channelz';
274274
import { Deadline } from './deadline';
275275

276-
const clientVersion = require('../../package.json').version;
277-
278276
(() => {
279-
logging.trace(
280-
LogVerbosity.DEBUG,
281-
'index',
282-
'Loading @grpc/grpc-js version ' + clientVersion
283-
);
284277
resolver_dns.setup();
285278
resolver_uds.setup();
286279
resolver_ip.setup();

packages/grpc-js/src/logging.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
*/
1717

1818
import { LogVerbosity } from './constants';
19+
import { pid } from 'process';
20+
21+
const clientVersion = require('../../package.json').version;
1922

2023
const DEFAULT_LOGGER: Partial<Console> = {
2124
error: (message?: any, ...optionalParams: any[]) => {
@@ -109,7 +112,7 @@ export function trace(
109112
text: string
110113
): void {
111114
if (isTracerEnabled(tracer)) {
112-
log(severity, new Date().toISOString() + ' | ' + tracer + ' | ' + text);
115+
log(severity, new Date().toISOString() + ' | v' + clientVersion + ' ' + pid + ' | ' + tracer + ' | ' + text);
113116
}
114117
}
115118

0 commit comments

Comments
 (0)