Merge branch 'elastic:main' into review/captureStackTrace

elastic · Jan 13, 2025 · 514b710 · 514b710
2 parents ac5d62f + 65ebcab
commit 514b710
Show file tree

Hide file tree

Showing 27 changed files with 130 additions and 38 deletions.
diff --git a/.ci/scripts/benchmarks.sh b/.ci/scripts/benchmarks.sh
@@ -8,13 +8,13 @@ NODEJS_VERSION=14
 
 USER_ID="${USER_ID}" \
 NODEJS_VERSION="${NODEJS_VERSION}" \
-docker compose -f ./dev-utils/docker-compose.yml down \
+docker-compose -f ./dev-utils/docker-compose.yml down \
   --remove-orphans \
   --volumes || true
 
 USER_ID="${USER_ID}" \
 NODEJS_VERSION="${NODEJS_VERSION}" \
-docker compose -f ./dev-utils/docker-compose.yml up \
+docker-compose -f ./dev-utils/docker-compose.yml up \
   --build \
   --abort-on-container-exit \
   --exit-code-from node-benchmark \

diff --git a/.ci/scripts/load-testing.sh b/.ci/scripts/load-testing.sh
@@ -10,14 +10,14 @@ NODEJS_VERSION=14
 USER_ID="${USER_ID}" \
 NODEJS_VERSION="${NODEJS_VERSION}" \
 STACK_VERSION=${STACK_VERSION} \
-docker compose -f ./dev-utils/docker-compose.yml down \
+docker-compose -f ./dev-utils/docker-compose.yml down \
   --remove-orphans \
   --volumes || true
 
 USER_ID="${USER_ID}" \
 NODEJS_VERSION="${NODEJS_VERSION}" \
 STACK_VERSION=${STACK_VERSION} \
-docker compose -f ./dev-utils/docker-compose.yml up \
+docker-compose -f ./dev-utils/docker-compose.yml up \
   --build \
   --exit-code-from load-testing \
   load-testing
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
       matrix:
         stack-version:
           - '8.0.0-SNAPSHOT'
-          - '8.15.5'
+          - '8.16.2'
         scope:
           - '@elastic/apm-rum'
           - '@elastic/apm-rum-core'
@@ -125,4 +125,4 @@ jobs:
         uses: ./.github/workflows/run-test
         with:
           goal: 'coverage'
-          stack-version: '8.15.5'
+          stack-version: '8.16.2'
diff --git a/.github/workflows/microbenchmark.yml b/.github/workflows/microbenchmark.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       stack_version:
         description: 'Stack Version'
-        default: '8.15.5'
+        default: '8.16.2'
         required: false
   push:
     branches:
@@ -26,7 +26,7 @@ jobs:
       - name: Run buildkite pipeline
         uses: elastic/oblt-actions/buildkite/run@v1
         env:
-          STACK_VERSION: ${{ inputs.stack_version || '8.15.5' }}
+          STACK_VERSION: ${{ inputs.stack_version || '8.16.2' }}
         with:
           token: ${{ secrets.BUILDKITE_TOKEN }}
           pipeline: apm-agent-microbenchmark

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -44,6 +44,14 @@ jobs:
         with:
           github-token: ${{ steps.get_token.outputs.token }}
 
+      # Temporary fix for "ValueError: invalid mode: 'rU' while trying to load binding.gyp"
+      # See https://github.com/nodejs/node-gyp/issues/2219
+      # This can be removed when "node-gyp" is updated
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -79,6 +79,7 @@ jobs:
       - name: Publish the release
         env:
           DRY_RUN: "${{ inputs.dry-run }}"
+          GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
         run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
           npm run ci:release

diff --git a/lerna.json b/lerna.json
@@ -6,7 +6,7 @@
   "registry": "https://registry.npmjs.org",
   "command": {
     "version": {
-      "allowBranch": ["main", "4.x", "release", "release/*"],
+      "allowBranch": ["main", "4.x", "release", "prerelease/*"],
       "conventionalCommits": true,
       "message": "chore(release): publish",
       "changelogPreset": "conventionalcommits",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/rum-angular/CHANGELOG.md b/packages/rum-angular/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [3.0.6](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @elastic/apm-rum-angular
+
+
+
+
+
+### [3.0.5](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-09)
+
+**Note:** Version bump only for package @elastic/apm-rum-angular
+
+
+
+
+
 ### [3.0.4](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2024-06-27)
 
 **Note:** Version bump only for package @elastic/apm-rum-angular

diff --git a/packages/rum-angular/package.json b/packages/rum-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elastic/apm-rum-angular",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Elastic APM Real User Monitoring for Angular applications",
   "homepage": "https://www.elastic.co/guide/en/apm/agent/rum-js/current/index.html",
   "license": "MIT",

diff --git a/packages/rum-core/CHANGELOG.md b/packages/rum-core/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [5.22.1](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-10)
+
+
+### Bug Fixes
+
+* **rum-core:** fix for `merge` utility function ([#1555](https://github.com/elastic/apm-agent-rum-js/issues/1555)) ([0d1eda5](https://github.com/elastic/apm-agent-rum-js/commit/0d1eda5b90e2930806e8d1cb733454bd8db12e89))
+
+
+
+## [5.22.0](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-09)
+
+
+### Features
+
+* add pageLoadParentId configuration ([#1521](https://github.com/elastic/apm-agent-rum-js/issues/1521)) ([25143ab](https://github.com/elastic/apm-agent-rum-js/commit/25143ab2c0a057cc1f6510fcced0a739c5cce792))
+
+
+
 ### [5.21.1](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2024-06-27)
 
 

diff --git a/packages/rum-core/package.json b/packages/rum-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elastic/apm-rum-core",
-  "version": "5.21.1",
+  "version": "5.22.1",
   "description": "Elastic apm core",
   "license": "MIT",
   "main": "dist/lib/index.js",

diff --git a/packages/rum-core/src/common/config-service.js b/packages/rum-core/src/common/config-service.js
@@ -191,7 +191,7 @@ class Config {
         Math.round(transactionSampleRate * 10000) / 10000
     }
 
-    merge(this.config, properties)
+    this.config = merge(this.config, properties)
     this.events.send(CONFIG_CHANGE, [this.config])
   }
 

diff --git a/packages/rum-core/src/common/utils.js b/packages/rum-core/src/common/utils.js
@@ -284,12 +284,12 @@ function getCurrentScript() {
   }
 }
 
-function extend(dst) {
-  return baseExtend(dst, slice.call(arguments, 1), false)
+function extend() {
+  return baseExtend(Object.create(null), slice.call(arguments), false)
 }
 
-function merge(dst) {
-  return baseExtend(dst, slice.call(arguments, 1), true)
+function merge() {
+  return baseExtend(Object.create(null), slice.call(arguments), true)
 }
 
 function isUndefined(obj) {

diff --git a/packages/rum-core/src/performance-monitoring/span-base.js b/packages/rum-core/src/performance-monitoring/span-base.js
@@ -77,7 +77,7 @@ class SpanBase {
   addContext(...context) {
     if (context.length === 0) return
     this.ensureContext()
-    merge(this.context, ...context)
+    this.context = merge(this.context, ...context)
   }
 
   end(endTime) {

diff --git a/packages/rum-core/src/performance-monitoring/transaction.js b/packages/rum-core/src/performance-monitoring/transaction.js
@@ -95,7 +95,7 @@ class Transaction extends SpanBase {
       // is not setting explicitly the threshold and instead expecting to rely on the one by default.
       this.options.reuseThreshold = options.reuseThreshold
 
-      extend(this.options, options)
+      this.options = extend(this.options, options)
     }
   }
 

diff --git a/packages/rum-core/test/common/xhr-patch.spec.js b/packages/rum-core/test/common/xhr-patch.spec.js
@@ -190,6 +190,7 @@ describe('xhrPatch', function () {
     const req = new window.XMLHttpRequest()
     const getEvents = registerEventListener(req)
     req.open('GET', 'https://elastic.co/guide', true)
+    req.timeout = 1
     req.addEventListener('loadend', () => {
       expect(getEvents(done).map(e => e.event)).toEqual(['schedule', 'invoke'])
     })

diff --git a/packages/rum-core/test/performance-monitoring/performance-monitoring.spec.js b/packages/rum-core/test/performance-monitoring/performance-monitoring.spec.js
@@ -198,8 +198,13 @@ describe('PerformanceMonitoring', function () {
 
   it('should notify when a transaction has been filtered out', function () {
     spyOn(configService, 'dispatchEvent')
-    var tr = new Transaction('transaction-no-duration', 'transaction-type')
-    tr.end()
+    // NOTE: tests in SauceLabs fail because the duration becomes 1. Setting the start & end
+    // times will ensure `duration` is 0.
+    var now = Date.now()
+    var tr = new Transaction('transaction-no-duration', 'transaction-type', {
+      startTime: now
+    })
+    tr.end(now)
 
     var payload = performanceMonitoring.createTransactionPayload(tr)
     expect(payload).toBeUndefined()

diff --git a/packages/rum-react/CHANGELOG.md b/packages/rum-react/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [2.0.5](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @elastic/apm-rum-react
+
+
+
+
+
+### [2.0.4](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-09)
+
+**Note:** Version bump only for package @elastic/apm-rum-react
+
+
+
+
+
 ### [2.0.3](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2024-06-27)
 
 **Note:** Version bump only for package @elastic/apm-rum-react

diff --git a/packages/rum-react/package.json b/packages/rum-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elastic/apm-rum-react",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Elastic APM Real User Monitoring for React applications",
   "author": "Hamid <[email protected]>",
   "homepage": "https://www.elastic.co/guide/en/apm/agent/rum-js/current/index.html",

diff --git a/packages/rum-vue/CHANGELOG.md b/packages/rum-vue/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [2.1.9](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @elastic/apm-rum-vue
+
+
+
+
+
+### [2.1.8](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-09)
+
+**Note:** Version bump only for package @elastic/apm-rum-vue
+
+
+
+
+
 ### [2.1.7](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2024-06-27)
 
 **Note:** Version bump only for package @elastic/apm-rum-vue

diff --git a/packages/rum-vue/package.json b/packages/rum-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elastic/apm-rum-vue",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "Elastic APM Real User Monitoring for Vue applications",
   "keywords": [
     "elastic",

diff --git a/packages/rum/CHANGELOG.md b/packages/rum/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [5.16.3](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @elastic/apm-rum
+
+
+
+
+
+### [5.16.2](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2025-01-09)
+
+**Note:** Version bump only for package @elastic/apm-rum
+
+
+
+
+
 ### [5.16.1](https://github.com/elastic/apm-agent-rum-js/compare/@elastic/[email protected]...@elastic/[email protected]) (2024-06-27)
 
 **Note:** Version bump only for package @elastic/apm-rum

diff --git a/packages/rum/package.json b/packages/rum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elastic/apm-rum",
-  "version": "5.16.1",
+  "version": "5.16.3",
   "description": "Elastic APM JavaScript agent",
   "main": "dist/lib/index.js",
   "module": "dist/es/index.js",

diff --git a/packages/rum/src/apm-base.js b/packages/rum/src/apm-base.js
@@ -72,7 +72,7 @@ export default class ApmBase {
       /**
        * Set Agent version to be sent as part of metadata to the APM Server
        */
-      configService.setVersion('5.16.1')
+      configService.setVersion('5.16.3')
       this.config(config)
       /**
        * Set level here to account for both active and inactive cases