Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 153 additions & 0 deletions integration_tests/correct_extension_apigateway_snapshot.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,18 @@
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetHello8"
}
},
"DotnetHello10LogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetHello10"
}
},
"DotnetArmHello10LogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetArmHello10"
}
},
"JavaHello8LogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
Expand Down Expand Up @@ -1060,6 +1072,109 @@
"DotnetHello8LogGroup"
]
},
"DotnetHello10LambdaFunction": {
"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": "dotnet_handler.hello",
"Runtime": "dotnet10",
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetHello10",
"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,
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
"DD_SERVICE": "dd-sls-plugin-integration-test",
"DD_ENV": "dev"
}
},
"Role": {
"Fn::GetAtt": [
"IamRoleLambdaExecution",
"Arn"
]
},
"Layers": [
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
]
},
"DependsOn": [
"DotnetHello10LogGroup"
]
},
"DotnetArmHello10LambdaFunction": {
"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": "dotnet_handler.hello",
"Runtime": "dotnet10",
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetArmHello10",
"MemorySize": 1024,
"Timeout": 6,
"Architectures": [
"arm64"
],
"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,
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
"DD_SERVICE": "dd-sls-plugin-integration-test",
"DD_ENV": "dev"
}
},
"Role": {
"Fn::GetAtt": [
"IamRoleLambdaExecution",
"Arn"
]
},
"Layers": [
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
]
},
"DependsOn": [
"DotnetArmHello10LogGroup"
]
},
"JavaHello8LambdaFunction": {
"Type": "AWS::Lambda::Function",
"Properties": {
Expand Down Expand Up @@ -1701,6 +1816,26 @@
"CodeSha256": "XXXX"
}
},
"DotnetHello10LambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
"Properties": {
"FunctionName": {
"Ref": "DotnetHello10LambdaFunction"
},
"CodeSha256": "XXXX"
}
},
"DotnetArmHello10LambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
"Properties": {
"FunctionName": {
"Ref": "DotnetArmHello10LambdaFunction"
},
"CodeSha256": "XXXX"
}
},
"JavaHello8LambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
Expand Down Expand Up @@ -2677,6 +2812,24 @@
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetHello8LambdaFunctionQualifiedArn"
}
},
"DotnetHello10LambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
"Ref": "DotnetHello10LambdaVersionXXXX"
},
"Export": {
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetHello10LambdaFunctionQualifiedArn"
}
},
"DotnetArmHello10LambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
"Ref": "DotnetArmHello10LambdaVersionXXXX"
},
"Export": {
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetArmHello10LambdaFunctionQualifiedArn"
}
},
"JavaHello8LambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
Expand Down
157 changes: 157 additions & 0 deletions integration_tests/correct_extension_snapshot.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,18 @@
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetArmHello8"
}
},
"DotnetHello10LogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetHello10"
}
},
"DotnetArmHello10LogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetArmHello10"
}
},
"JavaHello8LogGroup": {
"Type": "AWS::Logs::LogGroup",
"Properties": {
Expand Down Expand Up @@ -1269,6 +1281,113 @@
"DotnetArmHello8LogGroup"
]
},
"DotnetHello10LambdaFunction": {
"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": "dotnet_handler.hello",
"Runtime": "dotnet10",
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetHello10",
"MemorySize": 1024,
"Timeout": 6,
"Tags": [
{
"Key": "dd_sls_plugin",
"Value": "vX.XX.X"
}
],
"Environment": {
"Variables": {
"DD_API_KEY": 1234,
"DD_SITE": "datadoghq.com",
"DD_TRACE_ENABLED": true,
"DD_MERGE_XRAY_TRACES": false,
"DD_LOGS_INJECTION": false,
"DD_SERVERLESS_LOGS_ENABLED": true,
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
"DD_SERVICE": "dd-sls-plugin-integration-test",
"DD_ENV": "dev"
}
},
"Role": {
"Fn::GetAtt": [
"IamRoleLambdaExecution",
"Arn"
]
},
"Layers": [
{
"Ref": "ProviderLevelLayerLambdaLayer"
},
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
]
},
"DependsOn": [
"DotnetHello10LogGroup"
]
},
"DotnetArmHello10LambdaFunction": {
"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": "dotnet_handler.hello",
"Runtime": "dotnet10",
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetArmHello10",
"MemorySize": 1024,
"Timeout": 6,
"Architectures": [
"arm64"
],
"Tags": [
{
"Key": "dd_sls_plugin",
"Value": "vX.XX.X"
}
],
"Environment": {
"Variables": {
"DD_API_KEY": 1234,
"DD_SITE": "datadoghq.com",
"DD_TRACE_ENABLED": true,
"DD_MERGE_XRAY_TRACES": false,
"DD_LOGS_INJECTION": false,
"DD_SERVERLESS_LOGS_ENABLED": true,
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
"DD_SERVICE": "dd-sls-plugin-integration-test",
"DD_ENV": "dev"
}
},
"Role": {
"Fn::GetAtt": [
"IamRoleLambdaExecution",
"Arn"
]
},
"Layers": [
{
"Ref": "ProviderLevelLayerLambdaLayer"
},
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
]
},
"DependsOn": [
"DotnetArmHello10LogGroup"
]
},
"JavaHello8LambdaFunction": {
"Type": "AWS::Lambda::Function",
"Properties": {
Expand Down Expand Up @@ -1950,6 +2069,26 @@
"CodeSha256": "XXXX"
}
},
"DotnetHello10LambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
"Properties": {
"FunctionName": {
"Ref": "DotnetHello10LambdaFunction"
},
"CodeSha256": "XXXX"
}
},
"DotnetArmHello10LambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
"Properties": {
"FunctionName": {
"Ref": "DotnetArmHello10LambdaFunction"
},
"CodeSha256": "XXXX"
}
},
"JavaHello8LambdaVersionXXXX": {
"Type": "AWS::Lambda::Version",
"DeletionPolicy": "Retain",
Expand Down Expand Up @@ -2269,6 +2408,24 @@
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetArmHello8LambdaFunctionQualifiedArn"
}
},
"DotnetHello10LambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
"Ref": "DotnetHello10LambdaVersionXXXX"
},
"Export": {
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetHello10LambdaFunctionQualifiedArn"
}
},
"DotnetArmHello10LambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
"Ref": "DotnetArmHello10LambdaVersionXXXX"
},
"Export": {
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetArmHello10LambdaFunctionQualifiedArn"
}
},
"JavaHello8LambdaFunctionQualifiedArn": {
"Description": "Current Lambda function version",
"Value": {
Expand Down
Loading