Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Deprecate Node.js 14.x instrumentation #467

Merged
merged 16 commits into from
Feb 14, 2024
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
node-version: [14, 16]
node-version: [16, 18]

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Node 14
- name: Set up Node 18
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18

- name: Cache Node modules
id: cache-node-modules
Expand Down
113 changes: 19 additions & 94 deletions integration_tests/correct_extension_apigateway_snapshot.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-PythonHello39"
}
},
"JavascriptHello14DashxLogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-JavascriptHello14-x"
}
},
"JavascriptHello16DashxLogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
Expand Down Expand Up @@ -382,56 +376,6 @@
"PythonHello39LogGroup"
]
},
"JavascriptHello14DashxLambdaFunction": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "ServerlessDeploymentBucket"
},
"S3Key": "serverless/dd-sls-plugin-integration-test/dev/XXXXXXXXXXXXX-XXXX-XX-XXXXX:XX:XX.XXXX/dd-sls-plugin-integration-test.zip"
},
"Handler": "/opt/nodejs/node_modules/datadog-lambda-js/handler.handler",
"Runtime": "nodejs14.x",
"FunctionName": "dd-sls-plugin-integration-test-dev-JavascriptHello14-x",
"MemorySize": 1024,
"Timeout": 6,
"Tags": [
{
"Key": "dd_sls_plugin",
"Value": "vX.XX.X"
}
],
"Environment": {
"Variables": {
"DD_API_KEY": 1234,
"DD_SITE": "datadoghq.com",
"DD_LOG_LEVEL": "info",
"DD_TRACE_ENABLED": true,
"DD_MERGE_XRAY_TRACES": false,
"DD_LOGS_INJECTION": false,
"DD_SERVERLESS_LOGS_ENABLED": true,
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
"DD_SERVICE": "dd-sls-plugin-integration-test",
"DD_ENV": "dev",
"DD_LAMBDA_HANDLER": "js_handler.hello"
}
},
"Role": {
"Fn::GetAtt": [
"IamRoleLambdaExecution",
"Arn"
]
},
"Layers": [
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node14-x:XXX",
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
]
},
"DependsOn": [
"JavascriptHello14DashxLogGroup"
]
},
"JavascriptHello16DashxLambdaFunction": {
"Type": "AWS::Lambda::Function",
"Properties": {
Expand Down Expand Up @@ -859,16 +803,6 @@
"CodeSha256": "XXXX"
}
},
"JavascriptHello14DashxLambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
"Properties": {
"FunctionName": {
"Ref": "JavascriptHello14DashxLambdaFunction"
},
"CodeSha256": "XXXX"
}
},
"JavascriptHello16DashxLambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
Expand Down Expand Up @@ -1065,7 +999,7 @@
":lambda:path/2015-03-31/functions/",
{
"Fn::GetAtt": [
"JavascriptHello14DashxLambdaFunction",
"JavascriptHello16DashxLambdaFunction",
"Arn"
]
},
Expand All @@ -1077,7 +1011,7 @@
"MethodResponses": []
},
"DependsOn": [
"JavascriptHello14DashxLambdaPermissionApiGateway"
"JavascriptHello16DashxLambdaPermissionApiGateway"
]
},
"ApiGatewayDeploymentxxxx": {
Expand Down Expand Up @@ -1130,12 +1064,12 @@
}
}
},
"JavascriptHello14DashxLambdaPermissionApiGateway": {
"JavascriptHello16DashxLambdaPermissionApiGateway": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"FunctionName": {
"Fn::GetAtt": [
"JavascriptHello14DashxLambdaFunction",
"JavascriptHello16DashxLambdaFunction",
"Arn"
]
},
Expand Down Expand Up @@ -1335,7 +1269,7 @@
}
}
},
"JavascriptHello14DashxWebsocketsIntegration": {
"JavascriptHello16DashxWebsocketsIntegration": {
"Type": "AWS::ApiGatewayV2::Integration",
"Properties": {
"ApiId": {
Expand All @@ -1357,7 +1291,7 @@
":lambda:path/2015-03-31/functions/",
{
"Fn::GetAtt": [
"JavascriptHello14DashxLambdaFunction",
"JavascriptHello16DashxLambdaFunction",
"Arn"
]
},
Expand All @@ -1384,16 +1318,16 @@
"Principal": "apigateway.amazonaws.com"
}
},
"JavascriptHello14DashxLambdaPermissionWebsockets": {
"JavascriptHello16DashxLambdaPermissionWebsockets": {
"Type": "AWS::Lambda::Permission",
"DependsOn": [
"WebsocketsApi",
"JavascriptHello14DashxLambdaFunction"
"JavascriptHello16DashxLambdaFunction"
],
"Properties": {
"FunctionName": {
"Fn::GetAtt": [
"JavascriptHello14DashxLambdaFunction",
"JavascriptHello16DashxLambdaFunction",
"Arn"
]
},
Expand All @@ -1415,7 +1349,7 @@
[
"integrations",
{
"Ref": "JavascriptHello14DashxWebsocketsIntegration"
"Ref": "JavascriptHello16DashxWebsocketsIntegration"
}
]
]
Expand All @@ -1441,7 +1375,7 @@
"Format": "$context.identity.sourceIp $context.identity.caller $context.identity.user [$context.requestTime] \"$context.eventType $context.routeKey $context.connectionId\" $context.requestId"
},
"DeploymentId": {
"Ref": "WebsocketsDeploymentckqcOE1ebmlhFFRpE7NMKPybd4S9QPf1rsPjkB0NjI"
"Ref": "WebsocketsDeploymentLprF7rCGSeh3kyAZfYGKU0tnNqO18rZ6K6vGaxgc"
}
}
},
Expand All @@ -1451,7 +1385,7 @@
"LogGroupName": "/aws/websocket/dd-sls-plugin-integration-test-dev"
}
},
"WebsocketsDeploymentckqcOE1ebmlhFFRpE7NMKPybd4S9QPf1rsPjkB0NjI": {
"WebsocketsDeploymentLprF7rCGSeh3kyAZfYGKU0tnNqO18rZ6K6vGaxgc": {
"Type": "AWS::ApiGatewayV2::Deployment",
"DependsOn": [
"SconnectWebsocketsRoute",
Expand Down Expand Up @@ -1575,12 +1509,12 @@
},
"DependsOn": "HttpApiIntegrationPythonHello39"
},
"JavascriptHello14DashxLambdaPermissionHttpApi": {
"JavascriptHello16DashxLambdaPermissionHttpApi": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"FunctionName": {
"Fn::GetAtt": [
"JavascriptHello14DashxLambdaFunction",
"JavascriptHello16DashxLambdaFunction",
"Arn"
]
},
Expand Down Expand Up @@ -1612,7 +1546,7 @@
}
}
},
"HttpApiIntegrationJavascriptHello14Dashx": {
"HttpApiIntegrationJavascriptHello16Dashx": {
"Type": "AWS::ApiGatewayV2::Integration",
"Properties": {
"ApiId": {
Expand All @@ -1621,7 +1555,7 @@
"IntegrationType": "AWS_PROXY",
"IntegrationUri": {
"Fn::GetAtt": [
"JavascriptHello14DashxLambdaFunction",
"JavascriptHello16DashxLambdaFunction",
"Arn"
]
},
Expand All @@ -1642,13 +1576,13 @@
[
"integrations",
{
"Ref": "HttpApiIntegrationJavascriptHello14Dashx"
"Ref": "HttpApiIntegrationJavascriptHello16Dashx"
}
]
]
}
},
"DependsOn": "HttpApiIntegrationJavascriptHello14Dashx"
"DependsOn": "HttpApiIntegrationJavascriptHello16Dashx"
},
"ApiGatewayLogGroupSubscription": {
"Type": "AWS::Logs::SubscriptionFilter",
Expand Down Expand Up @@ -1717,15 +1651,6 @@
"Name": "sls-dd-sls-plugin-integration-test-dev-PythonHello39LambdaFunctionQualifiedArn"
}
},
"JavascriptHello14DashxLambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
"Ref": "JavascriptHello14DashxLambdaVersionXXXX"
},
"Export": {
"Name": "sls-dd-sls-plugin-integration-test-dev-JavascriptHello14DashxLambdaFunctionQualifiedArn"
}
},
"JavascriptHello16DashxLambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
Expand Down Expand Up @@ -1885,4 +1810,4 @@
}
}
}
}
}