Merge branch 'master' into feature/jobs

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.49.4
+July 11, 2024
+
+* Handle traces with invalid errors
+
 ## v2.49.3
 June 20, 2024
 

README.md

@@ -104,6 +104,8 @@ You should use the same method that you used to give the agent the app id and se
 | disableNtp          | OPTIONS_DISABLE_NTP           | false                       | Disable NTP time synchronization used to get the accurate time in case the server or client's clock is wrong                                                                                            |
 | stalledTimeout      | STALLED_TIMEOUT               | 1800000 (30m)               | Timeout used to detect when methods and subscriptions might be stalled (have been running for a long time and might never return). The value is in milliseconds, and can be disabled by setting it to 0 |
 | proxy               | MONTI_OPTIONS_PROXY           | none                        | Allows you to connect to Monti APM using a proxy |
+| disableInstrumentation | MONTI_DISABLE_INSTRUMENTATION | false                     | Disables instrumentation. Useful for disabling without uninstalling the package |
+
 
 ### Traces
 

lib/hijack/instrument.js

@@ -20,6 +20,10 @@ import { wrapRedisOplogObserveDriver } from './redis_oplog';
 
 let instrumented = false;
 Kadira._startInstrumenting = function (callback) {
+  if (Meteor.settings?.monti?.disableInstrumentation || process.env.MONTI_DISABLE_INSTRUMENTATION) {
+    console.log('Monti APM: Instrumentation is disabled.');
+    return;
+  }
   if (instrumented) {
     callback();
     return;

lib/tracer/tracer_store.js

@@ -60,6 +60,11 @@ TracerStore.prototype._handleErrors = function (trace) {
   if (lastEvent && lastEvent[2]) {
     let error = lastEvent[2].error;
 
+    if (!error) {
+      logger('trace does not have valid error', JSON.stringify(trace.events));
+      return;
+    }
+
     // grouping errors occured (reset after processTraces)
     let errorKey = [trace.type, trace.name, error.message].join('::');
     if (!this.errorMap[errorKey]) {