refactor(infra): simplify construct configuration and update monitoring setup

Author: Yuriy Bezsonov

apps/unicorn-store-spring-java25/pom.xml

@@ -86,10 +86,6 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-        </dependency>
 
         <!-- Serialization -->
         <dependency>

apps/unicorn-store-spring-java25/src/main/java/com/unicorn/store/config/MonitoringConfig.java

@@ -39,13 +39,6 @@ ObservedAspect observedAspect(ObservationRegistry registry) {
         return new ObservedAspect(registry);
     }
 
-    // Filters actuator endpoints from observations to reduce metric/trace noise
-    @Bean
-    ObservationPredicate noActuatorTraces() {
-        return (name, context) -> !(context instanceof ServerRequestObservationContext ctx &&
-            ctx.getCarrier().getRequestURI().startsWith("/actuator"));
-    }
-
     @PostConstruct
     public void configureMeterRegistry() {
         String clusterType = System.getenv("ECS_CONTAINER_METADATA_URI_V4") != null ? "ecs" : "eks";

infra/README.md

@@ -135,8 +135,7 @@ All scripts implement consistent error handling:
 ### Resource Naming
 
 All AWS resources use a configurable prefix (default: `workshop`) following the pattern `{prefix}-{component}-{function}`:
-- Lambda functions: `workshop-ide-launcher`, `workshop-codebuild-start`
-- CodeBuild: `workshop-setup`
+- Lambda functions: `workshop-ide-launcher`
 - Database: `workshop-db-cluster`, `workshop-db-writer`
 - EKS: `workshop-eks`
 - Secrets: `workshop-db-secret`, `workshop-db-password-secret`
@@ -145,6 +144,47 @@ Exceptions for app-specific compatibility:
 - Unicorn construct uses `unicorn*` naming
 - AiJvmAnalyzer uses `ai-jvm-analyzer-*` naming
 
+### Multi-Instance Construct Support
+
+The infrastructure supports multiple instances of certain constructs with unique, predictable naming:
+
+#### Multi-Instance Capable Constructs
+- **CodeBuild**: Uses `projectName` parameter for all resource naming
+  - CodeBuild project: `{projectName}`
+  - Lambda functions: `{projectName}-start`, `{projectName}-report`
+  - EventBridge rules: Filtered by project name
+- **EcsExpressService**: Uses `appName` parameter for all resource naming
+  - ECS cluster: `{appName}`
+  - ECS service: `{appName}`
+  - CloudWatch log group: `/aws/ecs/{appName}`
+- **Lambda**: Uses `functionName` parameter for function naming
+  - Lambda function: `{functionName}`
+
+#### Singleton Constructs
+These constructs are designed as singletons and should only be instantiated once per stack:
+- **Vpc**: Creates shared VPC infrastructure
+- **Database**: Creates shared Aurora PostgreSQL cluster
+- **Eks**: Creates shared EKS cluster
+- **Unicorn**: Creates shared EventBus and IAM roles with hardcoded names
+- **Ide**: Creates single IDE instance
+- **WorkshopBucket**: Creates shared S3 bucket
+- **EcrRegistry**: Sets account-wide ECR settings
+
+#### Current Multi-Instance Usage
+```java
+// Two CodeBuild instances with unique project names
+new CodeBuild(this, "CodeBuild",
+    CodeBuildProps.builder().projectName("workshop-setup").build());
+new CodeBuild(this, "PlaceholderImageBuild",
+    CodeBuildProps.builder().projectName("workshop-placeholder-images").build());
+
+// Two ECS services with unique app names
+new EcsExpressService(this, "SpringAiAgent",
+    EcsExpressServiceProps.builder().appName("unicorn-spring-ai-agent").build());
+new EcsExpressService(this, "McpServer",
+    EcsExpressServiceProps.builder().appName("unicorn-store-spring").build());
+```
+
 ### Development Tools
 
 The IDE includes comprehensive development tooling:

infra/cdk/src/main/java/sample/com/WorkshopStack.java

@@ -74,7 +74,6 @@ public WorkshopStack(final Construct scope, final String id, final StackProps pr
             // CodeBuild for workshop setup (service-linked role creation)
             new CodeBuild(this, "CodeBuild",
                 CodeBuild.CodeBuildProps.builder()
-                    .prefix(prefix)
                     .projectName(prefix + "-setup")
                     .vpc(vpc.getVpc())
                     .environmentVariables(Map.of(
@@ -160,9 +159,11 @@ public WorkshopStack(final Construct scope, final String id, final StackProps pr
 
                             # Create placeholder Dockerfile
                             cat > /tmp/Dockerfile << 'EOF'
-                            FROM public.ecr.aws/nginx/nginx:stable-alpine
-                            RUN echo 'server { listen 8080; location /actuator/health { return 200 "OK"; } location / { return 200 "Placeholder"; } }' > /etc/nginx/conf.d/default.conf
+                            FROM public.ecr.aws/docker/library/nginx:stable
+                            RUN echo '<html><body><h1>Hello World!</h1><p>Build timestamp: '$(date)'</p></body></html>' > /usr/share/nginx/html/index.html
+                            RUN sed -i 's/listen\\s*80;/listen 8080;/' /etc/nginx/conf.d/default.conf
                             EXPOSE 8080
+                            CMD ["nginx", "-g", "daemon off;"]
                             EOF
 
                             # Build and push placeholder to both repos (create-on-push creates repos)
@@ -175,7 +176,6 @@ public WorkshopStack(final Construct scope, final String id, final StackProps pr
 
                 CodeBuild placeholderImageBuild = new CodeBuild(this, "PlaceholderImageBuild",
                     CodeBuild.CodeBuildProps.builder()
-                        .prefix(prefix)
                         .projectName(prefix + "-placeholder-images")
                         .vpc(vpc.getVpc())
                         .privilegedMode(true)

infra/cdk/src/main/java/sample/com/constructs/CodeBuild.java

@@ -24,7 +24,6 @@ public class CodeBuild extends Construct {
     private final Role lambdaRole;
 
     public static class CodeBuildProps {
-        private String prefix = "workshop";
         private String projectName = "workshop-setup";
         private IBuildImage buildImage = LinuxBuildImage.AMAZON_LINUX_2_5;
         private ComputeType computeType = ComputeType.MEDIUM;
@@ -39,7 +38,6 @@ public static class CodeBuildProps {
         public static class Builder {
             private CodeBuildProps props = new CodeBuildProps();
 
-            public Builder prefix(String prefix) { props.prefix = prefix; return this; }
             public Builder projectName(String projectName) { props.projectName = projectName; return this; }
             public Builder buildImage(IBuildImage buildImage) { props.buildImage = buildImage; return this; }
             public Builder computeType(ComputeType computeType) { props.computeType = computeType; return this; }
@@ -53,7 +51,6 @@ public static class Builder {
         }
 
         // Getters
-        public String getPrefix() { return prefix; }
         public String getProjectName() { return projectName; }
         public IBuildImage getBuildImage() { return buildImage; }
         public ComputeType getComputeType() { return computeType; }
@@ -75,8 +72,6 @@ public CodeBuild(final Construct scope, final String id, final IVpc vpc, final M
     public CodeBuild(final Construct scope, final String id, final CodeBuildProps props) {
         super(scope, id);
 
-        String prefix = props.getPrefix();
-
         // Create CodeBuild service role
         this.codeBuildRole = Role.Builder.create(this, "Role")
             .assumedBy(ServicePrincipal.Builder.create("codebuild.amazonaws.com").build())
@@ -135,12 +130,12 @@ public CodeBuild(final Construct scope, final String id, final CodeBuildProps pr
 
         // Create start build Lambda function
         var startLambda = new Lambda(this, "StartLambda",
-            "/lambda/codebuild-start.py", prefix + "-codebuild-start", Duration.minutes(2), lambdaRole);
+            "/lambda/codebuild-start.py", props.getProjectName() + "-start", Duration.minutes(2), lambdaRole);
         Function startBuildFunction = startLambda.getFunction();
 
         // Create report build Lambda function
         var reportLambda = new Lambda(this, "ReportLambda",
-            "/lambda/codebuild-report.py", prefix + "-codebuild-report", Duration.minutes(2), lambdaRole);
+            "/lambda/codebuild-report.py", props.getProjectName() + "-report", Duration.minutes(2), lambdaRole);
         Function reportBuildFunction = reportLambda.getFunction();
 
         // Create EventBridge rule for build completion

infra/cdk/src/main/java/sample/com/constructs/EcsExpressService.java

@@ -89,7 +89,7 @@ public EcsExpressService(final Construct scope, final String id, final EcsExpres
                 .build())
             .cpu("1024")
             .memory("2048")
-            .healthCheckPath("/actuator/health")
+            .healthCheckPath("/")
             .networkConfiguration(CfnExpressGatewayService.ExpressGatewayServiceNetworkConfigurationProperty.builder()
                 .subnets(publicSubnetIds)
                 .securityGroups(List.of(dbSecurityGroupId))

infra/cfn/base-stack.yaml

@@ -676,29 +676,6 @@ Resources:
         Fn::GetAtt:
           - IdeInstanceLauncherFunction803C5A2A
           - Arn
-      SecurityGroupIds:
-        Fn::Join:
-          - ""
-          - - Fn::GetAtt:
-                - IdeSecurityGroup73B02454
-                - GroupId
-            - ","
-            - Fn::GetAtt:
-                - IdeInternalSecurityGroupB0A5D76B
-                - GroupId
-      SubnetIds:
-        Fn::Join:
-          - ""
-          - - Ref: VpcPublicSubnet1Subnet8E8DEDC0
-            - ","
-            - Ref: VpcPublicSubnet2SubnetA811849C
-      VolumeSize: "50"
-      IamInstanceProfileArn:
-        Fn::GetAtt:
-          - IdeInstanceProfile61B92038
-          - Arn
-      InstanceName: ide
-      InstanceTypes: m6a.xlarge,m7a.xlarge
       UserData:
         Fn::Base64:
           Fn::Join:
@@ -835,6 +812,29 @@ Resources:
                 "
                     exit 1
                 fi
+      InstanceTypes: m6a.xlarge,m7a.xlarge
+      InstanceName: ide
+      IamInstanceProfileArn:
+        Fn::GetAtt:
+          - IdeInstanceProfile61B92038
+          - Arn
+      VolumeSize: "50"
+      SubnetIds:
+        Fn::Join:
+          - ""
+          - - Ref: VpcPublicSubnet1Subnet8E8DEDC0
+            - ","
+            - Ref: VpcPublicSubnet2SubnetA811849C
+      SecurityGroupIds:
+        Fn::Join:
+          - ""
+          - - Fn::GetAtt:
+                - IdeSecurityGroup73B02454
+                - GroupId
+            - ","
+            - Fn::GetAtt:
+                - IdeInternalSecurityGroupB0A5D76B
+                - GroupId
       ImageId:
         Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
     UpdateReplacePolicy: Delete

infra/cfn/java-on-amazon-eks-stack.yaml

@@ -794,18 +794,19 @@ Resources:
         Fn::GetAtt:
           - IdeInstanceLauncherFunction803C5A2A
           - Arn
-      SecurityGroupIds:
+      SubnetIds:
         Fn::Join:
           - ""
-          - - Fn::GetAtt:
-                - IdeSecurityGroup73B02454
-                - GroupId
+          - - Ref: VpcPublicSubnet1Subnet8E8DEDC0
             - ","
-            - Fn::GetAtt:
-                - IdeInternalSecurityGroupB0A5D76B
-                - GroupId
-      ImageId:
-        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
+            - Ref: VpcPublicSubnet2SubnetA811849C
+      VolumeSize: "50"
+      IamInstanceProfileArn:
+        Fn::GetAtt:
+          - IdeInstanceProfile61B92038
+          - Arn
+      InstanceName: ide
+      InstanceTypes: m6a.xlarge,m7a.xlarge
       UserData:
         Fn::Base64:
           Fn::Join:
@@ -942,19 +943,18 @@ Resources:
                 "
                     exit 1
                 fi
-      InstanceTypes: m6a.xlarge,m7a.xlarge
-      InstanceName: ide
-      IamInstanceProfileArn:
-        Fn::GetAtt:
-          - IdeInstanceProfile61B92038
-          - Arn
-      VolumeSize: "50"
-      SubnetIds:
+      ImageId:
+        Ref: SsmParameterValueawsserviceamiamazonlinuxlatestal2023amikernel61x8664C96584B6F00A464EAD1953AFF4B05118Parameter
+      SecurityGroupIds:
         Fn::Join:
           - ""
-          - - Ref: VpcPublicSubnet1Subnet8E8DEDC0
+          - - Fn::GetAtt:
+                - IdeSecurityGroup73B02454
+                - GroupId
             - ","
-            - Ref: VpcPublicSubnet2SubnetA811849C
+            - Fn::GetAtt:
+                - IdeInternalSecurityGroupB0A5D76B
+                - GroupId
     UpdateReplacePolicy: Delete
     DeletionPolicy: Delete
   IdeEipAssociationDFF81215:
@@ -1333,12 +1333,12 @@ Resources:
       Environment:
         ComputeType: BUILD_GENERAL1_MEDIUM
         EnvironmentVariables:
-          - Name: GIT_BRANCH
-            Type: PLAINTEXT
-            Value: new-ws-infra
           - Name: TEMPLATE_TYPE
             Type: PLAINTEXT
             Value: java-on-amazon-eks
+          - Name: GIT_BRANCH
+            Type: PLAINTEXT
+            Value: new-ws-infra
         Image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: false
@@ -1460,7 +1460,7 @@ Resources:
                   responseData = {'Error': tb_err}
 
               cfnresponse.send(event, context, status, responseData, physical_id)
-      FunctionName: workshop-codebuild-start
+      FunctionName: workshop-setup-start
       Handler: index.lambda_handler
       Role:
         Fn::GetAtt:
@@ -1526,7 +1526,7 @@ Resources:
                           'error': str(e)
                       })
                   }
-      FunctionName: workshop-codebuild-report
+      FunctionName: workshop-setup-report
       Handler: index.lambda_handler
       Role:
         Fn::GetAtt:
@@ -1543,12 +1543,12 @@ Resources:
       Description: workshop-setup build complete
       EventPattern:
         detail:
+          project-name:
+            - Ref: CodeBuildProjectA0FF5539
           build-status:
             - SUCCEEDED
             - FAILED
             - STOPPED
-          project-name:
-            - Ref: CodeBuildProjectA0FF5539
         detail-type:
           - CodeBuild Build State Change
         source:
@@ -1580,13 +1580,13 @@ Resources:
         Fn::GetAtt:
           - CodeBuildStartLambdaFunction8349284F
           - Arn
+      ProjectName:
+        Ref: CodeBuildProjectA0FF5539
+      ContentHash: "1767604218045"
       CodeBuildIamRoleArn:
         Fn::GetAtt:
           - CodeBuildRoleE9A44575
           - Arn
-      ContentHash: "1767557212506"
-      ProjectName:
-        Ref: CodeBuildProjectA0FF5539
     DependsOn:
       - CodeBuildCompleteRuleAllowEventRuleWorkshopStackCodeBuildReportLambdaFunctionD77C60919E0B0C89
       - CodeBuildCompleteRuleEE9277E8
@@ -1944,7 +1944,7 @@ Resources:
             - Ref: AWS::AccountId
             - "-"
             - Ref: AWS::Region
-            - "-20260104210652"
+            - "-20260105101018"
       PublicAccessBlockConfiguration:
         BlockPublicAcls: true
         BlockPublicPolicy: true
@@ -2703,12 +2703,12 @@ Resources:
               }
       Environment:
         Variables:
-          SECRET_NAME: workshop-ide-password
-          EKS_CLUSTER_NAME:
-            Ref: EksClusterB2BDED5B
+          S3_THREAD_DUMPS_PREFIX: thread-dumps/
           S3_BUCKET_NAME:
             Ref: WorkshopBucketFD5BC43F
-          S3_THREAD_DUMPS_PREFIX: thread-dumps/
+          EKS_CLUSTER_NAME:
+            Ref: EksClusterB2BDED5B
+          SECRET_NAME: workshop-ide-password
       FunctionName: workshop-thread-dump-lambda
       Handler: index.lambda_handler
       MemorySize: 512