From 832c28551335c737cc27c9a9f1eaa7593924199d Mon Sep 17 00:00:00 2001
From: Trent Mick <trent.mick@elastic.co>
Date: Wed, 24 Nov 2021 09:43:51 -0800
Subject: [PATCH] 3.25.0 (#2466)

Also, bump to latest ES client canary release and update tests for it.
---
 CHANGELOG.asciidoc                                       | 9 ++-------
 docs/upgrading.asciidoc                                  | 1 +
 package.json                                             | 4 ++--
 .../modules/@elastic/elasticsearch.test.js               | 8 +++++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5f47f4031a..b2ffe5b67d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,13 +29,8 @@ Notes:
 === Node.js Agent version 3.x
 
 
-==== Unreleased
-
-[float]
-===== Breaking changes
-
-[float]
-===== Features
+[[release-notes-3.25.0]]
+==== 3.25.0 2021/11/24
 
 [float]
 ===== Bug fixes
diff --git a/docs/upgrading.asciidoc b/docs/upgrading.asciidoc
index 47d07b8309..0d78b298c2 100644
--- a/docs/upgrading.asciidoc
+++ b/docs/upgrading.asciidoc
@@ -31,6 +31,7 @@ The table below is a simplified description of this policy.
 [options="header"]
 |====
 |Agent version |EOL Date |Maintained until
+|3.25.x |2023-05-24 |3.26.0
 |3.24.x |2023-05-09 |3.25.0
 |3.23.x |2023-04-25 |3.24.0
 |3.22.x |2023-04-21 |3.23.0
diff --git a/package.json b/package.json
index 8af6f8e343..bbc37a1461 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elastic-apm-node",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "description": "The official Elastic APM agent for Node.js",
   "main": "index.js",
   "types": "index.d.ts",
@@ -118,7 +118,7 @@
     "@babel/core": "^7.8.4",
     "@babel/preset-env": "^7.8.4",
     "@elastic/elasticsearch": "^7.15.0",
-    "@elastic/elasticsearch-canary": "^8.0.0-canary.35",
+    "@elastic/elasticsearch-canary": "^8.0.0-canary.37",
     "@hapi/hapi": "^20.1.2",
     "@koa/router": "^9.0.1",
     "@types/node": "^13.7.4",
diff --git a/test/instrumentation/modules/@elastic/elasticsearch.test.js b/test/instrumentation/modules/@elastic/elasticsearch.test.js
index ddef315d76..07eb2309e0 100644
--- a/test/instrumentation/modules/@elastic/elasticsearch.test.js
+++ b/test/instrumentation/modules/@elastic/elasticsearch.test.js
@@ -209,10 +209,12 @@ if (semver.gte(process.version, '10.0.0')) {
       sort: 'myField:asc'
     }
     let statement
-    // ES client version 8 merges options for *most* APIs into a single body
-    // object, instead of separate query params and body.
+    // ES client version 8 merges options into `body` differently from earlier
+    // versions.
     if (semver.satisfies(esVersion, '>=8', { includePrerelease: true })) {
-      statement = '{"query":{"match":{"request":"bar"}},"size":2,"sort":"myField:asc"}'
+      statement = `sort=myField%3Aasc
+
+{"query":{"match":{"request":"bar"}},"size":2}`
     } else {
       statement = `size=2&sort=myField%3Aasc