refactor: Update retry policy settings and remove unnecessary metrics

ethpandaops · Apr 5, 2024 · 3f1f170 · 3f1f170
1 parent 1d8e0c9
commit 3f1f170
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/output/xatu/exporter.go b/pkg/output/xatu/exporter.go
@@ -31,13 +31,13 @@ var (
 	retryPolicy = `{
 		"methodConfig": [{
 		  "name": [{"service": "xatu.EventIngester"}],
-		  "waitForReady": true,
+		  "waitForReady": false,
 		  "retryPolicy": {
 			  "MaxAttempts": 5,
-			  "InitialBackoff": ".01s",
+			  "InitialBackoff": "1s",
 			  "MaxBackoff": "15s",
-			  "BackoffMultiplier": 1.0,
-			  "RetryableStatusCodes": [ "UNAVAILABLE", "UNKNOWN" ]
+			  "BackoffMultiplier": 1.5,
+			  "RetryableStatusCodes": [ "UNAVAILABLE", "UNKNOWN", "INTERNAL" ]
 		  }
 		}]}
 	`

diff --git a/pkg/processor/batch.go b/pkg/processor/batch.go
@@ -229,8 +229,6 @@ func (bvp *BatchItemProcessor[T]) ImmediatelyExportItems(ctx context.Context, it
 			err := bvp.exportWithTimeout(ctx, itemsBatch)
 
 			if err != nil {
-				bvp.metrics.IncItemsFailedBy(bvp.name, float64(len(itemsBatch)))
-
 				return err
 			}
 		}
@@ -248,15 +246,15 @@ func (bvp *BatchItemProcessor[T]) exportWithTimeout(ctx context.Context, itemsBa
 		defer cancel()
 	}
 
-	bvp.metrics.IncItemsExportedBy(bvp.name, float64(len(itemsBatch)))
-
 	err := bvp.e.ExportItems(ctx, itemsBatch)
 	if err != nil {
 		bvp.metrics.IncItemsFailedBy(bvp.name, float64(len(itemsBatch)))
 
 		return err
 	}
 
+	bvp.metrics.IncItemsExportedBy(bvp.name, float64(len(itemsBatch)))
+
 	return nil
 }