Support Meteor 3

.eslintrc.yml

@@ -1,5 +1,5 @@
 ---
-parser: '@babel/eslint-parser'
+parser: '@typescript-eslint/parser'
 extends:
   - es/2015/server
 plugins:
@@ -24,6 +24,23 @@ parserOptions:
   requireConfigFile: false
   sourceType: 'module'
   ecmaVersion: 2017
+overrides:
+  - files: ['**/tests/**/*.{js,cjs,mjs}']
+    rules:
+      no-console: 0
+  - files: ['*.ts', '*.tsx']
+    extends: ['plugin:@typescript-eslint/recommended']
+    rules:
+      '@typescript-eslint/no-non-null-assertion': 0
+      '@typescript-eslint/no-explicit-any': 0
+      '@typescript-eslint/no-empty-interface': 0
+      '@typescript-eslint/explicit-module-boundary-types': 0
+      '@typescript-eslint/no-unused-vars': 0
+      '@typescript-eslint/no-this-alias': 0
+      '@typescript-eslint/ban-ts-comment': 0
+      '@typescript-eslint/no-namespace': 0
+      '@typescript-eslint/no-empty-function': 0
+      '@typescript-eslint/no-extra-semi': 0
 rules:
   arrow-parens: 0
   prefer-arrow-callback: 0
@@ -277,7 +294,3 @@ rules:
   prefer-rest-params: 0
   symbol-description: 1
   callback-return: 0
-overrides:
-  - files: ['**/tests/**/*.{js,cjs,mjs}']
-    rules:
-      no-console: 0

.github/workflows/lint.yml

@@ -8,9 +8,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 22
       - run: npm install
       - run: npm run lint

.github/workflows/test-redis-oplog.yml

@@ -12,35 +12,27 @@ jobs:
       fail-fast: false
       matrix:
         meteorRelease:
-          - '--release 1.11'
-          - '--release 1.12.1'
-          - '--release 2.1.1'
-          - '--release 2.2'
-          - '--release 2.3.2'
-          - '--release 2.4.1'
-          - '--release 2.5.6'
-          - '--release 2.6.1'
-          - '--release 2.7.3'
-          - '--release 2.8.2'
-          - '--release 2.9.0'
-          # Left empty to use latest version
-          -
+          - '--release 3.0.3'
     env:
       REDIS_OPLOG_SETTINGS: '{"debug":true}'
     steps:
       - uses: supercharge/[email protected]
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '12.x'
+          cache: 'npm'
+          node-version: 18
       - name: Install Dependencies
         run: |
           curl https://install.meteor.com | /bin/sh
           npm i -g @zodern/mtest
+          npm ci
 
       - name: Run Tests
         run: |
-          # Fix using old versions of Meteor
-          export NODE_TLS_REJECT_UNAUTHORIZED=0
+          echo "Env: $NODE_ENV"
+          export FORCE_COLOR=true
+          export NODE_ENV=test
 
           mtest --package ./ --once ${{ matrix.meteorRelease }}

.github/workflows/test.yml

@@ -12,44 +12,30 @@ jobs:
       fail-fast: false
       matrix:
         meteorRelease:
-          - '--release 1.4.4.6'
-          - '--release 1.5.4.1'
-          - '--release 1.6.0.1'
-          - '--release 1.7.0.5'
-          - '--release 1.8.1'
-          - '--release 1.8.3'
-          - '--release 1.9.1'
-          - '--release 1.10.2'
-          - '--release 1.11'
-          - '--release 1.12.1'
-          - '--release 2.1.1'
-          - '--release 2.2'
-          - '--release 2.3.2'
-          - '--release 2.4.1'
-          - '--release 2.5.6'
-          - '--release 2.6.1'
-          - '--release 2.7.3'
-          - '--release 2.8.2'
-          - '--release 2.9.0'
-          # Left empty to use latest version
+          - '--release 3.0'
+          - '--release 3.0.3'
+          - '--release 3.1-beta.0'
+          # latest release
           -
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
-          node-version: '12.x'
+          cache: 'npm'
+          node-version: 18
 
       - name: Install Dependencies
         run: |
           curl https://install.meteor.com | /bin/sh
           npm i -g @zodern/mtest
+          npm ci
 
       - name: Run Tests
         run: |
-          # Fix using old versions of Meteor
-          export NODE_TLS_REJECT_UNAUTHORIZED=0
-
+          echo "Env: $NODE_ENV"
+          export FORCE_COLOR=true
+          export NODE_ENV=test
           mtest --package ./ --once ${{ matrix.meteorRelease }}

.gitignore

@@ -5,5 +5,6 @@ smart.lock
 versions.json
 .idea
 .eslintcache
+packages/
 .envrc
 /packages/*

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Next
+
+* Support Meteor 3
+* Add `Monti.event`
+* Tracer supports parallel events
+* Improve support for proxies
+
 ## v2.49.4
 July 11, 2024
 

README.md

@@ -90,21 +90,20 @@ You should use the same method that you used to give the agent the app id and se
 
 #### List of Options
 
-| Name                | Environment Variable          | Default                     | Description                                                                                                                                                                                             |
-|---------------------|-------------------------------|-----------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| appId               | APP_ID                        | none                        |                                                                                                                                                                                                         |
-| appSecret           | APP_SECRET                    | none                        |                                                                                                                                                                                                         |
-| enableErrorTracking | OPTIONS_ENABLE_ERROR_TRACKING | true                        | Enable sending errors to Monti APM                                                                                                                                                                      |
-| disableClientErrorTracking | OPTIONS_DISABLE_CLIENT_ERROR_TRACKING | false        | Disable sending client errors to Monti APM                                                                                                                                                              |
-| endpoint            | OPTIONS_ENDPOINT              | https://engine.montiapm.com | Monti / Kadira engine url                                                                                                                                                                               |
-| hostname            | OPTIONS_HOSTNAME              | Server's hostname           | What the instance is named in Monti APM                                                                                                                                                                 |
-| uploadSourceMaps    | UPLOAD_SOURCE_MAPS            | true                        | Enables sending source maps to Monti APM to improve error stack traces                                                                                                                                  |
-| recordIPAddress     | RECORD_IP_ADDRESS             | 'full'                      | Set to 'full' to record IP Address, 'anonymized' to anonymize last octet of address, or 'none' to not record an IP Address for client errors                                                            |
-| eventStackTrace     | EVENT_STACK_TRACE             | false                       | If true, records a stack trace when an event starts. Slightly decreases server performance.                                                                                                             |
-| 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 |
-
+| Name                       | Environment Variable                  | Default                     | Description                                                                                                                                                                                             |
+|----------------------------|---------------------------------------|-----------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| appId                      | APP_ID                                | none                        |                                                                                                                                                                                                         |
+| appSecret                  | APP_SECRET                            | none                        |                                                                                                                                                                                                         |
+| enableErrorTracking        | OPTIONS_ENABLE_ERROR_TRACKING         | true                        | Enable sending errors to Monti APM                                                                                                                                                                      |
+| disableClientErrorTracking | OPTIONS_DISABLE_CLIENT_ERROR_TRACKING | false                       | Disable sending client errors to Monti APM                                                                                                                                                              |
+| endpoint                   | OPTIONS_ENDPOINT                      | https://engine.montiapm.com | Monti / Kadira engine url                                                                                                                                                                               |
+| hostname                   | OPTIONS_HOSTNAME                      | Server's hostname           | What the instance is named in Monti APM                                                                                                                                                                 |
+| uploadSourceMaps           | UPLOAD_SOURCE_MAPS                    | true                        | Enables sending source maps to Monti APM to improve error stack traces                                                                                                                                  |
+| recordIPAddress            | RECORD_IP_ADDRESS                     | 'full'                      | Set to 'full' to record IP Address, 'anonymized' to anonymize last octet of address, or 'none' to not record an IP Address for client errors                                                            |
+| eventStackTrace            | EVENT_STACK_TRACE                     | false                       | If true, records a stack trace when an event starts. Slightly decreases server performance.                                                                                                             |
+| 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                                                                                                                                                        |
 ### Traces
 
 The agent collects traces of methods and publish functions. Every minute, it sends the outlier traces to Monti APM for you to view.
@@ -127,13 +126,26 @@ The agent records up to one level of nested events.
 You can add custom events to the traces to time specific code or events, or to provide more details to the trace.
 
 ```js
+Monti.event('event name', {
+  // This object can have any details you want to store
+  // The object is optional
+  userId: userId
+}, async () => {
+  // do the work inside the event
+  // the event will automatically end when this function returns
+});
+
+// Older api. Not recommended since it doesn't nest child events in Meteor 3
 const event = Monti.startEvent('event name', {
-  details: true
+  // This object can have any details you want
+  organization: organizationId
 });
 
 // After code runs or event happens
 Monti.endEvent(event, {
-  additionalDetails: true
+  // This object can have any details you want
+  // It is merged with the object created when starting the event
+  organizationMembers: 10
 });
 ```
 

lib/.meteor-package-versions

@@ -1,2 +1,2 @@
-// the zodern:meteor-package-versions compiler replaces this file with 
-// the list of packages and their versions
+// the zodern:meteor-package-versions compiler replaces this file with
+// the list of packages and their versions