Update agent version format

Matt Loring · Matt Loring · commit 3a44bfd19933 · 2016-04-21T17:25:34.000-07:00
diff --git a/lib/debugletapi.js b/lib/debugletapi.js
@@ -84,15 +84,14 @@ DebugletApi.prototype.init = function(uid, logger, callback) {
     });
   }
 
-  if (process.env.GCLOUD_PROJECT) {
-    var project = process.env.GCLOUD_PROJECT;
-
-    setImmediate(function() {
-      complete(null, project);
-    });
-  } else {
-    utils.getProjectNumber(complete);
-  }
+  utils.getProjectNumber(function(err, project) {
+    that.onGCP = !!project;
+    if (process.env.GCLOUD_PROJECT) {
+      complete(null, process.env.GCLOUD_PROJECT);
+    } else {
+      complete(err, project);
+    }
+  });
 };
 
 /**
@@ -126,7 +125,9 @@ DebugletApi.prototype.register_ = function(errorMessage, callback) {
   var cwd = process.cwd();
   var mainScript = path.relative(cwd, process.argv[1]);
 
-  var version = 'google.com/node/' + pjson.version;
+  var version = 'google.com/node-' +
+    (that.onGCP ? 'gcp' : 'standalone') +
+    '/v' + pjson.version;
   var desc = process.title + ' ' + mainScript;
   var labels = {
     'main script': mainScript,
diff --git a/test/test-debugletapi.js b/test/test-debugletapi.js
@@ -19,6 +19,7 @@ var assert = require('assert');
 var nock   = require('nock');
 var request = require('request');
 var proxyquire = require('proxyquire');
+var agentVersion = require('../package.json').version;
 
 // require DebugletAPI while stubbing auth to bypass authentication
 //
@@ -57,7 +58,10 @@ describe('Debuglet API', function() {
   describe('register', function() {
     it('should get a debuggeeId', function(done) {
       var scope = nock(url)
-        .post(api + '/debuggees/register')
+        .post(api + '/debuggees/register', function (body) {
+          return body.debuggee.agentVersion ===
+            ('google.com/node-gcp/v' + agentVersion);
+        })
         .reply(200, {
           debuggee: { id: 'fake-debuggee' },
           activePeriodSec: 600
@@ -71,6 +75,35 @@ describe('Debuglet API', function() {
       });
     });
 
+    it('should have correct version without projectId', function(done) {
+      var oldProjNum = utils.getProjectNumber;
+      utils.getProjectNumber = function(callback) {
+        callback(new Error(), null);
+      };
+      process.GCLOUD_PROJECT = 'project123';
+      var debugletapi = new DebugletApi();
+      debugletapi.init('uid1234', { warn: function() {} }, function(err) {
+        var scope = nock(url)
+          .post(api + '/debuggees/register', function (body) {
+            return body.debuggee.agentVersion ===
+              ('google.com/node-standalone/v' + agentVersion);
+          })
+          .reply(200, {
+            debuggee: { id: 'fake-debuggee' },
+            activePeriodSec: 600
+          });
+        debugletapi.register(function(err, result) {
+          assert(!err, 'not expecting an error');
+          assert.equal(result.debuggee.id, 'fake-debuggee');
+          assert.equal(debugletapi.debuggeeId_, 'fake-debuggee');
+          scope.done();
+          delete process.GCLOUD_PROJECT;
+          utils.getProjectNumber = oldProjNum;
+          done();
+        });
+      });
+    });
+
     it('should return error when debuggee is disabled', function(done) {
       var scope = nock(url)
                     .post(api + '/debuggees/register')
