Merge branch 'main' into blaze-views-1

rajadilipkolli · Jun 14, 2024 · 8f7715a · 8f7715a
2 parents b505c55 + b11a0ee
commit 8f7715a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ orbs:
 executors:
   machine_executor_amd64:
     machine:
-      image: ubuntu-2204:current
+      image: ubuntu-2404:current
     environment:
       architecture: "amd64"
       platform: "linux/amd64"

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -8,7 +8,7 @@ vscode:
   extensions:
     - Pivotal.vscode-boot-dev-pack
     - vscjava.vscode-java-pack
-    - richardwillis.vscode-gradle
+    - vscjava.vscode-gradle
 
 ports:
   - port: 8080

diff --git a/Dockerfile b/Dockerfile
diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ group = "com.learning.mfscreener"
 version = "0.0.1-SNAPSHOT"
 
 java {
-  sourceCompatibility = '17'
-  targetCompatibility = '17'
+  sourceCompatibility = '21'
+  targetCompatibility = '21'
 }
 
 configurations {
@@ -208,4 +208,4 @@ eclipse {
             entries.add(src)
         }
     }
-}
+}
diff --git a/docker/docker-compose-monitoring.yml b/docker/docker-compose-monitoring.yml
@@ -28,7 +28,7 @@ services:
       - --config.file=/etc/prometheus/prometheus.yml
 
   loki:
-    image: grafana/loki:2.9.8
+    image: grafana/loki:3.0.0
     container_name: loki
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
     command: -config.file=/etc/loki/local-config.yaml

diff --git a/src/main/java/com/learning/mfscreener/config/logging/LoggingAspect.java b/src/main/java/com/learning/mfscreener/config/logging/LoggingAspect.java
@@ -137,11 +137,13 @@ private void logExecutionDetails(ProceedingJoinPoint joinPoint, LogLevel logLeve
     private void logMethodParamsIfEnabled(ProceedingJoinPoint joinPoint, LogLevel logLevel, String methodName) {
         boolean printParams = shouldLog(joinPoint, Loggable::params);
 
-        if (printParams && !ObjectUtils.isEmpty(joinPoint.getArgs())) {
+        if (printParams && joinPoint.getArgs() != null && !ObjectUtils.isEmpty(joinPoint.getArgs())) {
             String[] parameterNames = ((MethodSignature) joinPoint.getSignature()).getParameterNames();
-            List<String> stringArrayList = getParamsList(joinPoint, parameterNames);
-            String argsString = String.join(", ", stringArrayList);
-            logExecutionDetails(joinPoint, logLevel, methodName + "() args :: -> " + argsString);
+            if (parameterNames != null) {
+                List<String> stringArrayList = getParamsList(joinPoint, parameterNames);
+                String argsString = String.join(", ", stringArrayList);
+                logExecutionDetails(joinPoint, logLevel, methodName + "() args :: -> " + argsString);
+            }
         }
     }
 

diff --git a/src/test/java/com/learning/mfscreener/TestApplication.java b/src/test/java/com/learning/mfscreener/TestApplication.java
@@ -1,6 +1,7 @@
 package com.learning.mfscreener;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.devtools.restart.RestartScope;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
@@ -13,18 +14,21 @@ public class TestApplication {
 
     @Bean
     @ServiceConnection(name = "redis")
+    @RestartScope
     GenericContainer<?> redisContainer() {
         return new GenericContainer<>(DockerImageName.parse("redis").withTag("7.2.4-alpine")).withExposedPorts(6379);
     }
 
     @Bean
     @ServiceConnection
+    @RestartScope
     PostgreSQLContainer<?> postgreSQLContainer() {
         return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16-alpine"));
     }
 
     @Bean
     @ServiceConnection(name = "openzipkin/zipkin")
+    @RestartScope
     GenericContainer<?> zipkinContainer() {
         return new GenericContainer<>("openzipkin/zipkin:latest").withExposedPorts(9411);
     }