Merge pull request #21 from pagopa/develop

Develop

src/main/java/it/pagopa/interop/probing/eservice/registry/reader/InteropProbingApplication.java

@@ -1,5 +1,7 @@
 package it.pagopa.interop.probing.eservice.registry.reader;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import com.amazonaws.xray.AWSXRay;
 import com.google.inject.Guice;
@@ -13,10 +15,13 @@
 import it.pagopa.interop.probing.eservice.registry.reader.producer.ServicesSend;
 import it.pagopa.interop.probing.eservice.registry.reader.service.BucketService;
 import it.pagopa.interop.probing.eservice.registry.reader.util.ProjectConstants;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class InteropProbingApplication {
 
   public static void main(String[] args) throws Exception {
+    log.info("Eservice-Registry-Reader started at: {}", LocalDateTime.now(ZoneOffset.UTC));
     Injector injector = Guice.createInjector(new BaseModule(), new JacksonMapperConfig(),
         new PropertiesLoader(), new SqsConfig(), new BucketConfig());
     BucketService bucketService = injector.getInstance(BucketService.class);
@@ -28,7 +33,7 @@ public static void main(String[] args) throws Exception {
       servicesSend.sendMessage(eservice);
       AWSXRay.endSegment();
     }
-
+    log.info("Eservice-Registry-Reader ended at: {}", LocalDateTime.now(ZoneOffset.UTC));
   }
 
 }

src/main/java/it/pagopa/interop/probing/eservice/registry/reader/service/BucketService.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.S3Object;
@@ -11,6 +12,7 @@
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import it.pagopa.interop.probing.eservice.registry.reader.dto.impl.EserviceDTO;
+import it.pagopa.interop.probing.eservice.registry.reader.util.logging.Logger;
 
 @Singleton
 public class BucketService {
@@ -29,9 +31,16 @@ public class BucketService {
   @Inject
   private ObjectMapper mapper;
 
+  @Inject
+  private Logger logger;
+
   public List<EserviceDTO> readObject() throws IOException {
+    logger.logS3BucketRead(bucketName, bucketKey);
     S3Object s3Object = s3Client.getObject(new GetObjectRequest(bucketName, bucketKey));
-    return mapper.readValue(s3Object.getObjectContent(), new TypeReference<List<EserviceDTO>>() {});
+    List<EserviceDTO> services =
+        mapper.readValue(s3Object.getObjectContent(), new TypeReference<List<EserviceDTO>>() {});
+    logger.logNumberEserviceRetrieved(Objects.nonNull(services) ? services.size() : 0);
+    return services;
   }
 
 }

src/main/java/it/pagopa/interop/probing/eservice/registry/reader/util/logging/Logger.java

@@ -6,4 +6,8 @@
 public interface Logger {
 
   void logMessagePushedToQueue(UUID eserviceId, UUID versionId, URI queueUrl, String queueGroupId);
+
+  void logS3BucketRead(String bucketName, String bucketKey);
+
+  void logNumberEserviceRetrieved(Integer numberEservicesRetrieved);
 }

src/main/java/it/pagopa/interop/probing/eservice/registry/reader/util/logging/impl/LoggerImpl.java

@@ -17,4 +17,15 @@ public void logMessagePushedToQueue(UUID eserviceId, UUID versionId, URI queueUr
         AWSXRay.getCurrentSegment().getTraceId().toString(), eserviceId, versionId,
         queueUrl.toString(), queueGroupId);
   }
+
+  @Override
+  public void logS3BucketRead(String bucketName, String bucketKey) {
+    log.info("Reading from S3 bucket. bucketName={}, bucketKey={}", bucketName, bucketKey);
+  }
+
+  @Override
+  public void logNumberEserviceRetrieved(Integer numberEservicesRetrieved) {
+    log.info("Number of Eservices retrieved: {}", numberEservicesRetrieved);
+  }
+
 }

src/test/java/it/pagopa/interop/probing/eservice/registry/reader/unit/service/BucketServiceTest.java

@@ -28,6 +28,7 @@
 import it.pagopa.interop.probing.eservice.registry.reader.service.BucketService;
 import it.pagopa.interop.probing.eservice.registry.reader.util.EserviceState;
 import it.pagopa.interop.probing.eservice.registry.reader.util.EserviceTechnology;
+import it.pagopa.interop.probing.eservice.registry.reader.util.logging.Logger;
 
 @ExtendWith(MockitoExtension.class)
 class BucketServiceTest {
@@ -37,6 +38,8 @@ class BucketServiceTest {
 
   private AmazonS3 s3Client = mock(AmazonS3.class);
 
+  private Logger loggerMock = mock(Logger.class);
+
   private List<EserviceDTO> listEservices;
 
   @BeforeEach
@@ -55,6 +58,7 @@ protected void configure() {
         bind(AmazonS3.class).toInstance(s3Client);
         bind(ObjectMapper.class).toInstance(mapperMock);
         bind(BucketService.class);
+        bind(Logger.class).toInstance(loggerMock);
         bind(String.class).annotatedWith(Names.named("amazon.bucketS3.name"))
             .toInstance("mocked-name");
         bind(String.class).annotatedWith(Names.named("amazon.bucketS3.key"))