Add more logging for ImageService

dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java

@@ -148,6 +148,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
         image.setDescriptorValue(descriptor);
         image.setPreview(result.getRight());
 
+        log.debug("[{}] Creating image {} ('{}')", image.getTenantId(), image.getResourceKey(), image.getName());
         return new TbResourceInfo(doSaveResource(image));
     }
 
@@ -188,21 +189,25 @@ public class BaseImageService extends BaseResourceService implements ImageServic
             resourceKey = basename + "_(" + idx + ")." + extension;
             idx++;
         }
+        log.debug("[{}] Generated unique key {} for image {}", tenantId, resourceKey, filename);
         return resourceKey;
     }
 
     @Override
     public TbResourceInfo saveImageInfo(TbResourceInfo imageInfo) {
+        log.trace("Executing saveImageInfo [{}] [{}]", imageInfo.getTenantId(), imageInfo.getId());
         return saveResource(new TbResource(imageInfo));
     }
 
     @Override
     public TbResourceInfo getImageInfoByTenantIdAndKey(TenantId tenantId, String key) {
+        log.trace("Executing getImageInfoByTenantIdAndKey [{}] [{}]", tenantId, key);
         return findResourceInfoByTenantIdAndKey(tenantId, ResourceType.IMAGE, key);
     }
 
     @Override
     public PageData<TbResourceInfo> getImagesByTenantId(TenantId tenantId, PageLink pageLink) {
+        log.trace("Executing getImagesByTenantId [{}]", tenantId);
         TbResourceInfoFilter filter = TbResourceInfoFilter.builder()
                 .tenantId(tenantId)
                 .resourceTypes(Set.of(ResourceType.IMAGE))
@@ -212,6 +217,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
 
     @Override
     public PageData<TbResourceInfo> getAllImagesByTenantId(TenantId tenantId, PageLink pageLink) {
+        log.trace("Executing getAllImagesByTenantId [{}]", tenantId);
         TbResourceInfoFilter filter = TbResourceInfoFilter.builder()
                 .tenantId(tenantId)
                 .resourceTypes(Set.of(ResourceType.IMAGE))
@@ -221,11 +227,13 @@ public class BaseImageService extends BaseResourceService implements ImageServic
 
     @Override
     public byte[] getImageData(TenantId tenantId, TbResourceId imageId) {
+        log.trace("Executing getImageData [{}] [{}]", tenantId, imageId);
         return resourceDao.getResourceData(tenantId, imageId);
     }
 
     @Override
     public byte[] getImagePreview(TenantId tenantId, TbResourceId imageId) {
+        log.trace("Executing getImagePreview [{}] [{}]", tenantId, imageId);
         return resourceDao.getResourcePreview(tenantId, imageId);
     }
 
@@ -260,12 +268,14 @@ public class BaseImageService extends BaseResourceService implements ImageServic
 
     @Override
     public TbResourceInfo findSystemOrTenantImageByEtag(TenantId tenantId, String etag) {
+        log.trace("Executing findSystemOrTenantImageByEtag [{}] [{}]", tenantId, etag);
         return resourceInfoDao.findSystemOrTenantImageByEtag(tenantId, ResourceType.IMAGE, etag);
     }
 
     @Transactional(propagation = Propagation.NOT_SUPPORTED)// we don't want transaction to rollback in case of an image processing failure
     @Override
     public boolean replaceBase64WithImageUrl(HasImage entity, String type) {
+        log.trace("Executing replaceBase64WithImageUrl [{}] [{}] [{}]", entity.getTenantId(), type, entity.getName());
         String imageName = "\"" + entity.getName() + "\" ";
         if (entity.getTenantId() == null || entity.getTenantId().isSysTenantId()) {
             imageName += "system ";
@@ -280,6 +290,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
     @Transactional(propagation = Propagation.NOT_SUPPORTED)// we don't want transaction to rollback in case of an image processing failure
     @Override
     public boolean replaceBase64WithImageUrl(WidgetTypeDetails entity) {
+        log.trace("Executing replaceBase64WithImageUrl [{}] [WidgetTypeDetails] [{}]", entity.getTenantId(), entity.getId());
         String prefix = "\"" + entity.getName() + "\" ";
         if (entity.getTenantId() == null || entity.getTenantId().isSysTenantId()) {
             prefix += "system ";
@@ -305,6 +316,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
     @Transactional(propagation = Propagation.NOT_SUPPORTED)// we don't want transaction to rollback in case of an image processing failure
     @Override
     public boolean replaceBase64WithImageUrl(Dashboard entity) {
+        log.trace("Executing replaceBase64WithImageUrl [{}] [Dashboard] [{}]", entity.getTenantId(), entity.getId());
         String prefix = "\"" + entity.getTitle() + "\" dashboard";
         var result = base64ToImageUrl(entity.getTenantId(), prefix + " image", entity.getImage());
         boolean updated = result.isUpdated();
@@ -492,17 +504,20 @@ public class BaseImageService extends BaseResourceService implements ImageServic
 
     @Override
     public void inlineImage(HasImage entity) {
+        log.trace("Executing inlineImage [{}] [{}] [{}]", entity.getTenantId(), entity.getClass().getSimpleName(), entity.getName());
         entity.setImage(inlineImage(entity.getTenantId(), "image", entity.getImage()));
     }
 
     @Override
     public void inlineImages(Dashboard dashboard) {
+        log.trace("Executing inlineImage [{}] [Dashboard] [{}]", dashboard.getTenantId(), dashboard.getId());
         inlineImage(dashboard);
         inlineIntoJson(dashboard.getTenantId(), dashboard.getConfiguration());
     }
 
     @Override
     public void inlineImages(WidgetTypeDetails widgetTypeDetails) {
+        log.trace("Executing inlineImage [{}] [WidgetTypeDetails] [{}]", widgetTypeDetails.getTenantId(), widgetTypeDetails.getId());
         inlineImage(widgetTypeDetails);
         inlineIntoJson(widgetTypeDetails.getTenantId(), widgetTypeDetails.getDescriptor());
     }