Skip to content

Commit d7274ac

Browse files
Merge pull request #60 from DataDog/darcy.rayner/upgrade-dd-trace
Upgrade dependencies, drop node 8 support
2 parents 9fe7ced + ca373f6 commit d7274ac

File tree

8 files changed

+1506
-1608
lines changed

8 files changed

+1506
-1608
lines changed

.circleci/config.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ jobs:
3434
key: v1-dependencies-<< parameters.node >>-{{ checksum "package.json" }}
3535

3636
workflows:
37-
node-v810:
38-
jobs:
39-
- verify_build:
40-
node: "8.10"
41-
4237
node-v1015:
4338
jobs:
4439
- verify_build:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ arn:aws:lambda:<AWS_REGION>:464622532012:layer:Datadog-Node12-x:<VERSION>
3131
# OR
3232
arn:aws:lambda:<AWS_REGION>:464622532012:layer:Datadog-Node10-x:<VERSION>
3333
# OR
34-
arn:aws:lambda:<AWS_REGION>:464622532012:layer:Datadog-Node8-10:<VERSION>
34+
arn:aws:lambda:<AWS_REGION>:464622532012:layer:Datadog-Node8-10:<VERSION> # (Deprecated)
3535
```
3636

3737
Replace `<AWS_REGION>` with the region where your Lambda function lives, and `<VERSION>` with the desired (or the latest) version that can be found from [CHANGELOG](https://github.com/DataDog/datadog-lambda-layer-js/releases).

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "datadog-lambda-js",
3-
"version": "2.18.0",
3+
"version": "2.19.0",
44
"description": "Lambda client library that supports hybrid tracing in node js",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -15,21 +15,20 @@
1515
"check-formatting": "prettier --check src/**"
1616
},
1717
"devDependencies": {
18-
"@types/aws-lambda": "^8.10.36",
18+
"@types/aws-lambda": "^8.10.46",
1919
"@types/aws-sdk": "^2.7.0",
20-
"@types/bignumber.js": "^5.0.0",
21-
"@types/jest": "^24.0.23",
20+
"@types/jest": "^25.1.4",
2221
"@types/nock": "^11.1.0",
23-
"@types/node": "^12.12.11",
22+
"@types/node": "^13.9.1",
2423
"@types/promise-retry": "^1.1.3",
2524
"@types/shimmer": "^1.0.1",
26-
"jest": "^24.8.0",
27-
"nock": "^11.7.0",
25+
"dd-trace": "0.20.0-beta.0",
26+
"jest": "^25.1.0",
27+
"nock": "12.0.2",
2828
"prettier": "^1.19.1",
29-
"ts-jest": "^24.2.0",
30-
"tslint": "^5.20.1",
31-
"typescript": "^3.7.2",
32-
"dd-trace": "^0.17.0-beta.1"
29+
"ts-jest": "^25.2.1",
30+
"tslint": "^6.1.0",
31+
"typescript": "^3.8.3"
3332
},
3433
"dependencies": {
3534
"aws-xray-sdk-core": "^2.5.0",

scripts/build_layers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010

1111
LAYER_DIR=".layers"
1212
LAYER_FILES_PREFIX="datadog_lambda_node"
13-
NODE_VERSIONS=("8.10" "10.15" "12.13")
13+
NODE_VERSIONS=("10.15" "12.13")
1414

1515
function make_path_absolute {
1616
echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"

scripts/list_layers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
set -e
1212

13-
LAYER_NAMES=("Datadog-Node8-10" "Datadog-Node10-x" "Datadog-Node12-x")
13+
LAYER_NAMES=("Datadog-Node10-x" "Datadog-Node12-x")
1414
AVAILABLE_REGIONS=(us-east-2 us-east-1 us-west-1 us-west-2 ap-south-1 ap-northeast-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ca-central-1 eu-north-1 eu-central-1 eu-west-1 eu-west-2 eu-west-3 sa-east-1)
1515

1616
# Check region arg

scripts/publish_layers.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ set -e
1313
# Makes sure any subprocesses will be terminated with this process
1414
trap "pkill -P $$; exit 1;" INT
1515

16-
NODE_VERSIONS_FOR_AWS_CLI=("nodejs8.10" "nodejs10.x" "nodejs12.x")
17-
LAYER_PATHS=(".layers/datadog_lambda_node8.10.zip" ".layers/datadog_lambda_node10.15.zip" ".layers/datadog_lambda_node12.13.zip")
18-
LAYER_NAMES=("Datadog-Node8-10" "Datadog-Node10-x" "Datadog-Node12-x")
16+
NODE_VERSIONS_FOR_AWS_CLI=("nodejs10.x" "nodejs12.x")
17+
LAYER_PATHS=(".layers/datadog_lambda_node10.15.zip" ".layers/datadog_lambda_node12.13.zip")
18+
LAYER_NAMES=("Datadog-Node10-x" "Datadog-Node12-x")
1919
AVAILABLE_REGIONS=(us-east-2 us-east-1 us-west-1 us-west-2 ap-south-1 ap-northeast-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ca-central-1 eu-north-1 eu-central-1 eu-west-1 eu-west-2 eu-west-3 sa-east-1)
2020

2121
# Check that the layer files exist

scripts/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Run unit tests in Docker
99
set -e
1010

11-
NODE_VERSIONS=("10.15" "8.10" "12.13")
11+
NODE_VERSIONS=("10.15" "12.13")
1212

1313
for node_version in "${NODE_VERSIONS[@]}"
1414
do

0 commit comments

Comments
 (0)