Rename functions to format handler-name_runtime

Author: swfunc

scripts/run_integration_tests.sh

@@ -50,7 +50,7 @@ echo "Invoking functions"
 set +e # Don't immediately exit this script if an invocation fails or there's a diff
 for handler_name in "${LAMBDA_HANDLERS[@]}"; do
     for runtime in "${RUNTIMES[@]}"; do
-        function_name="$handler_name-$runtime"
+        function_name="${handler_name}_${runtime}"
         function_snapshot_path="./snapshots/$function_name.return_value"
 
         return_value=$(serverless invoke -f $function_name)
@@ -81,7 +81,7 @@ sleep $LOGS_WAIT_SECONDS
 echo "Fetching logs for invocations and comparing to snapshots"
 for handler_name in "${LAMBDA_HANDLERS[@]}"; do
     for runtime in "${RUNTIMES[@]}"; do
-        function_name="$handler_name-$runtime"
+        function_name="${handler_name}_${runtime}"
         function_snapshot_path="./snapshots/$function_name.logs"
 
         # Fetch logs with serverless cli

tests/integration/serverless.yml

@@ -25,31 +25,31 @@ layers:
 
 functions:
   # async-metrics
-  async-metrics-python27:
+  async-metrics_python27:
     handler: handle.handle
     runtime: python2.7
     layers:
       - { Ref: Python27LambdaLayer }
     environment:
       DD_FLUSH_TO_LOG: true
 
-  async-metrics-python36:
+  async-metrics_python36:
     handler: handle.handle
     runtime: python3.6
     layers:
       - { Ref: Python36LambdaLayer }
     environment:
       DD_FLUSH_TO_LOG: true
 
-  async-metrics-python37:
+  async-metrics_python37:
     handler: handle.handle
     runtime: python3.7
     layers:
       - { Ref: Python37LambdaLayer }
     environment:
       DD_FLUSH_TO_LOG: true
 
-  async-metrics-python38:
+  async-metrics_python38:
     handler: handle.handle
     runtime: python3.8
     layers:
@@ -58,50 +58,50 @@ functions:
       DD_FLUSH_TO_LOG: true
 
   # sync-metrics
-  sync-metrics-python27:
+  sync-metrics_python27:
     handler: handle.handle
     runtime: python2.7
     layers:
       - { Ref: Python27LambdaLayer }
 
-  sync-metrics-python36:
+  sync-metrics_python36:
     handler: handle.handle
     runtime: python3.6
     layers:
       - { Ref: Python36LambdaLayer }
 
-  sync-metrics-python37:
+  sync-metrics_python37:
     handler: handle.handle
     runtime: python3.7
     layers:
       - { Ref: Python37LambdaLayer }
 
-  sync-metrics-python38:
+  sync-metrics_python38:
     handler: handle.handle
     runtime: python3.8
     layers:
       - { Ref: Python38LambdaLayer }
 
   # http-requests
-  http-requests-python27:
+  http-requests_python27:
     handler: http_requests.handle
     runtime: python2.7
     layers:
       - { Ref: Python27LambdaLayer }
 
-  http-requests-python36:
+  http-requests_python36:
     handler: http_requests.handle
     runtime: python3.6
     layers:
       - { Ref: Python36LambdaLayer }
 
-  http-requests-python37:
+  http-requests_python37:
     handler: http_requests.handle
     runtime: python3.7
     layers:
       - { Ref: Python37LambdaLayer }
 
-  http-requests-python38:
+  http-requests_python38:
     handler: http_requests.handle
     runtime: python3.8
     layers:

…on/snapshots/async-metrics-python27.logs …on/snapshots/async-metrics_python27.logstests/integration/snapshots/async-metrics-python27.logs renamed to tests/integration/snapshots/async-metrics_python27.logs tests/integration/snapshots/async-metrics-python27.logs renamed to tests/integration/snapshots/async-metrics_python27.logs

@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e": XXXX, "m": "aws.lambda.enhanced.invocations", "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics-python27", "cold_start:true", "memorysize:1024", "runtime:python2.7", "dd_lambda_layer:datadog-python27_2.13.0"], "v": 1}
+{"e": XXXX, "m": "aws.lambda.enhanced.invocations", "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics_python27", "cold_start:true", "memorysize:1024", "runtime:python2.7", "dd_lambda_layer:datadog-python27_2.13.0"], "v": 1}
 {"e": XXXX, "m": "hello.dog", "t": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python27_2.13.0"], "v": 1}
 {"e": XXXX, "m": "tests.integration.count", "t": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python27_2.13.0"], "v": 21}
 END RequestId: XXXX

…hots/async-metrics-python27.return_value …hots/async-metrics_python27.return_valuetests/integration/snapshots/async-metrics-python27.return_value renamed to tests/integration/snapshots/async-metrics_python27.return_value tests/integration/snapshots/async-metrics-python27.return_value renamed to tests/integration/snapshots/async-metrics_python27.return_value

@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"m": "aws.lambda.enhanced.invocations", "v": 1, "e": XXXX, "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics-python36", "cold_start:true", "memorysize:1024", "runtime:python3.6", "dd_lambda_layer:datadog-python36_2.13.0"]}
+{"m": "aws.lambda.enhanced.invocations", "v": 1, "e": XXXX, "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics_python36", "cold_start:true", "memorysize:1024", "runtime:python3.6", "dd_lambda_layer:datadog-python36_2.13.0"]}
 {"m": "hello.dog", "v": 1, "e": XXXX, "t": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python36_2.13.0"]}
 {"m": "tests.integration.count", "v": 21, "e": XXXX, "t": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python36_2.13.0"]}
 END RequestId: XXXX

…on/snapshots/async-metrics-python36.logs …on/snapshots/async-metrics_python36.logstests/integration/snapshots/async-metrics-python36.logs renamed to tests/integration/snapshots/async-metrics_python36.logs tests/integration/snapshots/async-metrics-python36.logs renamed to tests/integration/snapshots/async-metrics_python36.logs

@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"m": "aws.lambda.enhanced.invocations", "v": 1, "e": XXXX, "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics-python37", "cold_start:true", "memorysize:1024", "runtime:python3.7", "dd_lambda_layer:datadog-python37_2.13.0"]}
+{"m": "aws.lambda.enhanced.invocations", "v": 1, "e": XXXX, "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics_python37", "cold_start:true", "memorysize:1024", "runtime:python3.7", "dd_lambda_layer:datadog-python37_2.13.0"]}
 {"m": "hello.dog", "v": 1, "e": XXXX, "t": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_2.13.0"]}
 {"m": "tests.integration.count", "v": 21, "e": XXXX, "t": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_2.13.0"]}
 END RequestId: XXXX

…hots/async-metrics-python36.return_value …hots/async-metrics_python36.return_valuetests/integration/snapshots/async-metrics-python36.return_value renamed to tests/integration/snapshots/async-metrics_python36.return_value tests/integration/snapshots/async-metrics-python36.return_value renamed to tests/integration/snapshots/async-metrics_python36.return_value

@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"m": "aws.lambda.enhanced.invocations", "v": 1, "e": XXXX, "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics-python38", "cold_start:true", "memorysize:1024", "runtime:python3.8", "dd_lambda_layer:datadog-python38_2.13.0"]}
+{"m": "aws.lambda.enhanced.invocations", "v": 1, "e": XXXX, "t": ["region:us-east-1", "account_id:601427279990", "functionname:integration-tester-dev-async-metrics_python38", "cold_start:true", "memorysize:1024", "runtime:python3.8", "dd_lambda_layer:datadog-python38_2.13.0"]}
 {"m": "hello.dog", "v": 1, "e": XXXX, "t": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_2.13.0"]}
 {"m": "tests.integration.count", "v": 21, "e": XXXX, "t": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_2.13.0"]}
 END RequestId: XXXX