chore: bump extension versions

build.sh

@@ -8,32 +8,44 @@ npm i
 popd
 
 pushd src/inventory-service
+echo "Building inventory service..."
 mvn clean package -DskipTests &>../../build-logs/inventory-service.log
 popd
 
 pushd src/user-management-service
+echo "Building user management service..."
 npm i &>../../build-logs/user-management-service.log
 ./package.sh &>../../build-logs/user-management-service.log
 popd
 
 pushd src/loyalty-point-service
+echo "Building loyalty point service..."
 npm i &>../../build-logs/loyalty-point-service.log
 ./package.sh &>../../build-logs/loyalty-point-service.log
 popd
 
 pushd src/pricing-service
+echo "Building pricing service..."
 npm i &>../../build-logs/pricing-service.log
 ./package.sh &>../../build-logs/pricing-service.log
 popd
 
 pushd src/order-service
+echo "Building order service..."
 dotnet restore &>../../build-logs/order-service.log
 popd
 
 pushd src/order-service/src/Orders.BackgroundWorkers
+echo "Building order background workers..."
 dotnet lambda package &>../../../../build-logs/order-service.log
 popd
 
 pushd src/product-management-service
+echo "Building product management service..."
 make build &>../../build-logs/product-service.log
 popd
+
+pushd src/activity-service
+echo "Building activity service..."
+make dev && make build &>../../build-logs/activity-service.log
+popd

cdk-deploy

@@ -38,7 +38,7 @@ popd
 pushd src/activity-service
 npm i
 ./package.sh
-npx cdk deploy --require-approval=never &>../../deployment-logs/activity-service.log &
+cdk deploy --require-approval=never &>../../deployment-logs/activity-service.log &
 popd
 
 # Print deployment status

src/activity-service/README.md

@@ -94,7 +94,7 @@ Transform:
       stackName: !Ref "AWS::StackName"
       apiKey: !Ref DDApiKey
       dotnetLayerVersion: "20"
-      extensionLayerVersion: "80"
+      extensionLayerVersion: '83'
       service: !Ref ServiceName
       env: !Ref Env
       version: !Ref CommitHash

src/activity-service/cdk/activity_service/service_stack.py

@@ -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=109,
-            extension_layer_version=81,
+            python_layer_version=111,
+            extension_layer_version=83,
             service=SERVICE_NAME,
             env=environment,
             version=version,

src/activity-service/infra/modules/lambda-function/main.tf

@@ -116,6 +116,6 @@ module "aws_lambda_function" {
     var.environment_variables
   )
 
-  datadog_extension_layer_version = 80
+  datadog_extension_layer_version = 83
   datadog_node_layer_version = 125
 }

src/activity-service/infra/modules/python-lambda-function/main.tf

@@ -129,6 +129,6 @@ module "aws_lambda_function" {
     var.environment_variables
   )
 
-  datadog_extension_layer_version = 82
-  datadog_python_layer_version    = 110
+  datadog_extension_layer_version = 83
+  datadog_python_layer_version    = 111
 }

src/activity-service/template.yaml

@@ -13,7 +13,7 @@ Transform:
       stackName: !Ref "AWS::StackName"
       apiKey: !Ref DDApiKey
       pythonLayerVersion: 111
-      extensionLayerVersion: 82
+      extensionLayerVersion: '83'
       service: !Ref ServiceName
       env: !Ref Env
       version: !Ref CommitHash

src/inventory-service/README.md

@@ -97,7 +97,7 @@ Transform:
       stackName: !Ref "AWS::StackName"
       apiKey: !Ref DDApiKey
       dotnetLayerVersion: "20"
-      extensionLayerVersion: "80"
+      extensionLayerVersion: '83'
       service: !Ref ServiceName
       env: !Ref Env
       version: !Ref CommitHash
@@ -176,8 +176,8 @@ module "aws_lambda_function" {
     var.environment_variables
   )
 
-  datadog_extension_layer_version = 80
-  datadog_java_layer_version      = 19
+  datadog_extension_layer_version = 83
+  datadog_java_layer_version      = 21
 }
 ```
 

src/inventory-service/cdk/src/main/java/com/cdk/constructs/InstrumentedFunction.java

@@ -8,6 +8,9 @@
 
 import org.jetbrains.annotations.NotNull;
 import software.amazon.awscdk.Duration;
+import software.amazon.awscdk.services.iam.Effect;
+import software.amazon.awscdk.services.iam.PolicyStatement;
+import software.amazon.awscdk.services.iam.PolicyStatementProps;
 import software.amazon.awscdk.services.lambda.*;
 import software.amazon.awscdk.services.lambda.Runtime;
 import software.amazon.awscdk.services.lambda.VersionProps;
@@ -16,10 +19,7 @@
 import software.amazon.awscdk.services.s3.assets.Asset;
 import software.constructs.Construct;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class InstrumentedFunction extends Construct {
     private final IFunction function;
@@ -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:21",System.getenv("AWS_REGION"))));
-        layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogLambdaExtension", String.format("arn:aws:lambda:%s:464622532012:layer:Datadog-Extension:80", System.getenv("AWS_REGION"))));
+        layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogLambdaExtension", String.format("arn:aws:lambda:%s:464622532012:layer:Datadog-Extension:83", System.getenv("AWS_REGION"))));
 
 
         Asset fileAsset = Asset.Builder.create(this, String.format("%sS3Asset", props.routingExpression()))
@@ -91,15 +91,15 @@ public InstrumentedFunction(@NotNull Construct scope, @NotNull String id, @NotNu
         }
 
         // The Datadog extension sends log data to Datadog using the telemetry API, disabling CloudWatch prevents 'double paying' for logs
-//        if (System.getenv("ENABLE_CLOUDWATCH_LOGS") != "Y") {
-//            this.function.addToRolePolicy(new PolicyStatement(PolicyStatementProps.builder()
-//                    .actions(List.of("logs:CreateLogGroup",
-//                            "logs:CreateLogStream",
-//                            "logs:PutLogEvents"))
-//                    .resources(List.of("arn:aws:logs:*:*:*"))
-//                    .effect(Effect.DENY)
-//                    .build()));
-//        }
+        if (!Objects.equals(System.getenv("ENABLE_CLOUDWATCH_LOGS"), "Y")) {
+            this.function.addToRolePolicy(new PolicyStatement(PolicyStatementProps.builder()
+                    .actions(List.of("logs:CreateLogGroup",
+                            "logs:CreateLogStream",
+                            "logs:PutLogEvents"))
+                    .resources(List.of("arn:aws:logs:*:*:*"))
+                    .effect(Effect.DENY)
+                    .build()));
+        }
 
         props.sharedProps().ddApiKeySecret().grantRead(this.function);
     }

src/inventory-service/infra/modules/lambda-function/main.tf

@@ -125,7 +125,7 @@ module "aws_lambda_function" {
     var.environment_variables
   )
 
-  datadog_extension_layer_version = 80
+  datadog_extension_layer_version = 83
   datadog_java_layer_version      = 21
 }
 

src/inventory-service/template.yaml

@@ -13,7 +13,7 @@ Transform:
       stackName: !Ref AWS::StackName
       apiKey: !Ref DDApiKey
       javaLayerVersion: '21'
-      extensionLayerVersion: '80'
+      extensionLayerVersion: '83'
       service: !Ref ServiceName
       env: !Ref Env
       version: !Ref CommitHash

src/loyalty-point-service/README.md

@@ -30,7 +30,7 @@ Once installed, you can use the Construct to configure all of your Datadog setti
 ```typescript
 const datadogConfiguration = new Datadog(this, "Datadog", {
   nodeLayerVersion: 125,
-  extensionLayerVersion: 80,
+  extensionLayerVersion: '83'
   site: process.env.DD_SITE,
   apiKeySecret: ddApiKey,
   service,
@@ -171,7 +171,7 @@ module "aws_lambda_function" {
     var.environment_variables
   )
 
-  datadog_extension_layer_version = 80
+  datadog_extension_layer_version = 83
   datadog_node_layer_version      = 125
 }
 ```

src/loyalty-point-service/infra/modules/lambda-function/main.tf

@@ -116,6 +116,6 @@ module "aws_lambda_function" {
     var.environment_variables
   )
 
-  datadog_extension_layer_version = 80
+  datadog_extension_layer_version = 83
   datadog_node_layer_version = 125
 }

src/loyalty-point-service/lib/loyalty-api/loyaltyApiStack.ts

@@ -31,7 +31,7 @@ export class LoyaltyApiStack extends cdk.Stack {
 
     const datadogConfiguration = new DatadogLambda(this, "Datadog", {
       nodeLayerVersion: 125,
-      extensionLayerVersion: 80,
+      extensionLayerVersion: 83,
       site: process.env.DD_SITE ?? "datadoghq.com",
       apiKeySecret: ddApiKey,
       service,