WIP: refactoring

Author: Yuriy Bezsonov

apps/unicorn-store-spring/pom.xml

@@ -62,7 +62,6 @@
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>1.14.7</version>
         </dependency>
         <!-- AWS SDK dependencies -->
         <dependency>

apps/unicorn-store-spring/src/main/resources/application.properties

@@ -16,15 +16,12 @@ spring.datasource.hikari.data-source-properties.preparedStatementCacheQueries=0
 spring.threads.virtual.enabled=true
 
 # Actuator config
-spring.jmx-enabled=true
+spring.jmx.enabled=true
 management.endpoints.web.exposure.include=threaddump,prometheus,health,info
 management.endpoint.health.probes.enabled=true
-management.endpoint.prometheus.enabled=true
+management.endpoint.prometheus.access=unrestricted
 management.endpoint.health.group.liveness.include=livenessState
 management.endpoint.health.group.readiness.include=readinessState
 
 management.metrics.enable.all=true
 management.metrics.tags.application=otel-jmx-unicorn-store
-
-server.port=8080
-server.address=0.0.0.0

infrastructure/cdk/pom.xml

@@ -75,10 +75,5 @@
           <version>${junit.version}</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>software.constructs</groupId>
-            <artifactId>constructs</artifactId>
-            <version>10.3.0</version>
-        </dependency>
     </dependencies>
 </project>

infrastructure/cdk/src/main/java/com/unicorn/UnicornStoreStack.java

@@ -32,7 +32,10 @@ public class UnicornStoreStack extends Stack {
         echo '=== Additional Setup ===\n'
         sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/app.sh"
         sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/eks.sh"
+
         sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/monitoring.sh"
+        sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/thread-dump-lambda/build-and-deploy.sh"
+        sudo -H -i -u ec2-user bash -c "~/java-on-aws/infrastructure/scripts/setup/monitoring-jvm.sh"
         """;
 
     private final String buildspec = """
@@ -64,14 +67,9 @@ public UnicornStoreStack(final Construct scope, final String id) {
         // Create VPC
         var vpc = new WorkshopVpc(this, "UnicornStoreVpc", "unicornstore-vpc").getVpc();
 
-        String bootstrapScriptWithRegion = bootstrapScript + String.format(
-                "sudo -H -i -u ec2-user bash -c \"cd ~/java-on-aws/infrastructure/lambda/ && ./build-and-deploy.sh --region %s\"",
-                this.getRegion()
-        );
-
         // Create VSCode IDE
         var ideProps = new VSCodeIdeProps();
-            ideProps.setBootstrapScript(bootstrapScriptWithRegion);
+            ideProps.setBootstrapScript(bootstrapScript);
             ideProps.setVpc(vpc);
             ideProps.setInstanceName("unicornstore-ide");
             ideProps.setInstanceType(InstanceType.of(InstanceClass.M5, InstanceSize.XLARGE));
@@ -99,11 +97,8 @@ public UnicornStoreStack(final Construct scope, final String id) {
         new InfrastructureContainers(this, "InfrastructureContainers", infrastructureCore);
         new InfrastructureEks(this, "InfrastructureEks", infrastructureCore);
 
-        // Create Lambda function to create thread dump (after InfrastructureEks)
-        InfrastructureLambdaBedrock lambdaBedrock = new InfrastructureLambdaBedrock(this, "InfrastructureLambdaBedrock", this.getRegion(), infrastructureCore.getWorkshopBucket(), eksCluster, vpc);
-
-        // Create Prometheus and Grafana infrastructure. Create Grafana dashboards (after InfrastructureEks)
-        MonitoringConstruct monitoring = new MonitoringConstruct(this, "Monitoring", vpc, eksCluster.getCluster(), lambdaBedrock.getThreadDumpFunction());
+        // Create JVM monitoring infrastructure with Lambda thread dump
+        new InfrastructureMonitoringJVM(this, "InfrastructureMonitoringJVM", infrastructureCore.getWorkshopBucket(), eksCluster, vpc);
 
         // Execute Database setup
         var databaseSetup = new DatabaseSetup(this, "UnicornStoreDatabaseSetup", infrastructureCore);

infrastructure/cdk/src/main/java/com/unicorn/core/AnalysisBucketProps.java

@@ -28,6 +28,7 @@
 import software.amazon.awscdk.RemovalPolicy;
 import software.amazon.awscdk.SecretValue;
 import software.amazon.awscdk.SecretsManagerSecretOptions;
+import software.amazon.awscdk.Stack;
 import software.constructs.Construct;
 
 import java.util.List;
@@ -67,8 +68,18 @@ public InfrastructureCore(final Construct scope, final String id, final IVpc vpc
     }
 
     private Bucket createWorkshopBucket() {
+        String timestamp = java.time.LocalDateTime.now().format(
+            java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmss")
+        );
+        String bucketName = String.format("workshop-%s-%s-%s",
+            Stack.of(this).getAccount(),
+            Stack.of(this).getRegion(),
+            timestamp
+        );
+
         var workshopBucket = Bucket.Builder
             .create(this, "WorkshopBucket")
+            .bucketName(bucketName)
             .blockPublicAccess(BlockPublicAccess.BLOCK_ALL)
             .enforceSsl(true)
             .removalPolicy(RemovalPolicy.DESTROY)