Merge latest changes from next (#2675)

gingerbenw · dependabot[bot] · web-flow · commit 567e92e8bc87 · 2026-02-05T17:09:22.000Z
* build(deps): bump actions/checkout from 6.0.1 to 6.0.2 (#2672) Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@8e8c483...de0fac2) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Manually parse urls (#2674) * test: ✅ fix react native test, removing need for polyfill * refactor: ♻️ update query parameter parsing * remove use of url.search * remove URLSearchParams * Find the earliest occurrence of '/', '?', or '#' to determine the domain boundary * docs: add CHANGELOG entry --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
diff --git a/.github/workflows/aws-lambda.yml b/.github/workflows/aws-lambda.yml
@@ -21,7 +21,7 @@ jobs:
 
     - run: sam --version
 
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Install Ruby
       uses: ruby/setup-ruby@8d27f39a5e7ad39aebbcbd1324f7af020229645c # v1.287.0
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -43,7 +43,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/pr-diff.yml b/.github/workflows/pr-diff.yml
@@ -14,7 +14,7 @@ jobs:
           node-version: 18.x
 
       - name: Checkout base branch
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ github.base_ref }}
 
@@ -29,7 +29,7 @@ jobs:
           cat packages/browser/dist/bugsnag.min.js | gzip | wc -c > .diff/size-before-gzipped
 
       - name: Checkout PR branch
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           clean: false
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
@@ -76,5 +76,5 @@ jobs:
     name: "Checksum validation of Gradle Wrappers"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: gradle/actions/wrapper-validation@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
diff --git a/.github/workflows/test-electron.yml b/.github/workflows/test-electron.yml
@@ -14,7 +14,7 @@ jobs:
         os: [ ubuntu-latest ]
 
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       with:
         node-version: ${{ matrix.node-version }}
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -28,7 +28,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       REVIEWER: gingerbenw
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: next
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Changed
 
+(plugin-network-instrumentation) Manually parse URLs to improve React Native compatibility [#2674](https://github.com/bugsnag/bugsnag-js/pull/2674)
 Update bugsnag-android to [v6.22.0](https//github.com/bugsnag/bugsnag-android/releases/tag/v6.22.0) [#2656](https://github.com/bugsnag/bugsnag-js/pull/2656)
 Update bugsnag-cocoa to [v6.35.0](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.35.0) [#2663](https://github.com/bugsnag/bugsnag-js/pull/2663)
 
diff --git a/packages/node/test/notifier.test.ts b/packages/node/test/notifier.test.ts
@@ -4,6 +4,7 @@ describe('node notifier', () => {
   beforeAll(() => {
     jest.spyOn(console, 'debug').mockImplementation(() => {})
     jest.spyOn(console, 'warn').mockImplementation(() => {})
+    jest.spyOn(console, 'log').mockImplementation(() => {})
   })
 
   beforeEach(() => {
diff --git a/packages/plugin-aws-lambda/test/serverless-express.test.js b/packages/plugin-aws-lambda/test/serverless-express.test.js
@@ -14,6 +14,10 @@ let sentEvents
 let sentSessions
 
 describe('serverless express', function () {
+  beforeAll(() => {
+    jest.spyOn(console, 'debug').mockImplementation(() => {})
+  })
+
   beforeEach(function () {
     sentEvents = []
     sentSessions = []
diff --git a/packages/plugin-network-instrumentation/lib/extract-domain.js b/packages/plugin-network-instrumentation/lib/extract-domain.js
@@ -5,8 +5,29 @@
    */
 module.exports = function (url) {
   try {
-    const urlObj = new URL(url)
-    return urlObj.host
+    const isAbsolute = /^https?:\/\//i.test(url)
+    if (!isAbsolute) {
+      return 'unknown'
+    }
+
+    const urlWithoutProtocol = url.replace(/^https?:\/\//i, '')
+
+    // Find the earliest occurrence of '/', '?', or '#' to determine the domain boundary
+    const slashIndex = urlWithoutProtocol.indexOf('/')
+    const queryIndex = urlWithoutProtocol.indexOf('?')
+    const hashIndex = urlWithoutProtocol.indexOf('#')
+    let endIndex = urlWithoutProtocol.length
+    if (slashIndex !== -1 && slashIndex < endIndex) {
+      endIndex = slashIndex
+    }
+    if (queryIndex !== -1 && queryIndex < endIndex) {
+      endIndex = queryIndex
+    }
+    if (hashIndex !== -1 && hashIndex < endIndex) {
+      endIndex = hashIndex
+    }
+
+    return urlWithoutProtocol.substring(0, endIndex)
   } catch (e) {
     return 'unknown'
   }
diff --git a/packages/plugin-network-instrumentation/lib/parse-query-params.js b/packages/plugin-network-instrumentation/lib/parse-query-params.js
@@ -5,12 +5,24 @@
    */
 module.exports = function (url) {
   try {
-    const urlObj = new URL(url)
-    const params = {}
-    urlObj.searchParams.forEach((value, key) => {
-      params[key] = value
+    const queryStart = url.indexOf('?')
+    const hashStart = url.indexOf('#')
+
+    let queryString = ''
+    if (queryStart !== -1) {
+      const queryEnd = hashStart !== -1 && hashStart > queryStart ? hashStart : url.length
+      queryString = url.substring(queryStart + 1, queryEnd)
+    }
+
+    // convert query string to object without using UrlSearchParams
+    const queryStringObject = {}
+    const pairs = queryString.split('&').filter(pair => pair.length > 0)
+    pairs.forEach(pair => {
+      const [key, value] = pair.split('=')
+      queryStringObject[decodeURIComponent(key)] = decodeURIComponent(value || '')
     })
-    return params
+
+    return queryStringObject
   } catch (e) {
     return {}
   }
diff --git a/packages/plugin-network-instrumentation/lib/redact-query-parameters.js b/packages/plugin-network-instrumentation/lib/redact-query-parameters.js
@@ -1,38 +1,23 @@
+const parseQueryParams = require('./parse-query-params')
 const redactValues = require('./redact-values')
 
-function isAbsoluteURL (url) {
-  try {
-    // eslint-disable-next-line no-new
-    new URL(url)
-    return true
-  } catch (e) {
-    return false
-  }
-}
-
 module.exports = function (url, redactedKeys) {
-  const isAbsolute = isAbsoluteURL(url)
-  const base = isAbsolute ? undefined : 'http://localhost'
-
-  // Parse the URL - use a base only for relative URLs
-  const urlObj = new URL(url, base)
-  const params = new URLSearchParams(urlObj.search)
-
-  // Convert URLSearchParams to object without using Object.fromEntries()
-  const paramsObject = {}
-  params.forEach((value, key) => {
-    paramsObject[key] = value
-  })
-
+  const paramsObject = parseQueryParams(url)
   const redactedParams = redactValues(paramsObject, redactedKeys)
-  urlObj.search = new URLSearchParams(redactedParams).toString()
+  const redactedQueryString = Object.entries(redactedParams).map(([key, value]) => `${key}=${value}`).join('&')
 
-  // Return appropriate format based on original URL type
-  if (isAbsolute) {
-    return decodeURI(urlObj.toString())
+  const queryStart = url.indexOf('?')
+  const hashStart = url.indexOf('#')
+  const hash = hashStart !== -1 ? url.substring(hashStart) : ''
+  let result = queryStart !== -1 ? url.substring(0, queryStart) : url
+
+  // Build the result URL manually
+  if (redactedQueryString && redactedQueryString.length > 0) {
+    result += '?' + redactedQueryString
+  }
+  if (hash) {
+    result += hash
   }
 
-  // For relative URLs, return only the path + search + hash components
-  const relativePart = urlObj.pathname + urlObj.search + urlObj.hash
-  return decodeURI(relativePart)
+  return result
 }
diff --git a/test/browser/features/http_errors.feature b/test/browser/features/http_errors.feature
@@ -16,7 +16,7 @@ Feature: HTTP Errors
     And the exception "errorClass" equals "HTTPError"
     And the error payload field "events.0.exceptions.0.message" equals the stored value "expected.exception.message"
     And the event "severity" equals "error"
-    And the event "unhandled" is true
+    And the event "unhandled" is false
     And the event "severityReason.type" equals "httpError"
     And the error payload field "events.0.context" equals the stored value "expected.context"
 
@@ -46,7 +46,7 @@ Feature: HTTP Errors
     And the exception "errorClass" equals "HTTPError"
     And the error payload field "events.0.exceptions.0.message" equals the stored value "expected.exception.message"
     And the event "severity" equals "error"
-    And the event "unhandled" is true
+    And the event "unhandled" is false
     And the event "severityReason.type" equals "httpError"
     And the error payload field "events.0.context" equals the stored value "expected.context"
 
@@ -78,7 +78,7 @@ Feature: HTTP Errors
     And the exception "errorClass" equals "HTTPError"
     And the error payload field "events.0.exceptions.0.message" equals the stored value "expected.exception.message"
     And the event "severity" equals "error"
-    And the event "unhandled" is true
+    And the event "unhandled" is false
     And the event "severityReason.type" equals "httpError"
     And the error payload field "events.0.context" equals the stored value "expected.context"
 
@@ -109,7 +109,7 @@ Feature: HTTP Errors
     And the exception "errorClass" equals "HTTPError"
     And the error payload field "events.0.exceptions.0.message" equals the stored value "expected.exception.message"
     And the event "severity" equals "error"
-    And the event "unhandled" is true
+    And the event "unhandled" is false
     And the event "severityReason.type" equals "httpError"
     And the error payload field "events.0.context" equals the stored value "expected.context"
 
diff --git a/test/react-native/features/fixtures/expected_http_errors/401.json b/test/react-native/features/fixtures/expected_http_errors/401.json
@@ -1,6 +1,6 @@
 [
   {
-    "message": "^401: .*\/reflect\/[?]status=401$",
+    "message": "^401: .*\/reflect[?]status=401$",
     "errorClass": "HTTPError",
     "type": "reactnativejs",
     "stacktrace": "IGNORE"
diff --git a/test/react-native/features/fixtures/expected_http_errors/500.json b/test/react-native/features/fixtures/expected_http_errors/500.json
@@ -1,6 +1,6 @@
 [
   {
-    "message": "^500: .*\/reflect\/[?]status=500$",
+    "message": "^500: .*\/reflect[?]status=500$",
     "errorClass": "HTTPError",
     "type": "reactnativejs",
     "stacktrace": "IGNORE"
diff --git a/test/react-native/features/fixtures/scenario-launcher/scenarios/core/NetworkRequestScenario.js b/test/react-native/features/fixtures/scenario-launcher/scenarios/core/NetworkRequestScenario.js
@@ -18,9 +18,7 @@ export class NetworkRequestScenario extends Scenario {
   }
 
   run () {
-    const url = new URL(this.reflectEndpoint)
-    url.searchParams.append('status', this.statusCode)
-    fetch(url).catch((err) => {
+    fetch(`${this.reflectEndpoint}?status=${this.statusCode}`).catch((err) => {
       Bugsnag.notify(err)
     })
   }
