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
4 changes: 2 additions & 2 deletions src/activity-service/cdk/activity_service/service_stack.py
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=113,
extension_layer_version=85,
python_layer_version=118,
extension_layer_version=90,
service=SERVICE_NAME,
env=environment,
version=version,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_python_layer_version = 113
}
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,6 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_python_layer_version = 113
}
2 changes: 1 addition & 1 deletion src/activity-service/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Transform:
stackName: !Ref "AWS::StackName"
apiKey: !Ref DDApiKey
pythonLayerVersion: 113
extensionLayerVersion: '85'
extensionLayerVersion: '90'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down
4 changes: 2 additions & 2 deletions src/inventory-service/README.md
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: '85'
extensionLayerVersion: '90'
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 = 85
datadog_extension_layer_version = 90
datadog_java_layer_version = 24
}
```
Expand Down
6 changes: 3 additions & 3 deletions src/loyalty-point-service/README.md
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: 127,
extensionLayerVersion: '85'
nodeLayerVersion: 130,
extensionLayerVersion: '90'
site: process.env.DD_SITE,
apiKeySecret: ddApiKey,
service,
Expand Down Expand Up @@ -237,7 +237,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_node_layer_version = 127
}
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_node_layer_version = 127
datadog_extension_layer_version = 90
datadog_node_layer_version = 130
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export class LoyaltyApiStack extends cdk.Stack {
});

const datadogConfiguration = new DatadogLambda(this, "Datadog", {
nodeLayerVersion: 127,
extensionLayerVersion: 87,
nodeLayerVersion: 130,
extensionLayerVersion: 90,
site: process.env.DD_SITE ?? "datadoghq.com",
apiKeySecret: ddApiKey,
service,
Expand Down
4 changes: 2 additions & 2 deletions src/loyalty-point-service/template.yaml
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: 127
extensionLayerVersion: '85'
nodeLayerVersion: 130
extensionLayerVersion: '90'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down
6 changes: 3 additions & 3 deletions src/order-mcp/README.md
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: 127,
extensionLayerVersion: 85,
nodeLayerVersion: 130,
extensionLayerVersion: '90',
site: process.env.DD_SITE,
apiKeySecret: ddApiKey,
service,
Expand Down Expand Up @@ -171,7 +171,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_node_layer_version = 127
}
```
Expand Down
4 changes: 2 additions & 2 deletions src/order-mcp/infra/modules/lambda-function/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ module "aws_lambda_function" {
)


datadog_extension_layer_version = 85
datadog_node_layer_version = 127
datadog_extension_layer_version = 90
datadog_node_layer_version = 130
}
4 changes: 2 additions & 2 deletions src/order-mcp/lib/order-mcp/orderMcpStack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export class OrderMcpStack extends cdk.Stack {
});

const datadogConfiguration = new DatadogLambda(this, "Datadog", {
nodeLayerVersion: 127,
extensionLayerVersion: 85,
nodeLayerVersion: 130,
extensionLayerVersion: 90,
site: process.env.DD_SITE ?? "datadoghq.com",
apiKeySecret: ddApiKey,
service,
Expand Down
4 changes: 2 additions & 2 deletions src/order-mcp/template.yaml
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: 127
extensionLayerVersion: '85'
nodeLayerVersion: 130
extensionLayerVersion: '90'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/README.md
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 = 85
datadog_extension_layer_version = 90
datadog_dotnet_layer_version = 20
}
```
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/cdk/Constructs/InstrumentedFunction.cs
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:85"),
$"arn:aws:lambda:{Environment.GetEnvironmentVariable("AWS_REGION") ?? "us-east-1"}:464622532012:layer:Datadog-Extension-ARM:90"),
LayerVersion.FromLayerVersionArn(this, "DDTrace",
$"arn:aws:lambda:{Environment.GetEnvironmentVariable("AWS_REGION") ?? "us-east-1"}:464622532012:layer:dd-trace-dotnet-ARM:20")
]
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/infra/modules/lambda-function/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_dotnet_layer_version = 20
}
2 changes: 1 addition & 1 deletion src/order-service/template.yaml
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: '85'
extensionLayerVersion: '90'
service: !Ref ServiceName
env: !Ref Env
version: !Ref CommitHash
Expand Down
6 changes: 3 additions & 3 deletions src/pricing-service/README.md
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: 127,
extensionLayerVersion: 85,
nodeLayerVersion: 130,
extensionLayerVersion: '90',
site: process.env.DD_SITE,
apiKeySecret: ddApiKey,
service,
Expand Down Expand Up @@ -171,7 +171,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_node_layer_version = 127
}
```
Expand Down
2 changes: 1 addition & 1 deletion src/product-management-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
}
```

Expand Down
2 changes: 1 addition & 1 deletion src/product-management-service/cdk/cdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func NewProductService(scope constructs.Construct, id string, props *ProductServ
stack,
jsii.String("Datadog"),
&ddcdkconstruct.DatadogProps{
ExtensionLayerVersion: jsii.Number(85),
ExtensionLayerVersion: jsii.Number(90),
AddLayers: jsii.Bool(true),
Site: jsii.String(os.Getenv("DD_SITE")),
ApiKeySecret: ddApiKeySecret,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,5 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
}
2 changes: 1 addition & 1 deletion src/product-management-service/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Globals:
Timeout: 29
MemorySize: 512
Layers:
- !Sub arn:aws:lambda:${AWS::Region}:464622532012:layer:Datadog-Extension-ARM:85
- !Sub arn:aws:lambda:${AWS::Region}:464622532012:layer:Datadog-Extension-ARM:90
Environment:
Variables:
ENV: !Ref Env
Expand Down
6 changes: 3 additions & 3 deletions src/shared-infra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Once installed, you can use the Construct to configure all of your Datadog setti

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

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_node_layer_version = 127
}
```
Expand Down
6 changes: 3 additions & 3 deletions src/user-management-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ Once installed, you can use the Construct to configure all of your Datadog setti

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

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
}
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,14 @@ module "aws_lambda_function" {
"RUST_LOG": "info",
"DD_DATA_STREAMS_ENABLED" = "true"
"POWERTOOLS_SERVICE_NAME": var.service_name
"POWERTOOLS_LOG_LEVEL": "INFO" }),
"POWERTOOLS_LOG_LEVEL": "INFO",
"DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT": "localhost:4318",
"DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT": "localhost:4317",
"OTEL_EXPORTER_OTLP_ENDPOINT": "http://localhost:4317",
"OTEL_SERVICE_NAME": var.function_name,
}),
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export class InstrumentedLambdaFunction extends Construct {
memorySize: 256,
environment: {
DEPLOYED_AT: new Date().toISOString(),
DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT: "localhost:4318",
DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT: "localhost:4317",
OTEL_EXPORTER_OTLP_ENDPOINT: "http://localhost:4317",
OTEL_SERVICE_NAME: props.functionName,
BUILD_ID: props.sharedProps.version,
TEAM: props.sharedProps.team,
DOMAIN: props.sharedProps.domain,
Expand Down
4 changes: 4 additions & 0 deletions src/user-management-service/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ Globals:
DD_SITE: !Ref DDSite
DD_VERSION: !Ref CommitHash
DD_SERVICE: !Ref ServiceName
DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT: "localhost:4318"
DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT: "localhost:4317"
OTEL_EXPORTER_OTLP_ENDPOINT: "http://localhost:4317"
OTEL_SERVICE_NAME: var.function_name
TABLE_NAME: !Ref UserTable
RUST_LOG: "info"
DD_DATA_STREAMS_ENABLED: "true"
Expand Down
Loading