tweak CSM config to be able to enabled by only environment or config (#…

…2480)

* tweak CSM config to be able to enabled by only environment or config

* fix funtional test

* move unit test to better place to live

.changes/next-release/feature-client side monitoring-f83de457.json

@@ -0,0 +1,5 @@
+{
+  "type": "feature",
+  "category": "client side monitoring",
+  "description": "CSM now can be enabled globally only from environment without code change"
+}

lib/service.js

@@ -57,7 +57,7 @@ AWS.Service = inherit({
     //enable attaching listeners to service client
     AWS.SequentialExecutor.call(this);
     AWS.Service.addDefaultMonitoringListeners(this);
-    if (this.config.clientSideMonitoring && this.publisher) {
+    if ((this.config.clientSideMonitoring || AWS.Service._clientSideMonitoring) && this.publisher) {
       var publisher = this.publisher;
       this.addNamedListener('PUBLISH_API_CALL', 'apiCall', function PUBLISH_API_CALL(event) {
         process.nextTick(function() {publisher.eventHandler(event);});
@@ -709,7 +709,12 @@ AWS.util.update(AWS.Service, {
     if (!this.prototype.publisher && AWS.util.clientSideMonitoring) {
       var Publisher = AWS.util.clientSideMonitoring.Publisher;
       var configProvider = AWS.util.clientSideMonitoring.configProvider;
-      this.prototype.publisher = new Publisher(configProvider());
+      var publisherConfig = configProvider();
+      this.prototype.publisher = new Publisher(publisherConfig);
+      if (publisherConfig.enabled) {
+        //if csm is enabled in environment, SDK should send all metrics
+        AWS.Service._clientSideMonitoring = true;
+      }
     }
     AWS.SequentialExecutor.call(svc.prototype);
     AWS.Service.addDefaultMonitoringListeners(svc.prototype);

test/publisher/configuration.spec.js

@@ -1,6 +1,7 @@
 var helpers = require('../helpers');
 var AWS = helpers.AWS;
 var spyOn = helpers.spyOn;
+var MockService = helpers.MockService;
 var monitoringConfig = require('../../lib/publisher/configuration');
 var iniLoader = AWS.util.iniLoader;
 
@@ -151,6 +152,42 @@ if (AWS.util.isNode()) {
         expect(monitoringConfig().enabled).to.equal(false);
         expect(ReadFileCalled).to.equal(0)
       })
-    })
+    });
+
+    it('should enable client-side monitoring globally if corresponding environment is set', function(done) {
+      process.env.AWS_CSM_ENABLED = "true";
+      AWS.Service.prototype.publisher = undefined;
+      AWS.Service.defineService('acm', ['2015-12-08']);
+      expect(AWS.Service.prototype.publisher).not.equal(undefined);
+      var publisherInvoked = false
+      AWS.Service.prototype.publisher = {
+        eventHandler: function(event){
+          if (!publisherInvoked) {
+            publisherInvoked = true;
+            done() //make sure publisher is invoked
+          }
+        }
+      }
+      var client = new MockService({});
+      client.makeRequest('operationName', function(err, data) {});
+    });
+
+    it('should enable client-side monitoring globally if corresponding config is set', function(done) {
+      helpers.spyOn(AWS.util, 'readFileSync').andReturn('[default]\ncsm_enabled=true');
+      AWS.Service.prototype.publisher = undefined;
+      AWS.Service.defineService('acm', ['2015-12-08']);
+      expect(AWS.Service.prototype.publisher).not.equal(undefined);
+      var publisherInvoked = false
+      AWS.Service.prototype.publisher = {
+        eventHandler: function(event){
+          if (!publisherInvoked) {
+            publisherInvoked = true;
+            done() //make sure publisher is invoked
+          }
+        }
+      }
+      var client = new MockService({});
+      client.makeRequest('operationName', function(err, data) {});
+    });
   })  
 }

test/publisher/functional_test/runner.spec.js

@@ -14,7 +14,6 @@ describe('run functional test', () => {
   let defaultConfiguration;
   let processEnvBackup;
   before(() => {
-    AWS.config.clientSideMonitoring = true;
     processEnvBackup = Object.assign({}, process.env);
   });
 
@@ -25,6 +24,7 @@ describe('run functional test', () => {
 
   afterEach(async () => {
     process.env = processEnvBackup;
+    AWS.Service.prototype.publisher = undefined;
   });
 
   for (const scenario of schemes.cases) {
@@ -40,7 +40,6 @@ describe('run functional test', () => {
       process.env = Object.assign({}, process.env, scenarioConfiguration.environmentVariables);
 
       const resolvedCSMConfig = csmConfigProvider();
-      AWS.Service.prototype.publisher = new Publisher(resolvedCSMConfig);
 
       //start a subprocess to echo back the udp datagrams
       let fakeAgent = await agentStart(resolvedCSMConfig.port || 31000);