Skip to content

Commit

Permalink
Merge branch 'master' into feat/ts-definitions-for-mysql2
Browse files Browse the repository at this point in the history
  • Loading branch information
rrhodes committed Nov 11, 2024
2 parents 86f9ab1 + 3b89008 commit c4851ea
Show file tree
Hide file tree
Showing 14 changed files with 76 additions and 54 deletions.
36 changes: 29 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,30 @@
# Changelog for AWS X-Ray SDK for JavaScript
<!--LATEST=3.10.0-->
<!--LATEST=3.10.2-->
<!--ENTRYINSERT-->

## 3.10.2
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)
* `aws-xray-sdk-core` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-mysql` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-express` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-postgres` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-restify` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-fastify` updated to 3.10.2
* Add default export and named export for fastify plugin
* `aws-xray-sdk-koa2` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-hapi` updated to 3.10.2
* No further changes.
* `aws-xray-sdk-fetch` updated to 3.10.2
* Fix missing X-Ray headers for fetch, add export for fetch enableCapture utility

## 3.10.1
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)
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)
* `aws-xray-sdk-core` updated to 3.10.1
* Bump dependency version for body-parser, express and find-my-way
* These dependency version changes apply to all packages
Expand All @@ -20,7 +42,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
* No further changes.
* `aws-xray-sdk-hapi` updated to 3.10.1
* No further changes.
* `aws-xray-sdk-fetch` added in 3.10.1
* `aws-xray-sdk-fetch` updated to 3.10.1
* No further changes.

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

## 3.9.0
Expand All @@ -62,7 +84,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
* No further changes.
* `aws-xray-sdk-hapi` updated to 3.9.0
* No further changes.
* `aws-xray-sdk-fetch` added in 3.9.0
* `aws-xray-sdk-fetch` updated to 3.9.0
* No further changes.

## 3.8.0
Expand All @@ -83,7 +105,7 @@ View [the latest changes](https://github.com/aws/aws-xray-sdk-node/compare/aws-x
* No further changes.
* `aws-xray-sdk-hapi` updated to 3.8.0
* No further changes.
* `aws-xray-sdk-fetch` added in 3.8.0
* `aws-xray-sdk-fetch` updated to 3.8.0
* No further changes.

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

## 3.6.0
Expand Down
50 changes: 25 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-node",
"version": "3.10.1",
"version": "3.10.2",
"private": true,
"license": "Apache-2.0",
"overrides": {
Expand All @@ -23,8 +23,8 @@
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
"aws-sdk": "^2.304.0",
"aws-xray-sdk-core": "3.10.1",
"aws-xray-sdk-express": "3.10.1",
"aws-xray-sdk-core": "3.10.2",
"aws-xray-sdk-express": "3.10.2",
"chai": "^4.2.0",
"cls-hooked": "^4.2.2",
"codecov": "^3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-core",
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray SDK for Javascript",
"author": "Amazon Web Services",
"contributors": [
Expand Down
4 changes: 2 additions & 2 deletions packages/express/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-express",
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray Middleware for Express (Javascript)",
"author": "Amazon Web Services",
"contributors": [
Expand All @@ -18,7 +18,7 @@
"@types/express": "*"
},
"peerDependencies": {
"aws-xray-sdk-core": "^3.10.1"
"aws-xray-sdk-core": "^3.10.2"
},
"scripts": {
"test": "mocha --recursive ./test/ -R spec && tsd",
Expand Down
2 changes: 1 addition & 1 deletion packages/full_sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk",
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray SDK for Javascript",
"author": "Amazon Web Services",
"contributors": [
Expand Down
4 changes: 2 additions & 2 deletions packages/mysql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-mysql",
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray Patcher for MySQL (Javascript)",
"author": "Amazon Web Services",
"contributors": [
Expand All @@ -20,7 +20,7 @@
"mysql2": "*"
},
"peerDependencies": {
"aws-xray-sdk-core": "^3.10.1"
"aws-xray-sdk-core": "^3.10.2"
},
"scripts": {
"test": "mocha --recursive ./test/ -R spec && tsd",
Expand Down
4 changes: 2 additions & 2 deletions packages/postgres/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-postgres",
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray Patcher for Postgres (Javascript)",
"author": "Amazon Web Services",
"contributors": [
Expand All @@ -18,7 +18,7 @@
"@types/pg": "*"
},
"peerDependencies": {
"aws-xray-sdk-core": "^3.10.1"
"aws-xray-sdk-core": "^3.10.2"
},
"scripts": {
"test": "mocha --recursive ./test/ -R spec && tsd",
Expand Down
4 changes: 2 additions & 2 deletions packages/restify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-restify",
"version": "3.10.1",
"version": "3.10.2",
"description": "Enables AWS X-Ray for Restify (Javascript)",
"author": "Amazon Web Services",
"contributors": [
Expand All @@ -18,7 +18,7 @@
"@types/restify": "*"
},
"peerDependencies": {
"aws-xray-sdk-core": "^3.10.1"
"aws-xray-sdk-core": "^3.10.2"
},
"scripts": {
"test": "mocha --recursive ./test/ -R spec && tsd",
Expand Down
2 changes: 1 addition & 1 deletion packages/test_express/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "test-aws-xray-sdk-express",
"private": true,
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray Middleware for Express (Javascript)",
"author": "Amazon Web Services",
"contributors": [
Expand Down
4 changes: 2 additions & 2 deletions sdk_contrib/fastify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-xray-sdk-fastify",
"version": "3.10.1",
"version": "3.10.2",
"description": "AWS X-Ray plugin for Fastify",
"author": "Amazon Web Services",
"contributors": [
Expand All @@ -22,7 +22,7 @@
"node": ">= 14.x"
},
"peerDependencies": {
"aws-xray-sdk-core": "^3.10.1",
"aws-xray-sdk-core": "^3.10.2",
"fastify": "^4.0.1",
"fastify-plugin": "^4.2.0"
},
Expand Down
Loading

0 comments on commit c4851ea

Please sign in to comment.