Merge pull request #331 from stalleyj/optionsdev

Optionsdev

Author: tobespc

index.js

@@ -22,13 +22,17 @@ var request = require('./lib/request.js');
 var fs = require('fs');
 var nodereport = require('nodereport');
 var agent = require("./appmetrics")
-// Set the plugin search path
+
 agent.spath(path.join(module_dir, "plugins"))
-// pass in the main file name for use in identifying the app in mqtt connection
-agent.start(main_filename);
+
 
 var hcAPI = require("./appmetrics-api.js");
 var jsonProfilingMode = false;
+var propertyMappings = {'mqttPort':'com.ibm.diagnostics.healthcenter.mqtt.broker.port',
+    'mqttHost':'com.ibm.diagnostics.healthcenter.mqtt.broker.host',
+    'applicationID':'com.ibm.diagnostics.healthcenter.mqtt.application.id',
+    'mqtt':'com.ibm.diagnostics.healthcenter.mqtt',
+    'profiling':'com.ibm.diagnostics.healthcenter.data.profiling'};
 
 /*
  * Load module probes into probes array by searching the probes directory.
@@ -239,7 +243,9 @@ module.exports.emit = function (topic, data) {
 
 // Export monitor() API for consuming data in-process
 module.exports.monitor = function() {
+
     if (typeof(this.api) == 'undefined') {
+      agent.start();
         this.api = hcAPI.getAPI(agent, module.exports);
     }
     return this.api;
@@ -251,6 +257,16 @@ module.exports.configure = function(options) {
     options = options || {};
     this.strongTracerInstrument =
       options.strongTracer ? options.strongTracer.tracer : null;
+    for (var key in options) {
+      if(propertyMappings[key]) {
+        agent.setOptions(propertyMappings[key], options[key]);
+      } else {
+        agent.setOptions(key, options[key]);
+      }
+    }
+
+    // If user has not specified application ID, use main filename
+    main_filename = options.applicationID ? options.applicationID : main_filename;
 };
 
 module.exports.transactionLink = function(linkName, callback) {
@@ -266,11 +282,14 @@ module.exports.getJSONProfilingMode = function() {
     return jsonProfilingMode;
 }
 
+module.exports.start = function () {
+  agent.setOptions(propertyMappings['applicationID'], main_filename);
+  agent.start();
+}
 module.exports.nodereport = function() {
     return nodereport;
 }
 
 module.exports.writeHeapSnapshot = function() {
     return require('heapdump').writeSnapshot.apply(null, arguments);
 }
-

src/appmetrics.cpp

@@ -287,13 +287,18 @@ static bool initLoaderApi() {
     return (loaderApi != NULL);
 }
 
-NAN_METHOD(start) {
-
-	Local<String> value = info[0]->ToString();
-	if (info.Length() > 0) {
-		loaderApi->setProperty("com.ibm.diagnostics.healthcenter.mqtt.application.id", toStdString(value).c_str());
+// set the property to given value (called from index.js)
+NAN_METHOD(setOption) {
+	if (info.Length() > 1) {
+		Local<String> value = info[0]->ToString();
+		Local<String> value1 = info[1]->ToString();
+		loaderApi->setProperty(toStdString(value).c_str(),toStdString(value1).c_str());
+    } else {
+        loaderApi->logMessage(warning, "Incorrect number of parameters passed to setOption");
     }
+}
 
+NAN_METHOD(start) {
 	if (!running) {
 		running = true;
 
@@ -584,20 +589,6 @@ static bool isAppMetricsFile(std::string expected, std::string potentialMatch) {
     return false;
 }
 
-// Check if this appmetrics agent native module is loaded via the node-hc command.
-// This is actually checking if this module has appmetrics/launcher.js as it's grandparent.
-// For reference:
-// A locally loaded module would have ancestry like:
-//   ...
-//   ^-- some_module_that_does_require('appmetrics') (grandparent)
-//       ^--- .../node_modules/appmetrics/index.js (parent)
-//            ^-- .../node_modules/appmetrics/appmetrics.node (this)
-//
-// A globally loaded module would have ancestry like:
-//   .../node_modules/appmetrics/launcher.js (grandparent)
-//   ^--- .../node_modules/appmetrics/index.js (parent)
-//        ^-- .../node_modules/appmetrics/appmetrics.node (this)
-//
 static bool isGlobalAgent(Local<Object> module) {
     Nan::HandleScope scope;
     Local<Value> parent = module->Get(Nan::New<String>("parent").ToLocalChecked());
@@ -653,6 +644,7 @@ void init(Local<Object> exports, Local<Object> module) {
     /*
      * Set exported functions
      */
+    exports->Set(Nan::New<String>("setOption").ToLocalChecked(), Nan::New<FunctionTemplate>(setOption)->GetFunction());
     exports->Set(Nan::New<String>("start").ToLocalChecked(), Nan::New<FunctionTemplate>(start)->GetFunction());
     exports->Set(Nan::New<String>("spath").ToLocalChecked(), Nan::New<FunctionTemplate>(spath)->GetFunction());
     exports->Set(Nan::New<String>("stop").ToLocalChecked(), Nan::New<FunctionTemplate>(stop)->GetFunction());