appdynamics 21.8.0 → 22.3.0

package/README.md

@@ -56,4 +56,4 @@ require('appdynamics').profile({
 
 For more information, see [Install the Node.js Agent](https://docs.appdynamics.com/display/PRO21/Install+the+Node.js+Agent) and [Application Monitoring](https://docs.appdynamics.com/display/PRO21/Application+Monitoring).
 
-Copyright (c) AppDynamics, Inc. 2021 CA. All rights reserved.
+Copyright (c) AppDynamics, Inc. 2021 CA. All rights reserved.

package/appdynamics_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "21.8.0.0",
+    "version": "22.3.0.0",
     "sha": "",
     "nodeVersion": "",
-    "buildName": "7916",
+    "buildName": "8455",
     "compatibilityVersion": "4.4.1.0"
 }

package/lib/core/agent.js

@@ -12,14 +12,12 @@ var path = require('path');
 var EventEmitter = require('events').EventEmitter;
 var crypto = require('crypto');
 
-// modules used by both proxy and libagent
 var Context = require('./context').Context;
 var Logger = require('./logger').Logger;
 var Timers = require('./timers').Timers;
 var System = require('./system').System;
 var AppDProxy = require('./appDProxy').AppDProxy;
 var Thread = require('./thread').Thread;
-var AnalyticsReporter = require('../transactions/analytics-reporter').AnalyticsReporter;
 var MetricsManager = require('../metrics/metrics-manager').MetricsManager;
 var ProcessInfo = require('../process/process-info').ProcessInfo;
 var ProcessScanner = require('../process/process-scanner').ProcessScanner;
@@ -27,24 +25,17 @@ var ProcessStats = require('../process/process-stats').ProcessStats;
 var InstanceTracker = require('../process/instance-tracker').InstanceTracker;
 var StringMatcher = require('../proxy/string-matcher').StringMatcher;
 var ExpressionEvaluator = require('../proxy/expression-evaluator').ExpressionEvaluator;
-var ConfigManager = require('../transactions/config-manager').ConfigManager;
-var TransactionRegistry = require('../transactions/transaction-registry').TransactionRegistry;
-var TransactionNaming = require('../transactions/transaction-naming').TransactionNaming;
-var TransactionRules = require('../transactions/transaction-rules').TransactionRules;
-var SepRules = require('../transactions/sep-config').SepRules;
 var Correlation = require('../transactions/correlation').Correlation;
-var DataCollectors = require('../transactions/data-collectors').DataCollectors;
 var Eum = require('../transactions/eum').Eum;
 var Profiler = require('../profiler/profiler').Profiler;
 var CustomTransaction = require('../profiler/custom-transaction').CustomTransaction;
 var GCStats = require('../v8/gc-stats').GCStats;
 var CpuProfiler = require('../v8/cpu-profiler').CpuProfiler;
 var HeapProfiler = require('../v8/heap-profiler').HeapProfiler;
-var BackendConfig = require('../proxy/backend-config').BackendConfig;
 var agentVersion = require('../../appdynamics_version.json');
 var appDNativeLoader = require('appdynamics-native');
 
-// modules only used by libagent
+var LibAgent = require('../libagent/libagent').LibAgent;
 var LibagentConnector = require('../libagent/libagent-connector').LibagentConnector;
 var TransactionSender = require('../libagent/transaction-sender').TransactionSender;
 var ProcessSnapshotSender = require('../libagent/process-snapshot-sender').ProcessSnapshotSender;
@@ -83,7 +74,6 @@ function Agent() {
   this.system = new System(this);
   this.proxy = new AppDProxy(this);
   this.thread = new Thread(this);
-  this.analyticsReporter = new AnalyticsReporter(this);
   this.metricsManager = new MetricsManager(this);
   this.processInfo = new ProcessInfo(this);
   this.processScanner = new ProcessScanner(this);
@@ -91,22 +81,14 @@ function Agent() {
   this.instanceTracker = new InstanceTracker(this);
   this.stringMatcher = new StringMatcher(this);
   this.expressionEvaluator = new ExpressionEvaluator(this);
-  this.configManager = new ConfigManager(this);
-  this.transactionRegistry = new TransactionRegistry(this);
-  this.transactionNaming = new TransactionNaming(this);
-  this.transactionRules = new TransactionRules(this);
-  this.sepRules = new SepRules(this);
   this.correlation = new Correlation(this);
-  this.dataCollectors = new DataCollectors(this);
   this.eum = new Eum(this);
   this.profiler = new Profiler(this);
   this.customTransaction = new CustomTransaction(this);
   this.gcStats = new GCStats(this);
   this.cpuProfiler = new CpuProfiler(this);
   this.heapProfiler = new HeapProfiler(this);
-  this.backendConfig = new BackendConfig(this);
 
-  this.libproxy = null;
   this.libagent = null;
 
   // nsolid support
@@ -193,7 +175,17 @@ Agent.prototype.init = function (opts) {
 
     self.opts.clsDisabled = !!self.opts.clsDisabled;
 
-    self.backendConnector = self.getAgentCustomFns(self.opts.proxy);
+    self.backendConnector = new LibAgent(this);
+
+    if (opts.openTelemetry && opts.openTelemetry.enabled) {
+      var TracerProvider = require('./opentelemetry-tracer');
+      self.TracerProvider = new TracerProvider(self.logger);
+      if (!self.TracerProvider.register(opts)) {
+        self.logger.error('AppDynamics agent cannot be started: Tracer Provider registration has failed');
+        return;
+      }
+      self.tracer = self.TracerProvider.getTracer('appdynamics-tracer');
+    }
 
     self.precompiled = opts.precompiled === undefined || opts.precompiled;
 
@@ -272,13 +264,7 @@ Agent.prototype.init = function (opts) {
     self.backendConnector.init();
     self.stringMatcher.init();
     self.expressionEvaluator.init();
-    self.configManager.init();
-    self.transactionRegistry.init();
-    self.transactionNaming.init();
-    self.transactionRules.init();
-    self.sepRules.init();
     self.correlation.init();
-    self.dataCollectors.init();
     self.eum.init();
 
     // Metrics aggregator should be initialize before
@@ -286,7 +272,6 @@ Agent.prototype.init = function (opts) {
     self.metricsManager.init();
 
     // Initialize the rest.
-    self.analyticsReporter.init();
     self.processInfo.init();
     self.processScanner.init();
     self.processStats.init();
@@ -296,7 +281,6 @@ Agent.prototype.init = function (opts) {
     self.gcStats.init();
     self.cpuProfiler.init();
     self.heapProfiler.init();
-    self.backendConfig.init();
 
     // Initialize libagent
     self.backendConnector.intializeAgentHelpers();
@@ -440,6 +424,7 @@ Agent.prototype.loadProbes = function () {
   probeCons.push(require('../probes/couchbase-probe').CouchBaseProbe);
   probeCons.push(require('../probes/cassandra-probe').CassandraProbe);
   probeCons.push(require('../probes/express-probe').ExpressProbe);
+  probeCons.push(require('../probes/rabbitmq-probe').RabbitMQProbe);
 
   var packageProbes = {};
   probeCons.forEach(function (ProbeCon) {
@@ -524,14 +509,16 @@ Agent.prototype.startTransaction = function (transactionInfo, cb) {
 };
 
 Agent.prototype.parseCorrelationInfo = function (source) {
-  var corrHeader = this.correlation.newCorrelationHeader();
+  var self = this;
   if (typeof (source) === 'object') {
-    source = source.headers && source.headers[this.correlation.HEADER_NAME];
-  }
-  if (!corrHeader.parse(source)) {
-    return false;
+    source = source.headers && source.headers[self.correlation.HEADER_NAME];
   }
-  return corrHeader;
+  return {
+    businessTransactionName: 'NodeJS API Business Transaction',
+    headers: {
+      'singularityheader': source
+    }
+  };
 };
 
 
@@ -606,16 +593,6 @@ Agent.prototype.dumpRuntimeProperties = function () {
   }
 };
 
-Agent.prototype.getAgentCustomFns = function (isProxy) {
-  if (isProxy) {
-    var LibProxy = require('../libproxy/libproxy').LibProxy;
-    return new LibProxy(this);
-  } else {
-    var LibAgent = require('../libagent/libagent').LibAgent;
-    return new LibAgent(this);
-  }
-};
-
 var AppDynamics = function () {
   var self = this;
 

package/lib/core/appDProxy.js

@@ -217,7 +217,7 @@ AppDProxy.prototype.before = function(obj, meths, hook, isCallbackHook, copyAllP
     var beforeExecLogic = function() {
       var currentCtxt = self.agent.thread.current();
       try {
-        var args = arguments;
+        var args = [...arguments];
         var methsInvocationCtxtLocal = methsInvocationCtxt;
         if (methsInvocationCtxtLocal)
           self.agent.thread.resume(methsInvocationCtxtLocal);
@@ -225,19 +225,19 @@ AppDProxy.prototype.before = function(obj, meths, hook, isCallbackHook, copyAllP
           var selfProxy = this;
 
           // the hook code should contain try/catch
-          args = hook(this, arguments, function() {
-            return orig.apply(selfProxy, args || arguments);
-          });
+          args = hook(this, args, function() {
+            return orig.apply(selfProxy, args);
+          }) || args;
         }
         else {
           try {
-            args = hook(this, arguments);
+            args = hook(this, args) || args;
           }
           catch (e) {
             self.logError(e);
           }
 
-          var retValue = orig.apply(this, args || arguments);
+          var retValue = orig.apply(this, args);
           return retValue;
         }
       } finally {
@@ -277,7 +277,7 @@ AppDProxy.prototype.after = function(obj, meths, hook, copyAllProps, methsInvoca
 
         var hookRet;
         try {
-          hookRet = hook(this, arguments, ret);
+          hookRet = hook(this, [...arguments], ret);
         }
         catch (e) {
           self.logError(e);
@@ -350,14 +350,14 @@ AppDProxy.prototype.around = function(obj, meths, hookBefore, hookAfter, copyAll
     defineProperty(obj, meth, function() {
       var currentCtxt = self.agent.thread.current();
       try {
-        var args = arguments;
+        var args = [...arguments];
         var methsInvocationCtxtLocal = methsInvocationCtxt;
         if (methsInvocationCtxtLocal)
           self.agent.thread.resume(methsInvocationCtxtLocal);
         var locals = new Locals();
 
         try {
-          args = hookBefore(this, arguments, locals);
+          args = hookBefore(this, args, locals) || args;
         }
         catch (e) {
           self.logError(e);
@@ -372,8 +372,8 @@ AppDProxy.prototype.around = function(obj, meths, hookBefore, hookAfter, copyAll
           }
         }
 
-        var ret = orig.apply(this, args || arguments);
-        var promiseRet = self.promise(ret, hookAfter, this, arguments, locals, methsInvocationCtxtLocal);
+        var ret = orig.apply(this, args);
+        var promiseRet = self.promise(ret, hookAfter, this, args, locals, methsInvocationCtxtLocal);
         if (promiseRet) {
           self.agent.thread.resume(currentCtxt);
           return promiseRet;
@@ -381,7 +381,7 @@ AppDProxy.prototype.around = function(obj, meths, hookBefore, hookAfter, copyAll
 
         var hookRet;
         try {
-          hookRet = hookAfter(this, arguments, ret, locals);
+          hookRet = hookAfter(this, args, ret, locals);
         }
         catch (e) {
           self.logError(e);

package/lib/core/logger.js

@@ -5,9 +5,6 @@ All Rights Reserved
  */
 'use strict';
 
-var cluster = require('cluster');
-var log4js = require('log4js');
-var path = require('path');
 
 
 function isDebugEnabled(agent) {
@@ -50,94 +47,45 @@ function Logger(agent) {
   };
 }
 exports.Logger = Logger;
-Logger.sharedLogger = undefined; // (for unit tests)
-
 
 /* istanbul ignore next -- log4j mocked in unit tests */
-Logger.prototype.init = function (config, initializeBackend) {
+Logger.prototype.init = function (config) {
   if (!config) {
     config = {};
   }
 
-  if (initializeBackend && Logger.sharedLogger) {
-    // work-around for unit tests to prevent too many loggers
-    // being created, which kills output to stdout :-/
-    this.logger = Logger.sharedLogger;
-  } else {
-    var dateString = new Date().toJSON();
-    dateString = dateString.replace(/[-:]/g, "_").replace("T", "__").replace(/\..*$/, "");
-    var logFileName = 'appd_node_agent_' + dateString + ".log";
-    var rootPath = config.root_directory || this.agent.tmpDir;
-    var baseName = config.filename || logFileName;
-    // Libagent logFile is already created in the libagent. Since, there is no
-    // way to tap on to the file name created by boost::log used by libagent
-    // show the log filePath till agent tmpDir.
-    var fileName = initializeBackend ? path.join(rootPath, baseName) : this.agent.tmpDir;
-
-
-    var consoleOnly = (this.agent.opts.logging && this.agent.opts.logging.logfiles &&
-      this.agent.opts.logging.logfiles.every(function (lf) {
-        return lf.outputType == 'console';
-      }));
-
-    // If console logging env variable is set and no custom logging config is provided
-    // then don't create temp path for logs
-    if (process.env.APPDYNAMICS_LOGGER_OUTPUT_TYPE === "console" && (!config.logfiles || config.logfiles.length == 0)) {
-      consoleOnly = true;
-    }
+  var rootPath = config.root_directory || this.agent.tmpDir;
+  // Libagent logFile is already created in the libagent. Since, there is no
+  // way to tap on to the file name created by boost::log used by libagent
+  // show the log filePath till agent tmpDir.
+  var fileName = this.agent.tmpDir;
 
-    if (!consoleOnly) {
-      this.agent.recursiveMkDir(rootPath);
-    }
 
-    if (this.agent.opts.debug) {
-      // force logging level to DEBUG and output location of logs
-      config.level = 'DEBUG';
-      if (!consoleOnly) {
-        console.log('[DEBUG] Appdynamics agent logs: ' + fileName);
-      }
-    }
+  var consoleOnly = (this.agent.opts.logging && this.agent.opts.logging.logfiles &&
+    this.agent.opts.logging.logfiles.every(function (lf) {
+      return lf.outputType == 'console';
+    }));
 
-    // libagent uses its own logging, and does not need the log4js backend to be initialized
-    if (!initializeBackend) {
-      this.libAgentConnector.initLogger();
-      return;
-    }
+  // If console logging env variable is set and no custom logging config is provided
+  // then don't create temp path for logs
+  if (process.env.APPDYNAMICS_LOGGER_OUTPUT_TYPE === "console" && (!config.logfiles || config.logfiles.length == 0)) {
+    consoleOnly = true;
+  }
 
-    if (process.env.APPDYNAMICS_LOGGER_OUTPUT_TYPE === "console") {
-      // Update the outputType in logging config to console for JavaProxy
-      config.outputType = config.outputType || "console";
-    }
+  if (!consoleOnly) {
+    this.agent.recursiveMkDir(rootPath);
+  }
 
-    if (cluster.isMaster) {
-      log4js.configure({
-        appenders: [{
-          type: 'clustered',
-          appenders: [{
-            type: 'logLevelFilter',
-            level: config.level || process.env.APPDYNAMICS_LOGGER_LEVEL || 'INFO',
-            appender: {
-              type: config.outputType || 'file',
-              filename: fileName,
-              maxLogSize: config.max_size || 5242880,
-              backups: config.max_files || 10,
-              category: 'default',
-              mode: config.mode || 'append'
-            }
-          }]
-        }]
-      });
-    }
-    else {
-      log4js.configure({
-        appenders: [{
-          type: 'clustered'
-        }]
-      });
+  if (this.agent.opts.debug) {
+    // force logging level to DEBUG and output location of logs
+    config.level = 'DEBUG';
+    if (!consoleOnly) {
+      console.log('[DEBUG] Appdynamics agent logs: ' + fileName);
     }
-
-    Logger.sharedLogger = this.logger = log4js.getLogger('default');
   }
+
+  // libagent uses its own logging, and does not need the log4js backend to be initialized
+  this.libAgentConnector.initLogger();
 };
 
 Logger.prototype.trace = function (msg) {
@@ -222,4 +170,4 @@ Logger.prototype.isErrorEnabled = function () {
 
 Logger.prototype.isFatalEnabled = function () {
   return this.logger.isFatalEnabled();
-};
+};

package/lib/core/opentelemetry-tracer.js

@@ -0,0 +1,89 @@
+'use strict';
+
+const opentelemetry_api = require('@opentelemetry/api');
+const { ROOT_CONTEXT } = require('@opentelemetry/api');
+const { BatchSpanProcessor, ConsoleSpanExporter, BasicTracerProvider } = require('@opentelemetry/sdk-trace-base');
+const { OTLPTraceExporter } = require("@opentelemetry/exporter-trace-otlp-proto");
+const { AsyncHooksContextManager, AsyncLocalStorageContextManager } = require("@opentelemetry/context-async-hooks");
+const { ParentBasedSampler, AlwaysOnSampler } = require("@opentelemetry/core");
+const { Resource } = require('@opentelemetry/resources');
+const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+const url = require('url');
+
+module.exports = TracerProvider;
+
+function TracerProvider(logger) {
+  this.host = 'localhost';
+  this.port = '55681';
+  this.ot_api = opentelemetry_api;
+  this.ROOT_CONTEXT = ROOT_CONTEXT;
+  this.logger = logger;
+}
+
+TracerProvider.prototype.register = function(config) {
+  const provider = new BasicTracerProvider({
+    sampler: new ParentBasedSampler({
+      root: new AlwaysOnSampler()
+    }),
+    resource: new Resource({
+      [SemanticResourceAttributes.SERVICE_NAME]: config.tierName,
+      "service.name": config.tierName,
+      "service.namespace": config.applicationName
+    }),
+  });
+
+  // default collector configuration, can be overridden from agent config
+  const collectorOptions = {
+    attributes: {'service.name': config.tierName,
+                 'service.namespace': config.applicationName}
+  };
+
+  // batch export config, empty by default
+  const batchExporterConfig = {};
+
+  if (config.openTelemetry) {
+    if (config.openTelemetry.collector) {
+      Object.assign(collectorOptions, config.openTelemetry.collector);
+      this.url = collectorOptions.url;
+      try {
+        var urlObj = url.parse(this.url);
+        this.host = urlObj.hostname;
+        this.port = urlObj.port;
+      } catch (e) {
+        this.logger.error('Collector url must be in <host>:<port> format');
+        return false;
+      }
+    }
+    if(config.openTelemetry.exporter) {
+      if(config.openTelemetry.exporter.maxExportBatchSize) {
+        batchExporterConfig.maxExportBatchSize = config.openTelemetry.exporter.maxExportBatchSize;
+      }
+      if(config.openTelemetry.exporter.maxQueueSize) {
+        batchExporterConfig.maxQueueSize = config.openTelemetry.exporter.maxQueueSize;
+      }
+      if(config.openTelemetry.exporter.exportTimeoutMillis) {
+        batchExporterConfig.exportTimeoutMillis = config.openTelemetry.exporter.exportTimeoutMillis;
+      }
+      if(config.openTelemetry.exporter.maxExportBatchSize) {
+        batchExporterConfig.maxExportBatchSize = config.openTelemetry.exporter.maxExportBatchSize;
+      }
+    }
+  }
+
+  const exporter = new OTLPTraceExporter(collectorOptions);
+  provider.addSpanProcessor(new BatchSpanProcessor(exporter, batchExporterConfig));
+  if (config.openTelemetry && config.openTelemetry.debug) {
+    provider.addSpanProcessor(new BatchSpanProcessor(new ConsoleSpanExporter(), batchExporterConfig));
+  }
+
+  const majorVersion = parseInt(process.versions.node.split('.')[0]);
+  const minorVersion = parseInt(process.versions.node.split('.')[1]);
+  const contextManager = majorVersion > 14 || majorVersion == 14 && minorVersion >= 8 ?
+    AsyncLocalStorageContextManager : AsyncHooksContextManager;
+  provider.register({contextManager: new contextManager()});
+  return true;
+};
+
+TracerProvider.prototype.getTracer = function(name) {
+  return opentelemetry_api.trace.getTracer(name);
+};

package/lib/libagent/libagent-connector.js

@@ -48,8 +48,6 @@ function toHoleHandling(str) {
   return str;
 }
 
-
-
 function toAggregator(str) {
   if (str === 'AVG') {
     return Constants.AGGREGATOR_AVERAGE;
@@ -102,8 +100,6 @@ LibagentConnector.prototype.initLogger = function () {
 LibagentConnector.prototype.init = function () {
   var self = this;
 
-  // override libagent-specific definitions in core agent
-  self.overrideFunctionDefinitions(self.agent);
   // initialize protobuf
   self.protobufModel = new ProtobufModel(self.agent);
   self.protobufModel.init();
@@ -350,6 +346,11 @@ LibagentConnector.prototype.startProcessSnapshot = function () {
   self.libagent.startProcessSnapshot();
 };
 
+LibagentConnector.prototype.getBusinessTransactionQueryType = function (entryPointType, callback) {
+  var self = this;
+  return self.libagent.getBusinessTransactionQueryType(entryPointType, callback);
+};
+
 LibagentConnector.prototype.sendProcessSnapshot = function (processSnapshot) {
   var self = this;
   self.libagent.addProcessSnapshot(processSnapshot);
@@ -540,49 +541,6 @@ LibagentConnector.prototype.getEumCookieFields = function (transaction, shortFor
     return {};
 };
 
-LibagentConnector.prototype.overrideFunctionDefinitions = function (agent) {
-  agent.parseCorrelationInfo = function (source) {
-    var self = agent;
-    if (typeof (source) === 'object') {
-      source = source.headers && source.headers[self.correlation.HEADER_NAME];
-    }
-    return {
-      businessTransactionName: 'NodeJS API Business Transaction',
-      headers: {
-        'singularityheader': source
-      }
-    };
-  };
-
-  agent.profiler.addExitCall = function (time, exitCall, error) {
-    var self = agent.profiler;
-    exitCall.error = error;
-    var transaction = self.transactions[exitCall.threadId];
-
-    if (transaction && transaction.api && transaction.api.exitCallCompleted) {
-      exitCall = transaction.api.exitCallCompleted(exitCall) || exitCall;
-    }
-
-    agent.backendConnector.stopExitCall(exitCall, error);
-    self.tryEndingTransactionAfterExitCall(transaction, exitCall, time);
-  };
-
-  agent.eum.init = function () {
-    var self = agent.eum;
-    self.registerEumCookieType();
-  };
-
-  agent.eum.enabledForTransaction = function (transaction) {
-    return !transaction.skip && transaction.eumEnabled;
-  };
-
-  /* always pass url property for libagent */
-  agent.backendConfig.isParsedUrlRequired = function () {
-    return true;
-  };
-
-};
-
 LibagentConnector.prototype.setupEum = function (agent) {
   var libAgentConnector = this;
   agent.eum.eumCookie.prototype.setFieldValues = function () {

package/lib/libagent/libagent.js

@@ -5,7 +5,6 @@ All Rights Reserved
  */
 
 'use strict';
-var Metric = require('./metrics/metric').Metric;
 var LibagentTransactionReporter = require('./transactions/transaction-reporter').TransactionReporter;
 var cluster = require('cluster');
 var fs = require('fs');
@@ -21,7 +20,6 @@ function LibAgent(agent) {
   this.nodeIndexComputed = false;
   // For unit-testing
   this.libagent = true;
-  agent.Metric = Metric;
 }
 
 exports.LibAgent = LibAgent;
@@ -145,7 +143,7 @@ LibAgent.prototype.readNodeIndex = function(callback) {
 LibAgent.prototype.initializeLogger = function() {
   var self = this;
   self.agent.logger.setLibAgentConnector(self.agent.libagentConnector);
-  self.agent.logger.init(self.agent.opts.logging, false);
+  self.agent.logger.init(self.agent.opts.logging);
 };
 
 LibAgent.prototype.createCLRDirectories = function() {
@@ -184,6 +182,7 @@ LibAgent.prototype.createExitCall = function(time, exitCallInfo) {
     command: exitCallInfo.command || '',
     properties: exitCallInfo.supportedProperties,
     useBackendConfig: exitCallInfo.useBackendConfig,
+    protocol: exitCallInfo.protocol,
     addAnalyticsData: function(key, value) {
       this.userData = this.userData || [];
       if (value instanceof Date) {

package/lib/libagent/transaction-sender.js

@@ -3,7 +3,7 @@
 * 2016
 * All Rights Reserved
 */
-var url = require('url');
+var utility = require('../utility');
 
 function TransactionSender(agent) {
   this.agent = agent;
@@ -18,10 +18,8 @@ TransactionSender.prototype.init = function() {
   var libagentConnector = self.agent.libagentConnector;
 
 
-  libagentConnector.on("btNamingProperties", function(btNamingProperties) {
+  libagentConnector.on("btNamingProperties", function() {
     self.isEnabled = true;
-
-    self.agent.transactionNaming.namingProps = btNamingProperties;
   });
 
 
@@ -48,6 +46,18 @@ TransactionSender.prototype.init = function() {
         isHttpRequest = true;
         if('singularityheader' in req.headers) {
           corrHeader = req.headers.singularityheader || "";
+        } else if(self.agent.tracer && transaction.baggageCorrHeader) {
+          /* 
+           * 1: We append the doNotResolveSubHeader when the upstream is a pure OT service to 
+           *    prevent resolution to the preceding APPD service
+             2: The noTxDetectHeader is treated specially by libagent, so do not append the doNotResolveSubHeader
+                in this case
+           */
+          const noTxDetectHeader = self.agent.correlation.DISABLE_TRANSACTION_DETECTION + '=true';
+          const doNotResolveSubHeader = self.agent.correlation.DONOTRESOLVE + '=true';
+          corrHeader = transaction.baggageCorrHeader != noTxDetectHeader ? transaction.baggageCorrHeader + '*' + 
+                                                        doNotResolveSubHeader : transaction.baggageCorrHeader;
+          self.agent.logger.debug(`Using Singularity Header from Opentelemetry Baggage ${corrHeader}`);
         }
       }
       if (req.businessTransactionName) {
@@ -55,7 +65,7 @@ TransactionSender.prototype.init = function() {
       }
     }
 
-    var txData = libagentConnector.startBusinessTransaction('NODEJS_WEB', name, corrHeader, self.createBtNamingWrapper(req), isHttpRequest);
+    var txData = libagentConnector.startBusinessTransaction('NODEJS_WEB', name, corrHeader, utility.createBtNamingWrapper(req), isHttpRequest);
 
     if (txData === undefined || txData.isExcluded) {
       transaction.skip = true;
@@ -110,14 +120,3 @@ TransactionSender.prototype.init = function() {
     libagentConnector.stopExitCall(exitCall, error);
   });
 };
-
-
-TransactionSender.prototype.createBtNamingWrapper = function(req) {
-  // TODO: replace these with boost::regex in libagent bindings
-  if (req.url) {
-    var parsedUrl = url.parse(req.url);
-    req.parsedPathName = parsedUrl.pathname;
-    req.parsedParameterString = parsedUrl.query;
-  }
-  return req;
-};

package/lib/libagent/transactions/transaction-reporter.js

@@ -15,9 +15,4 @@ exports.TransactionReporter = TransactionReporter;
 TransactionReporter.prototype.init = function() {
   var self = this;
   self.enabled = true;
-
-  // self.agent.on('configUpdated', function() {});
-  // self.agent.on('transactionStarted', function(transaction, req) {});
-  // self.agent.on('transactionStopped', function(transaction, req) {});
-
 };