Skip to content
This repository was archived by the owner on Apr 3, 2024. It is now read-only.

Commit 505cbc9

Browse files
hrasadiDominicKramer
authored andcommitted
feat: add debugger support for Cloud Run. See b/112087600 for context (#671)
(Partially) Fixes b/112087600. [✓] Tests and linter pass [✓] Code coverage does not decrease (if any source code was changed) [✓] Appropriate docs were updated (if necessary)
1 parent c506279 commit 505cbc9

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/agent/debuglet.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,10 @@ export class Debuglet extends EventEmitter {
274274
const envConfig = {
275275
logLevel: process.env.GCLOUD_DEBUG_LOGLEVEL,
276276
serviceContext: {
277-
service: process.env.GAE_SERVICE || process.env.GAE_MODULE_NAME,
278-
version: process.env.GAE_VERSION || process.env.GAE_MODULE_VERSION,
277+
service: process.env.GAE_SERVICE || process.env.GAE_MODULE_NAME ||
278+
process.env.K_SERVICE,
279+
version: process.env.GAE_VERSION || process.env.GAE_MODULE_VERSION ||
280+
process.env.K_REVISION,
279281
minorVersion_:
280282
process.env.GAE_DEPLOYMENT_ID || process.env.GAE_MINOR_VERSION
281283
}

test/test-debuglet.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,20 @@ describe('Debuglet', () => {
435435
debuglet.config.serviceContext.version, 'fake-gae-version');
436436
});
437437

438+
it('should respect K_SERVICE and K_REVISION env. vars.', () => {
439+
process.env.K_SERVICE = 'fake-cloudrun-service';
440+
process.env.K_REVISION = 'fake-cloudrun-version';
441+
const debug = new Debug({}, packageInfo);
442+
const debuglet = new Debuglet(debug, defaultConfig);
443+
assert.ok(debuglet.config);
444+
assert.ok(debuglet.config.serviceContext);
445+
assert.strictEqual(
446+
debuglet.config.serviceContext.service, 'fake-cloudrun-service');
447+
assert.strictEqual(
448+
debuglet.config.serviceContext.version, 'fake-cloudrun-version');
449+
});
450+
451+
438452
it('should respect FUNCTION_NAME env. var.', () => {
439453
process.env.FUNCTION_NAME = 'fake-fn-name';
440454
const debug = new Debug({}, packageInfo);

0 commit comments

Comments
 (0)