Skip to content

Commit

Permalink
[8.16] Update APM (main) (#205153) (#206442)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.16`:
- [Update APM (main)
(#205153)](#205153)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"elastic-renovate-prod[bot]","email":"174716857+elastic-renovate-prod[bot]@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-01-10T18:49:39Z","message":"Update
APM (main) (#205153)\n\nCo-authored-by: elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>","sha":"ff2a16008b2068bc1a8ef7d2e52984404f0e2ca0","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","v9.0.0","backport:prev-minor","v8.18.0"],"number":205153,"url":"https://github.com/elastic/kibana/pull/205153","mergeCommit":{"message":"Update
APM (main) (#205153)\n\nCo-authored-by: elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>","sha":"ff2a16008b2068bc1a8ef7d2e52984404f0e2ca0"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205153","number":205153,"mergeCommit":{"message":"Update
APM (main) (#205153)\n\nCo-authored-by: elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>","sha":"ff2a16008b2068bc1a8ef7d2e52984404f0e2ca0"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/206373","number":206373,"state":"MERGED","mergeCommit":{"sha":"08225f9b4344498fec8cdd8d6dc793542367c3c8","message":"[8.x]
Update APM (main) (#205153) (#206373)\n\n# Backport\n\nThis will
backport the following commits from `main` to `8.x`:\n- [Update APM
(main)\n(#205153)](https://github.com/elastic/kibana/pull/205153)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT\n[{\"author\":{\"name\":\"elastic-renovate-prod[bot]\",\"email\":\"174716857+elastic-renovate-prod[bot]@users.noreply.github.com\"},\"sourceCommit\":{\"committedDate\":\"2025-01-10T18:49:39Z\",\"message\":\"Update\nAPM
(main) (#205153)\\n\\nCo-authored-by:
elastic-renovate-prod[bot]\n<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\",\"sha\":\"ff2a16008b2068bc1a8ef7d2e52984404f0e2ca0\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.18.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Core\",\"release_note:skip\",\"v9.0.0\",\"backport:prev-minor\"],\"title\":\"Update\nAPM\n(main)\",\"number\":205153,\"url\":\"https://github.com/elastic/kibana/pull/205153\",\"mergeCommit\":{\"message\":\"Update\nAPM
(main) (#205153)\\n\\nCo-authored-by:
elastic-renovate-prod[bot]\n<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\",\"sha\":\"ff2a16008b2068bc1a8ef7d2e52984404f0e2ca0\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/205153\",\"number\":205153,\"mergeCommit\":{\"message\":\"Update\nAPM
(main) (#205153)\\n\\nCo-authored-by:
elastic-renovate-prod[bot]\n<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\",\"sha\":\"ff2a16008b2068bc1a8ef7d2e52984404f0e2ca0\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>"}}]}]
BACKPORT-->

---------

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
Co-authored-by: kibanamachine <[email protected]>
  • Loading branch information
3 people authored Jan 13, 2025
1 parent 44d0e02 commit a307ab3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@elastic/apm-rum": "^5.16.1",
"@elastic/apm-rum-core": "^5.21.1",
"@elastic/apm-rum-react": "^2.0.3",
"@elastic/charts": "68.0.2",
"@elastic/apm-rum": "^5.16.3",
"@elastic/apm-rum-core": "^5.22.1",
"@elastic/apm-rum-react": "^2.0.5",
"@elastic/charts": "68.0.4",
"@elastic/datemath": "5.0.3",
"@elastic/ebt": "^1.1.1",
"@elastic/ecs": "^8.11.1",
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1646,29 +1646,29 @@
dependencies:
tslib "^2.0.0"

"@elastic/apm-rum-core@^5.21.1":
version "5.21.1"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.21.1.tgz#ea6f2268629193962c194ae1d29971e2c5b2e531"
integrity sha512-/LyLhVdJ+zcsKogwq2AEYARc//RDXOoTHWPERLay4sCsvvxc4/GkkhhOC40CqI0oMu4kUAoJInQWZuCM7zCZRQ==
"@elastic/apm-rum-core@^5.22.1":
version "5.22.1"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.22.1.tgz#51f652ace73d4f3ee2d93097a3a3a042764fb26e"
integrity sha512-G8NHxG3R+ok3XsRSUKwUcpUQR3/cKMN2UT2LXP57hrtTaI4eKEzk3zn9IXnxAwqwSl0TMtewaIoBTI9KVDCMyQ==
dependencies:
error-stack-parser "^1.3.5"
opentracing "^0.14.3"
promise-polyfill "^8.1.3"

"@elastic/apm-rum-react@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-2.0.3.tgz#6193464943ea80a74682373de2242490623111f6"
integrity sha512-oDdNz1GEZvy7R1CPOJWkXFRRHY5yNO3vRhUttDXqvXvRBEd1m7HosskHs/R/LjtoYghpAVrG+yzJGvDI9TSuxQ==
"@elastic/apm-rum-react@^2.0.5":
version "2.0.5"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-2.0.5.tgz#0992d3b869f83bb97a89b22bf03b0342e3be1d54"
integrity sha512-yRb4qQSxAO2aQPxqBTob1t1QcoVJ35IP4ixMZkxNKFAL0bvqYRssU+92bOSkj6eyYBOets8NJKzy1Cg3/wOXGw==
dependencies:
"@elastic/apm-rum" "^5.16.1"
"@elastic/apm-rum" "^5.16.3"
hoist-non-react-statics "^3.3.0"

"@elastic/apm-rum@^5.16.1":
version "5.16.1"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.16.1.tgz#59767f587a31293c17497ff86e05754627182be4"
integrity sha512-hxmhjLqF4EqEl2wVwxKU5p88jiwHPF//zqk97bm09vj5CQQ6HBtWkwIxQ5dvEEOnRwJinFEf9V2JibpamgzUWA==
"@elastic/apm-rum@^5.16.3":
version "5.16.3"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.16.3.tgz#11c31765477ab4174a1fb0949ca4e315f8d070db"
integrity sha512-gi4aFrAL46vKXOQM2S/1ZVfpklxJwlzWH2G69qFBw3drpa/lhmpjg6lW8N44v0whz1um1FiSVdl0I+QSgZNYfw==
dependencies:
"@elastic/apm-rum-core" "^5.21.1"
"@elastic/apm-rum-core" "^5.22.1"

"@elastic/app-search-javascript@^8.1.2":
version "8.1.2"
Expand All @@ -1677,10 +1677,10 @@
dependencies:
object-hash "^1.3.0"

"@elastic/[email protected].2":
version "68.0.2"
resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-68.0.2.tgz#8868a1d998137c41985a9b6da340391a31bae2f0"
integrity sha512-d0+qxiUovKwXeDDSrI4JQgTzk5YCbYnKxQAGV0jH37QLUzTo+t7yKqa7VTcCfEXzmtyD9Fwvihe/hCeHo+ii2w==
"@elastic/[email protected].4":
version "68.0.4"
resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-68.0.4.tgz#b35a4734e4e36ef894432a3ff882a0e4329ffe4c"
integrity sha512-kn9FEm2osJBitbbqCRcuZ3ygrLHelUm9i9bCAcY/t3vXfT7tDjhvgueAjm5gQas7/NcASN8LWEykLktGo3mrxQ==
dependencies:
"@popperjs/core" "^2.11.8"
bezier-easing "^2.1.0"
Expand Down

0 comments on commit a307ab3

Please sign in to comment.