Use FUNCTION_NAME as service id on GCF (#274)

matthewloring · web-flow · commit a87007a4b6b8 · 2017-06-08T12:20:29.000-07:00
PR-URL: #274
diff --git a/src/agent/debuglet.js b/src/agent/debuglet.js
@@ -158,6 +158,11 @@ Debuglet.normalizeConfig_ = function(config) {
     }
   };
 
+  if (process.env.FUNCTION_NAME) {
+    envConfig.serviceContext.service = process.env.FUNCTION_NAME;
+    envConfig.serviceContext.version = 'unversioned';
+  }
+
   return extend(true, {}, defaultConfig, config, envConfig);
 };
 
diff --git a/test/test-debuglet.js b/test/test-debuglet.js
@@ -246,6 +246,19 @@ describe('Debuglet', function() {
                               'fake-gae-version');
          });
 
+      it('should respect FUNCTION_NAME env. var.',
+         function() {
+           process.env.FUNCTION_NAME = 'fake-fn-name';
+           var debug = require('../src/debug.js')();
+           var debuglet = new Debuglet(debug, defaultConfig);
+           assert.ok(debuglet.config_);
+           assert.ok(debuglet.config_.serviceContext);
+           assert.strictEqual(debuglet.config_.serviceContext.service,
+                              'fake-fn-name');
+           assert.strictEqual(debuglet.config_.serviceContext.version,
+                              'unversioned');
+         });
+
       it('should prefer new flex vars over GAE_MODULE_*', function() {
         process.env.GAE_MODULE_NAME = 'fake-gae-module';
         process.env.GAE_MODULE_VERSION = 'fake-gae-module-version';
