Skip to content

Commit c4851ea

Browse files
rrhodesrrhodes
committed
Merge branch 'master' into feat/ts-definitions-for-mysql2
2 parents 86f9ab1 + 3b89008 commit c4851ea

File tree

14 files changed

+76
-54
lines changed

14 files changed

+76
-54
lines changed

‎CHANGELOG.md

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
11
# Changelog for AWS X-Ray SDK for JavaScript
2-
<!--LATEST=3.10.0-->
2+
<!--LATEST=3.10.2-->
33
<!--ENTRYINSERT-->
4+
5+
## 3.10.2
6+
View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-xray-sdk-node%403.10.1...aws-xray-sdk-node%403.10.2)
7+
* `aws-xray-sdk-core` updated to 3.10.2
8+
* No further changes.
9+
* `aws-xray-sdk-mysql` updated to 3.10.2
10+
* No further changes.
11+
* `aws-xray-sdk-express` updated to 3.10.2
12+
* No further changes.
13+
* `aws-xray-sdk-postgres` updated to 3.10.2
14+
* No further changes.
15+
* `aws-xray-sdk-restify` updated to 3.10.2
16+
* No further changes.
17+
* `aws-xray-sdk-fastify` updated to 3.10.2
18+
* Add default export and named export for fastify plugin
19+
* `aws-xray-sdk-koa2` updated to 3.10.2
20+
* No further changes.
21+
* `aws-xray-sdk-hapi` updated to 3.10.2
22+
* No further changes.
23+
* `aws-xray-sdk-fetch` updated to 3.10.2
24+
* Fix missing X-Ray headers for fetch, add export for fetch enableCapture utility
25+
426
## 3.10.1
5-
View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-xray-sdk-node%403.9.0...aws-xray-sdk-node%403.10.0)
27+
View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-xray-sdk-node%403.10.0...aws-xray-sdk-node%403.10.1)
628
* `aws-xray-sdk-core` updated to 3.10.1
729
* Bump dependency version for body-parser, express and find-my-way
830
* These dependency version changes apply to all packages
@@ -20,7 +42,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
2042
* No further changes.
2143
* `aws-xray-sdk-hapi` updated to 3.10.1
2244
* No further changes.
23-
* `aws-xray-sdk-fetch` added in 3.10.1
45+
* `aws-xray-sdk-fetch` updated to 3.10.1
2446
* No further changes.
2547

2648
## 3.10.0
@@ -41,7 +63,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
4163
* No further changes.
4264
* `aws-xray-sdk-hapi` updated to 3.10.0
4365
* No further changes.
44-
* `aws-xray-sdk-fetch` added in 3.10.0
66+
* `aws-xray-sdk-fetch` updated to 3.10.0
4567
* Pass dispatcher options to global fetch [PR #653](https://github.com/aws/aws-xray-sdk-node/pull/653)
4668

4769
## 3.9.0
@@ -62,7 +84,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
6284
* No further changes.
6385
* `aws-xray-sdk-hapi` updated to 3.9.0
6486
* No further changes.
65-
* `aws-xray-sdk-fetch` added in 3.9.0
87+
* `aws-xray-sdk-fetch` updated to 3.9.0
6688
* No further changes.
6789

6890
## 3.8.0
@@ -83,7 +105,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
83105
* No further changes.
84106
* `aws-xray-sdk-hapi` updated to 3.8.0
85107
* No further changes.
86-
* `aws-xray-sdk-fetch` added in 3.8.0
108+
* `aws-xray-sdk-fetch` updated to 3.8.0
87109
* No further changes.
88110

89111
## 3.7.0
@@ -105,7 +127,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
105127
* No further changes.
106128
* `aws-xray-sdk-hapi` updated to 3.7.0
107129
* No further changes.
108-
* `aws-xray-sdk-fetch` added in 3.7.0
130+
* `aws-xray-sdk-fetch` updated to 3.7.0
109131
* Fix: fix subsegment callback error parameter type [PR #644](https://github.com/aws/aws-xray-sdk-node/pull/644)
110132

111133
## 3.6.0

‎package-lock.json

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-node",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"private": true,
55
"license": "Apache-2.0",
66
"overrides": {
@@ -23,8 +23,8 @@
2323
"@typescript-eslint/eslint-plugin": "^4.25.0",
2424
"@typescript-eslint/parser": "^4.25.0",
2525
"aws-sdk": "^2.304.0",
26-
"aws-xray-sdk-core": "3.10.1",
27-
"aws-xray-sdk-express": "3.10.1",
26+
"aws-xray-sdk-core": "3.10.2",
27+
"aws-xray-sdk-express": "3.10.2",
2828
"chai": "^4.2.0",
2929
"cls-hooked": "^4.2.2",
3030
"codecov": "^3.8.3",

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-core",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "AWS X-Ray SDK for Javascript",
55
"author": "Amazon Web Services",
66
"contributors": [

‎packages/express/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-express",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "AWS X-Ray Middleware for Express (Javascript)",
55
"author": "Amazon Web Services",
66
"contributors": [
@@ -18,7 +18,7 @@
1818
"@types/express": "*"
1919
},
2020
"peerDependencies": {
21-
"aws-xray-sdk-core": "^3.10.1"
21+
"aws-xray-sdk-core": "^3.10.2"
2222
},
2323
"scripts": {
2424
"test": "mocha --recursive ./test/ -R spec && tsd",

‎packages/full_sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "AWS X-Ray SDK for Javascript",
55
"author": "Amazon Web Services",
66
"contributors": [

‎packages/mysql/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-mysql",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "AWS X-Ray Patcher for MySQL (Javascript)",
55
"author": "Amazon Web Services",
66
"contributors": [
@@ -20,7 +20,7 @@
2020
"mysql2": "*"
2121
},
2222
"peerDependencies": {
23-
"aws-xray-sdk-core": "^3.10.1"
23+
"aws-xray-sdk-core": "^3.10.2"
2424
},
2525
"scripts": {
2626
"test": "mocha --recursive ./test/ -R spec && tsd",

‎packages/postgres/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-postgres",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "AWS X-Ray Patcher for Postgres (Javascript)",
55
"author": "Amazon Web Services",
66
"contributors": [
@@ -18,7 +18,7 @@
1818
"@types/pg": "*"
1919
},
2020
"peerDependencies": {
21-
"aws-xray-sdk-core": "^3.10.1"
21+
"aws-xray-sdk-core": "^3.10.2"
2222
},
2323
"scripts": {
2424
"test": "mocha --recursive ./test/ -R spec && tsd",

‎packages/restify/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-restify",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "Enables AWS X-Ray for Restify (Javascript)",
55
"author": "Amazon Web Services",
66
"contributors": [
@@ -18,7 +18,7 @@
1818
"@types/restify": "*"
1919
},
2020
"peerDependencies": {
21-
"aws-xray-sdk-core": "^3.10.1"
21+
"aws-xray-sdk-core": "^3.10.2"
2222
},
2323
"scripts": {
2424
"test": "mocha --recursive ./test/ -R spec && tsd",

‎packages/test_express/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "test-aws-xray-sdk-express",
33
"private": true,
4-
"version": "3.10.1",
4+
"version": "3.10.2",
55
"description": "AWS X-Ray Middleware for Express (Javascript)",
66
"author": "Amazon Web Services",
77
"contributors": [

‎sdk_contrib/fastify/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aws-xray-sdk-fastify",
3-
"version": "3.10.1",
3+
"version": "3.10.2",
44
"description": "AWS X-Ray plugin for Fastify",
55
"author": "Amazon Web Services",
66
"contributors": [
@@ -22,7 +22,7 @@
2222
"node": ">= 14.x"
2323
},
2424
"peerDependencies": {
25-
"aws-xray-sdk-core": "^3.10.1",
25+
"aws-xray-sdk-core": "^3.10.2",
2626
"fastify": "^4.0.1",
2727
"fastify-plugin": "^4.2.0"
2828
},

0 commit comments

Comments
 (0)