(sling-org-apache-sling-distribution-journal) 01/02: SLING-12689 - Remove success event

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit 05d90431c71404239d72c7e53700a4fe276850a3
Author: Christian Schneider <cschn...@adobe.com>
AuthorDate: Thu Apr 10 16:43:43 2025 +0200

    SLING-12689 - Remove success event
---
 .../sling/distribution/journal/bookkeeper/BookKeeper.java   |  5 ++---
 .../journal/impl/events/DistributionEvents.java             | 13 -------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
 
b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
index 0c980c8..60f928d 100644
--- 
a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
+++ 
b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
@@ -180,7 +180,6 @@ public class BookKeeper {
             Duration currentImporturation = 
Duration.ofMillis(System.currentTimeMillis() - importStartTime.getTime());
             log.info("Imported distribution package {} at offset={} took 
importDurationMs={} created={}", pkgMsg, offset, 
currentImporturation.toMillis(), createdTime);
             
subscriberMetrics.getPackageStatusCounter(pkgMsg.getPubAgentName(), 
Status.IMPORTED).increment();
-            distributionEvents.sendSuccessEvent(pkgMsg, offset, createdTime, 
currentImporturation);
         } catch (DistributionException | LoginException | IOException | 
RuntimeException | ImportPreProcessException |ImportPostProcessException e) {
             failure(pkgMsg, offset, createdTime, e);
         } finally {
@@ -272,9 +271,8 @@ public class BookKeeper {
         subscriberMetrics.getFailedPackageImports().mark();
 
         String pubAgentName = pkgMsg.getPubAgentName();
-        packageRetries.increase(pubAgentName);
         int retries = packageRetries.get(pubAgentName);
-        boolean giveUp = errorQueueEnabled && retries > config.getMaxRetries();
+        boolean giveUp = errorQueueEnabled && retries >= 
config.getMaxRetries();
         String retriesSt = errorQueueEnabled ? 
Integer.toString(config.getMaxRetries()) : "infinite";
         String action = giveUp ? "skip the package" : "retry later";
         String msg = format("Failed attempt (%s/%s) to import the distribution 
package %s at offset=%d because of '%s', the importer will %s", retries, 
retriesSt, pkgMsg.toString(false), offset, e.getMessage(), action);
@@ -293,6 +291,7 @@ public class BookKeeper {
             if (retries == NUM_ERRORS_BLOCKING) { // Only count after a few 
retries to allow transient errors to recover
                 subscriberMetrics.getBlockingImportErrors().increment();
             }
+            packageRetries.increase(pubAgentName);
             throw new DistributionException(msg, e);
         }
     }
diff --git 
a/src/main/java/org/apache/sling/distribution/journal/impl/events/DistributionEvents.java
 
b/src/main/java/org/apache/sling/distribution/journal/impl/events/DistributionEvents.java
index 4cad4ea..60e962c 100644
--- 
a/src/main/java/org/apache/sling/distribution/journal/impl/events/DistributionEvents.java
+++ 
b/src/main/java/org/apache/sling/distribution/journal/impl/events/DistributionEvents.java
@@ -22,13 +22,11 @@ import 
org.apache.sling.distribution.journal.messages.PackageMessage;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
-import java.time.Duration;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 public class DistributionEvents {
-    public static final String TOPIC_PACKAGE_SUCCESS = 
"org/apache/sling/distribution/journal/PACKAGE_SUCCESS";
     public static final String TOPIC_PACKAGE_FAILURE = 
"org/apache/sling/distribution/journal/PACKAGE_FAILURE";
 
     public static final String PROPERTY_PACKAGE_MESSAGE = "package.message";
@@ -45,17 +43,6 @@ public class DistributionEvents {
         this.eventAdmin = eventAdmin;
     }
 
-    public void sendSuccessEvent(PackageMessage packageMessage, long offset, 
Date createdDate, Duration importDuration) {
-        Map<String, Object> properties = new HashMap<>();
-        properties.put(PROPERTY_PACKAGE_MESSAGE, packageMessage);
-        properties.put(PROPERTY_OFFSET, offset);
-        properties.put(PROPERTY_CREATED_DATE, createdDate);
-        properties.put(PROPERTY_IMPORT_DURATION, importDuration);
-        
-        Event event = new Event(TOPIC_PACKAGE_SUCCESS, properties);
-        eventAdmin.postEvent(event);
-    }
-
     public void sendFailureEvent(PackageMessage packageMessage, long offset, 
Date createdDate, int numRetries, 
             boolean willDiscard, Exception ex) {
         Map<String, Object> properties = new HashMap<>();