Added increment/decrement by delta to CounterService and implementations

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.actuate.metrics;
 
+import org.springframework.util.Assert;
+
 /**
  * A service that can be used to increment, decrement and reset a named counter value.
  *
@@ -29,12 +31,36 @@ public interface CounterService {
 	 */
 	void increment(String metricName);
 
+	/**
+	 * Increment the specified counter by delta.
+	 * @param metricName the name of the counter
+	 * @param delta the amount to increment by
+	 */
+	default void increment(String metricName, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		for (int i = 0; i < delta; i++) {
+			increment(metricName);
+		}
+	}
+
 	/**
 	 * Decrement the specified counter by 1.
 	 * @param metricName the name of the counter
 	 */
 	void decrement(String metricName);
 
+	/**
+	 * Decrement the specified counter by delta.
+	 * @param metricName the name of the counter
+	 * @param delta the amount to decrement by
+	 */
+	default void decrement(String metricName, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		for (int i = 0; i < delta; i++) {
+			decrement(metricName);
+		}
+	}
+
 	/**
 	 * Reset the specified counter.
 	 * @param metricName the name of the counter

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java

@@ -19,6 +19,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.boot.actuate.metrics.CounterService;
+import org.springframework.util.Assert;
 
 /**
  * Fast implementation of {@link CounterService} using {@link CounterBuffers}.
@@ -45,11 +46,23 @@ public void increment(String metricName) {
 		this.buffers.increment(wrap(metricName), 1L);
 	}
 
+	@Override
+	public void increment(String metricName, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		this.buffers.increment(wrap(metricName), delta);
+	}
+
 	@Override
 	public void decrement(String metricName) {
 		this.buffers.increment(wrap(metricName), -1L);
 	}
 
+	@Override
+	public void decrement(String metricName, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		this.buffers.increment(wrap(metricName), -delta);
+	}
+
 	@Override
 	public void reset(String metricName) {
 		this.buffers.reset(wrap(metricName));

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java

@@ -89,11 +89,23 @@ public void increment(String name) {
 		incrementInternal(name, 1L);
 	}
 
+	@Override
+	public void increment(String name, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		incrementInternal(name, delta);
+	}
+
 	@Override
 	public void decrement(String name) {
 		incrementInternal(name, -1L);
 	}
 
+	@Override
+	public void decrement(String name, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		incrementInternal(name, -delta);
+	}
+
 	private void incrementInternal(String name, long value) {
 		if (name.startsWith("meter")) {
 			Meter meter = this.registry.meter(name);

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterService.java

@@ -19,6 +19,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.boot.actuate.metrics.CounterService;
+import org.springframework.util.Assert;
 
 /**
  * Default implementation of {@link CounterService}.
@@ -44,11 +45,23 @@ public void increment(String metricName) {
 		this.writer.increment(new Delta<>(wrap(metricName), 1L));
 	}
 
+	@Override
+	public void increment(String metricName, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		this.writer.increment(new Delta<>(wrap(metricName), delta));
+	}
+
 	@Override
 	public void decrement(String metricName) {
 		this.writer.increment(new Delta<>(wrap(metricName), -1L));
 	}
 
+	@Override
+	public void decrement(String metricName, long delta) {
+		Assert.state(delta > 0, "Delta should be greater than 0");
+		this.writer.increment(new Delta<>(wrap(metricName), -delta));
+	}
+
 	@Override
 	public void reset(String metricName) {
 		this.writer.reset(wrap(metricName));

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java

@@ -64,6 +64,12 @@ public void incrementCounter() {
 		assertThat(this.registry.counter("counter.foo").getCount()).isEqualTo(3);
 	}
 
+	@Test
+	public void incrementCounterWithDelta() {
+		this.writer.increment("foo", 3L);
+		assertThat(this.registry.counter("counter.foo").getCount()).isEqualTo(3);
+	}
+
 	@Test
 	public void updatePredefinedMeter() {
 		this.writer.increment("meter.foo");

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterServiceTests.java

@@ -78,6 +78,22 @@ public void decrementPrependsCounter() {
 		assertThat(this.captor.getValue().getValue()).isEqualTo(-1L);
 	}
 
+	@Test
+	public void incrementCounterWithDelta() {
+		this.service.increment("foo", 42L);
+		verify(this.repository).increment(this.captor.capture());
+		assertThat(this.captor.getValue().getName()).isEqualTo("counter.foo");
+		assertThat(this.captor.getValue().getValue()).isEqualTo(42L);
+	}
+
+	@Test
+	public void decrementCounterWithDelta() {
+		this.service.decrement("foo", 42L);
+		verify(this.repository).increment(this.captor.capture());
+		assertThat(this.captor.getValue().getName()).isEqualTo("counter.foo");
+		assertThat(this.captor.getValue().getValue()).isEqualTo(-42L);
+	}
+
 	@Test
 	public void resetResetsCounter() throws Exception {
 		this.service.reset("foo");