Skip to content

Feat/update config #430

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.

Sign up for GitHub

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

Merged
jeastham1993 merged 11 commits into from
Sep 1, 2025
Merged

Feat/update config #430

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b8681d
feat: update Python cdk-deploy
jeastham1993 Jul 25, 2025
738752e
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Jul 28, 2025
8c7e540
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Aug 8, 2025
07f7b7d
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Aug 29, 2025
c5a9a32
fix: resolve function param mismatch
jeastham1993 Aug 29, 2025
ac36e9e
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Aug 29, 2025
7462120
feat:remove service name rename config
jeastham1993 Sep 1, 2025
a30e351
feat: bump extension version
jeastham1993 Sep 1, 2025
6826883
Update src/order-mcp/lib/order-mcp/orderMcpStack.ts
jeastham1993 Sep 1, 2025
0c2d1c4
Update src/loyalty-point-service/lib/loyalty-api/loyaltyApiStack.ts
jeastham1993 Sep 1, 2025
5f3b8b8
Update src/activity-service/infra/modules/python-lambda-function/main.tf
jeastham1993 Sep 1, 2025
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
4 changes: 2 additions & 2 deletions src/activity-service/cdk/activity_service/service_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def __init__(self, scope: Construct, id: str, is_production_env: bool, **kwargs)
dd_site = os.environ.get("DD_SITE", "datadoghq.com")

self.datadog_configuration = DatadogLambda(self, "DatadogLambda",
python_layer_version=111,
extension_layer_version=83,
python_layer_version=113,
extension_layer_version=85,
service=SERVICE_NAME,
env=environment,
version=version,
Expand Down
13 changes: 6 additions & 7 deletions src/activity-service/infra/modules/lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,18 @@ module "aws_lambda_function" {
version = "2.0.0"

filename = var.zip_file
function_name = "tf-node-${var.function_name}-${var.env}"
function_name = "tf-python-${var.function_name}-${var.env}"
Copy link

Copilot AI Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function name prefix and runtime are being changed from Node.js to Python in what appears to be a generic lambda function module. This could break existing infrastructure or indicate the wrong module is being modified.

Copilot uses AI. Check for mistakes.
role = aws_iam_role.lambda_function_role.arn
handler = var.lambda_handler
runtime = "nodejs22.x"
runtime = "python3.13"
Copy link

Copilot AI Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function name prefix and runtime are being changed from Node.js to Python in what appears to be a generic lambda function module. This could break existing infrastructure or indicate the wrong module is being modified.

Copilot uses AI. Check for mistakes.
memory_size = var.memory_size
logging_config_log_group = aws_cloudwatch_log_group.lambda_log_group.name
source_code_hash = filebase64sha256(var.zip_file)
timeout = var.function_timeout

environment_variables = merge(tomap({
"TEAM": "loyalty"
"DOMAIN": "loyalty"
"TEAM": "activity"
"DOMAIN": "activity"
"DD_API_KEY_SECRET_ARN" : var.dd_api_key_secret_arn
"DD_EXTENSION_VERSION" : "next"
"DD_CAPTURE_LAMBDA_PAYLOAD" : "true"
Expand All @@ -108,14 +108,13 @@ module "aws_lambda_function" {
"DD_VERSION" : var.app_version
"BUILD_ID" : var.app_version
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
"DEPLOYED_AT" : timestamp()
"ENV" : var.env
"POWERTOOLS_SERVICE_NAME" : var.service_name
"POWERTOOLS_LOG_LEVEL" : "INFO" }),
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_node_layer_version = 125
datadog_extension_layer_version = 85
datadog_python_layer_version = 113
}
3 changes: 1 addition & 2 deletions src/activity-service/infra/modules/python-lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ module "aws_lambda_function" {
"DD_VERSION" : var.app_version
"BUILD_ID" : var.app_version
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
"DEPLOYED_AT" : timestamp()
"ENV" : var.env
"POWERTOOLS_SERVICE_NAME" : var.service_name
Expand All @@ -129,6 +128,6 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_extension_layer_version = 85
datadog_python_layer_version = 111
}
4 changes: 2 additions & 2 deletions src/activity-service/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Transform:
Parameters:
stackName: !Ref "AWS::StackName"
apiKey: !Ref DDApiKey
pythonLayerVersion: 111
extensionLayerVersion: '83'
pythonLayerVersion: 113
extensionLayerVersion: '85'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down
4 changes: 2 additions & 2 deletions src/inventory-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Transform:
stackName: !Ref "AWS::StackName"
apiKey: !Ref DDApiKey
dotnetLayerVersion: "20"
extensionLayerVersion: '84'
extensionLayerVersion: '85'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down Expand Up @@ -224,7 +224,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 84
datadog_extension_layer_version = 85
datadog_java_layer_version = 24
}
```
Expand Down
2 changes: 1 addition & 1 deletion src/inventory-service/cdk/src/main/java/com/cdk/constructs/InstrumentedFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public InstrumentedFunction(@NotNull Construct scope, @NotNull String id, @NotNu

List<ILayerVersion> layers = new ArrayList<>(2);
layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogJavaLayer", String.format("arn:aws:lambda:%s:464622532012:layer:dd-trace-java:24",System.getenv("AWS_REGION"))));
layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogLambdaExtension", String.format("arn:aws:lambda:%s:464622532012:layer:Datadog-Extension:84", System.getenv("AWS_REGION"))));
layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogLambdaExtension", String.format("arn:aws:lambda:%s:464622532012:layer:Datadog-Extension:85", System.getenv("AWS_REGION"))));


Asset fileAsset = Asset.Builder.create(this, String.format("%sS3Asset", props.routingExpression()))
Expand Down
3 changes: 1 addition & 2 deletions src/inventory-service/infra/modules/lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,12 @@ module "aws_lambda_function" {
"DD_CAPTURE_LAMBDA_PAYLOAD" : "true"
"DD_LOGS_INJECTION" : "true"
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
"spring_cloud_function_definition" : var.routing_expression
"QUARKUS_LAMBDA_HANDLER": var.routing_expression}),
var.environment_variables
)

datadog_extension_layer_version = 84
datadog_extension_layer_version = 85
datadog_java_layer_version = 24
}

Expand Down
3 changes: 1 addition & 2 deletions src/inventory-service/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Transform:
stackName: !Ref AWS::StackName
apiKey: !Ref DDApiKey
javaLayerVersion: '24'
extensionLayerVersion: '84'
extensionLayerVersion: '85'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down Expand Up @@ -66,7 +66,6 @@ Globals:
ENV: !Ref Env
DD_LOGS_INJECTION: 'true'
DD_DATA_STREAMS_ENABLED: "true"
DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
POWERTOOLS_SERVICE_NAME: !Ref ServiceName
POWERTOOLS_LOG_LEVEL: INFO
AWS_LAMBDA_EXEC_WRAPPER: /opt/datadog_wrapper
Expand Down
8 changes: 4 additions & 4 deletions src/loyalty-point-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ Once installed, you can use the Construct to configure all of your Datadog setti

```typescript
const datadogConfiguration = new Datadog(this, "Datadog", {
nodeLayerVersion: 125,
extensionLayerVersion: '83'
nodeLayerVersion: 127,
extensionLayerVersion: '85'
site: process.env.DD_SITE,
apiKeySecret: ddApiKey,
service,
Expand Down Expand Up @@ -237,8 +237,8 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_node_layer_version = 125
datadog_extension_layer_version = 85
datadog_node_layer_version = 127
}
```

Expand Down
5 changes: 2 additions & 3 deletions src/loyalty-point-service/infra/modules/lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,13 @@ module "aws_lambda_function" {
"DD_VERSION" : var.app_version
"BUILD_ID" : var.app_version
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
"DEPLOYED_AT" : timestamp()
"ENV" : var.env
"POWERTOOLS_SERVICE_NAME" : var.service_name
"POWERTOOLS_LOG_LEVEL" : "INFO" }),
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_node_layer_version = 125
datadog_extension_layer_version = 85
datadog_node_layer_version = 127
}
2 changes: 1 addition & 1 deletion src/loyalty-point-service/lib/loyalty-api/loyaltyApiStack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class LoyaltyApiStack extends cdk.Stack {

const datadogConfiguration = new DatadogLambda(this, "Datadog", {
nodeLayerVersion: 125,
extensionLayerVersion: 83,
extensionLayerVersion: 85,
site: process.env.DD_SITE ?? "datadoghq.com",
apiKeySecret: ddApiKey,
service,
Expand Down
5 changes: 2 additions & 3 deletions src/loyalty-point-service/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Transform:
Parameters:
stackName: !Ref "AWS::StackName"
apiKey: !Ref DDApiKey
nodeLayerVersion: 125
extensionLayerVersion: '83'
nodeLayerVersion: 127
extensionLayerVersion: '85'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down Expand Up @@ -59,7 +59,6 @@ Globals:
POWERTOOLS_LOG_LEVEL: 'INFO'
DD_LOGS_INJECTION: "true"
DD_DATA_STREAMS_ENABLED: "true"
DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
DOMAIN: "products"
Architectures:
- x86_64
Expand Down
8 changes: 4 additions & 4 deletions src/order-mcp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Once installed, you can use the Construct to configure all of your Datadog setti

```typescript
const datadogConfiguration = new Datadog(this, "Datadog", {
nodeLayerVersion: 125,
extensionLayerVersion: 83,
nodeLayerVersion: 127,
extensionLayerVersion: 85,
site: process.env.DD_SITE,
apiKeySecret: ddApiKey,
service,
Expand Down Expand Up @@ -171,8 +171,8 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_node_layer_version = 125
datadog_extension_layer_version = 85
datadog_node_layer_version = 127
}
```

Expand Down
5 changes: 2 additions & 3 deletions src/order-mcp/infra/modules/lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ module "aws_lambda_function" {
"DD_VERSION" : var.app_version
"BUILD_ID" : var.app_version
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
"DEPLOYED_AT" : timestamp()
"ENV" : var.env
"POWERTOOLS_SERVICE_NAME" : var.service_name
Expand All @@ -118,6 +117,6 @@ module "aws_lambda_function" {
)


datadog_extension_layer_version = 83
datadog_node_layer_version = 125
datadog_extension_layer_version = 85
datadog_node_layer_version = 127
}
2 changes: 1 addition & 1 deletion src/order-mcp/lib/order-mcp/orderMcpStack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class OrderMcpStack extends cdk.Stack {

const datadogConfiguration = new DatadogLambda(this, "Datadog", {
nodeLayerVersion: 125,
extensionLayerVersion: 83,
extensionLayerVersion: 85,
site: process.env.DD_SITE ?? "datadoghq.com",
apiKeySecret: ddApiKey,
service,
Expand Down
5 changes: 2 additions & 3 deletions src/order-mcp/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Transform:
Parameters:
stackName: !Ref "AWS::StackName"
apiKey: !Ref DDApiKey
nodeLayerVersion: 125
extensionLayerVersion: '83'
nodeLayerVersion: 127
extensionLayerVersion: '85'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down Expand Up @@ -58,7 +58,6 @@ Globals:
POWERTOOLS_LOG_LEVEL: !If [!Equals [!Ref Env, prod], 'WARN', 'INFO']
DD_LOGS_INJECTION: "true"
DD_DATA_STREAMS_ENABLED: "true"
DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
TEAM: "order-mcp"
DOMAIN: "order-mcp"
BUILD_ID: !Ref CommitHash
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_extension_layer_version = 85
datadog_dotnet_layer_version = 20
}
```
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/cdk/Constructs/InstrumentedFunction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public InstrumentedFunction(Construct scope, string id, FunctionProps props) : b
Layers =
[
LayerVersion.FromLayerVersionArn(this, "DDExtension",
$"arn:aws:lambda:{Environment.GetEnvironmentVariable("AWS_REGION") ?? "us-east-1"}:464622532012:layer:Datadog-Extension-ARM:84"),
$"arn:aws:lambda:{Environment.GetEnvironmentVariable("AWS_REGION") ?? "us-east-1"}:464622532012:layer:Datadog-Extension-ARM:85"),
LayerVersion.FromLayerVersionArn(this, "DDTrace",
$"arn:aws:lambda:{Environment.GetEnvironmentVariable("AWS_REGION") ?? "us-east-1"}:464622532012:layer:dd-trace-dotnet-ARM:20")
]
Expand Down
3 changes: 1 addition & 2 deletions src/order-service/infra/modules/lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,11 @@ module "aws_lambda_function" {
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper"
"DD_LOGS_INJECTION": "true"
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
"POWERTOOLS_SERVICE_NAME": var.service_name
"POWERTOOLS_LOG_LEVEL": "DEBUG"}),
var.environment_variables
)

datadog_extension_layer_version = 84
datadog_extension_layer_version = 85
datadog_dotnet_layer_version = 20
}
3 changes: 1 addition & 2 deletions src/order-service/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Transform:
stackName: !Ref "AWS::StackName"
apiKey: !Ref DDApiKey
dotnetLayerVersion: "20"
extensionLayerVersion: '84'
extensionLayerVersion: '85'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down Expand Up @@ -60,7 +60,6 @@ Globals:
POWERTOOLS_LOG_LEVEL: "INFO"
AWS_LAMBDA_EXEC_WRAPPER: /opt/datadog_wrapper
DD_DATA_STREAMS_ENABLED: "true"
DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: "true"
Architectures:
- x86_64

Expand Down
8 changes: 4 additions & 4 deletions src/pricing-service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Once installed, you can use the Construct to configure all of your Datadog setti

```typescript
const datadogConfiguration = new Datadog(this, "Datadog", {
nodeLayerVersion: 125,
extensionLayerVersion: 83,
nodeLayerVersion: 127,
extensionLayerVersion: 85,
site: process.env.DD_SITE,
apiKeySecret: ddApiKey,
service,
Expand Down Expand Up @@ -171,8 +171,8 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 83
datadog_node_layer_version = 125
datadog_extension_layer_version = 85
datadog_node_layer_version = 127
}
```

Expand Down
1 change: 0 additions & 1 deletion src/pricing-service/infra/modules/lambda-function/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ resource "aws_lambda_function" "function" {
"POWERTOOLS_SERVICE_NAME" = var.service_name
"POWERTOOLS_LOG_LEVEL" = "INFO"
"DD_DATA_STREAMS_ENABLED" = "true"
"DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED" = "true"
}, var.environment_variables)
}
}
2 changes: 0 additions & 2 deletions src/pricing-service/infra/services/pricing/eventHandlers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
# "DD_TRACE_PROPAGATION_STYLE_EXTRACT": "none"
# "DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT": "ignore"
# "DD_DATA_STREAMS_ENABLED": "true"
# "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED": "true"
# }
# dd_api_key_secret_arn = var.dd_api_key_secret_arn
# dd_site = var.dd_site
Expand Down Expand Up @@ -136,7 +135,6 @@
# "DD_TRACE_PROPAGATION_STYLE_EXTRACT": "none"
# "DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT": "ignore"
# "DD_DATA_STREAMS_ENABLED": "true"
# "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED": "true"
# }
# dd_api_key_secret_arn = var.dd_api_key_secret_arn
# dd_site = var.dd_site
Expand Down
Loading
Loading
⚡