Merge branch 'master' into remove-duplicated-code

.github/workflows/ci.yml

@@ -2,27 +2,42 @@ name: Rollbar.js CI
 
 on:
   push:
-    branches: [ master ]
-    tags: [ v* ]
+    branches: [master]
+    tags: [v*]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
     runs-on: ubuntu-20.04
+
     strategy:
       matrix:
-        node-version: [10, 12, 14, 16]
+        include:
+          - node: 14
+            npm: ^8
+          - node: 16
+            npm: ^8
+          - node: 18
+            npm: ^9
+          - node: 20
+            npm: ^10
+          - node: latest
+            npm: latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Install node.js
-        uses: actions/setup-node@v2-beta
+      - name: Set up node ${{ matrix.node }}
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node }}
+
+      - name: Update npm
+        run: npm install -g npm@${{ matrix.npm }}
 
       - name: npm install
         run: npm install

dist/rollbar.js

@@ -4688,7 +4688,7 @@ module.exports = {
 
 
 module.exports = {
-  version: '2.26.2',
+  version: '2.26.3',
   endpoint: 'api.rollbar.com/api/1/item/',
   logLevel: 'debug',
   reportLevel: 'debug',
@@ -5140,7 +5140,9 @@ Instrumenter.prototype.instrumentNetwork = function() {
     var xhrp = this._window.XMLHttpRequest.prototype;
     replace(xhrp, 'open', function(orig) {
       return function(method, url) {
-        if (_.isType(url, 'string')) {
+        var isUrlObject = _isUrlObject(url)
+        if (_.isType(url, 'string') || isUrlObject) {
+          url = isUrlObject ? url.toString() : url;
           if (this.__rollbar_xhr) {
             this.__rollbar_xhr.method = method;
             this.__rollbar_xhr.url = url;
@@ -5303,8 +5305,9 @@ Instrumenter.prototype.instrumentNetwork = function() {
         var input = args[0];
         var method = 'GET';
         var url;
-        if (_.isType(input, 'string')) {
-          url = input;
+        var isUrlObject = _isUrlObject(input)
+        if (_.isType(input, 'string') || isUrlObject) {
+          url = isUrlObject ? input.toString() : input;
         } else if (input) {
           url = input.url;
           if (input.method) {
@@ -5731,6 +5734,10 @@ Instrumenter.prototype.removeListeners = function(section) {
   }
 };
 
+function _isUrlObject(input) {
+  return typeof URL !== 'undefined' && input instanceof URL
+}
+
 module.exports = Instrumenter;