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

* remove lookup * update unit tests * update runtime for unit test * update scripts * update `serverless.yml` projects * update snapshots * remove lookup * update snapshots * update script * update `serverless.yml` projects * update snapshots * update forwarder snapshot * eol * update checks to remove node 14 too * nvm just 16 and 18
DataDog · Feb 14, 2024 · 8c59371 · 8c59371
1 parent 6cd74e6
commit 8c59371
Show file tree

Hide file tree

Showing 12 changed files with 146 additions and 406 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        node-version: [14, 16]
+        node-version: [16, 18]
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -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

diff --git a/integration_tests/correct_extension_apigateway_snapshot.json b/integration_tests/correct_extension_apigateway_snapshot.json
@@ -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": {
@@ -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": {
@@ -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",
@@ -1065,7 +999,7 @@
                 ":lambda:path/2015-03-31/functions/",
                 {
                   "Fn::GetAtt": [
-                    "JavascriptHello14DashxLambdaFunction",
+                    "JavascriptHello16DashxLambdaFunction",
                     "Arn"
                   ]
                 },
@@ -1077,7 +1011,7 @@
         "MethodResponses": []
       },
       "DependsOn": [
-        "JavascriptHello14DashxLambdaPermissionApiGateway"
+        "JavascriptHello16DashxLambdaPermissionApiGateway"
       ]
     },
     "ApiGatewayDeploymentxxxx": {
@@ -1130,12 +1064,12 @@
         }
       }
     },
-    "JavascriptHello14DashxLambdaPermissionApiGateway": {
+    "JavascriptHello16DashxLambdaPermissionApiGateway": {
       "Type": "AWS::Lambda::Permission",
       "Properties": {
         "FunctionName": {
           "Fn::GetAtt": [
-            "JavascriptHello14DashxLambdaFunction",
+            "JavascriptHello16DashxLambdaFunction",
             "Arn"
           ]
         },
@@ -1335,7 +1269,7 @@
         }
       }
     },
-    "JavascriptHello14DashxWebsocketsIntegration": {
+    "JavascriptHello16DashxWebsocketsIntegration": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
@@ -1357,7 +1291,7 @@
               ":lambda:path/2015-03-31/functions/",
               {
                 "Fn::GetAtt": [
-                  "JavascriptHello14DashxLambdaFunction",
+                  "JavascriptHello16DashxLambdaFunction",
                   "Arn"
                 ]
               },
@@ -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"
           ]
         },
@@ -1415,7 +1349,7 @@
             [
               "integrations",
               {
-                "Ref": "JavascriptHello14DashxWebsocketsIntegration"
+                "Ref": "JavascriptHello16DashxWebsocketsIntegration"
               }
             ]
           ]
@@ -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"
         }
       }
     },
@@ -1451,7 +1385,7 @@
         "LogGroupName": "/aws/websocket/dd-sls-plugin-integration-test-dev"
       }
     },
-    "WebsocketsDeploymentckqcOE1ebmlhFFRpE7NMKPybd4S9QPf1rsPjkB0NjI": {
+    "WebsocketsDeploymentLprF7rCGSeh3kyAZfYGKU0tnNqO18rZ6K6vGaxgc": {
       "Type": "AWS::ApiGatewayV2::Deployment",
       "DependsOn": [
         "SconnectWebsocketsRoute",
@@ -1575,12 +1509,12 @@
       },
       "DependsOn": "HttpApiIntegrationPythonHello39"
     },
-    "JavascriptHello14DashxLambdaPermissionHttpApi": {
+    "JavascriptHello16DashxLambdaPermissionHttpApi": {
       "Type": "AWS::Lambda::Permission",
       "Properties": {
         "FunctionName": {
           "Fn::GetAtt": [
-            "JavascriptHello14DashxLambdaFunction",
+            "JavascriptHello16DashxLambdaFunction",
             "Arn"
           ]
         },
@@ -1612,7 +1546,7 @@
         }
       }
     },
-    "HttpApiIntegrationJavascriptHello14Dashx": {
+    "HttpApiIntegrationJavascriptHello16Dashx": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
@@ -1621,7 +1555,7 @@
         "IntegrationType": "AWS_PROXY",
         "IntegrationUri": {
           "Fn::GetAtt": [
-            "JavascriptHello14DashxLambdaFunction",
+            "JavascriptHello16DashxLambdaFunction",
             "Arn"
           ]
         },
@@ -1642,13 +1576,13 @@
             [
               "integrations",
               {
-                "Ref": "HttpApiIntegrationJavascriptHello14Dashx"
+                "Ref": "HttpApiIntegrationJavascriptHello16Dashx"
               }
             ]
           ]
         }
       },
-      "DependsOn": "HttpApiIntegrationJavascriptHello14Dashx"
+      "DependsOn": "HttpApiIntegrationJavascriptHello16Dashx"
     },
     "ApiGatewayLogGroupSubscription": {
       "Type": "AWS::Logs::SubscriptionFilter",
@@ -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": {
@@ -1885,4 +1810,4 @@
       }
     }
   }
-}
+}