From aa688d545c0ac576b5e95221162cd36274cebc40 Mon Sep 17 00:00:00 2001
From: Antoine Rey <antoine.rey@gmail.com>
Date: Sun, 10 Mar 2019 19:52:14 +0100
Subject: [PATCH] Replace the MeterRegistery by the @Timed Micrometer
annotation #120
---
pom.xml | 13 -------------
spring-petclinic-api-gateway/pom.xml | 4 ----
spring-petclinic-customers-service/pom.xml | 4 ----
.../petclinic/customers/web/OwnerResource.java | 6 ++----
.../petclinic/customers/web/PetResource.java | 6 ++----
.../petclinic/customers/web/PetResourceTest.java | 4 ----
spring-petclinic-vets-service/pom.xml | 4 ----
spring-petclinic-visits-service/pom.xml | 4 ----
.../samples/petclinic/visits/web/VisitResource.java | 5 ++---
.../petclinic/visits/web/VisitResourceTest.java | 4 ----
10 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1958e248..3627c00d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
<spring-cloud.version>Finchley.SR2</spring-cloud.version>
<sleuth.version>2.0.0.RC2</sleuth.version>
- <micrometer.version>1.0.5</micrometer.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
@@ -79,18 +78,6 @@
<scope>test</scope>
</dependency>
- <!-- Micrometer core dependency -->
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- <version>${micrometer.version}</version>
- </dependency>
- <!-- Micrometer Prometheus registry -->
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
- <version>${micrometer.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
index ae40e34e..79084512 100644
--- a/spring-petclinic-api-gateway/pom.xml
+++ b/spring-petclinic-api-gateway/pom.xml
@@ -87,10 +87,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml
index dc5928e4..9c411deb 100644
--- a/spring-petclinic-customers-service/pom.xml
+++ b/spring-petclinic-customers-service/pom.xml
@@ -77,10 +77,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java
index 80916f3e..17910434 100644
--- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java
@@ -15,7 +15,7 @@
*/
package org.springframework.samples.petclinic.customers.web;
-import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.annotation.Timed;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -36,12 +36,12 @@ import java.util.Optional;
*/
@RequestMapping("/owners")
@RestController
+@Timed("petclinic.owner")
@RequiredArgsConstructor
@Slf4j
class OwnerResource {
private final OwnerRepository ownerRepository;
- private final MeterRegistry registry;
/**
* Create Owner
@@ -49,7 +49,6 @@ class OwnerResource {
@PostMapping
@ResponseStatus(HttpStatus.CREATED)
public void createOwner(@Valid @RequestBody Owner owner) {
- registry.counter("create.owner").increment();
ownerRepository.save(owner);
}
@@ -84,7 +83,6 @@ class OwnerResource {
ownerModel.setAddress(ownerRequest.getAddress());
ownerModel.setTelephone(ownerRequest.getTelephone());
log.info("Saving owner {}", ownerModel);
- registry.counter("update.owner").increment();
return ownerRepository.save(ownerModel);
}
}
diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java
index 34c8c70d..3bb7f7bf 100644
--- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java
@@ -15,7 +15,7 @@
*/
package org.springframework.samples.petclinic.customers.web;
-import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.annotation.Timed;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -32,13 +32,13 @@ import java.util.Optional;
* @author Maciej Szarlinski
*/
@RestController
+@Timed("petclinic.pet")
@RequiredArgsConstructor
@Slf4j
class PetResource {
private final PetRepository petRepository;
private final OwnerRepository ownerRepository;
- private final MeterRegistry registry;
@GetMapping("/petTypes")
@@ -57,7 +57,6 @@ class PetResource {
Owner owner = optionalOwner.orElseThrow(() -> new ResourceNotFoundException("Owner "+ownerId+" not found"));
owner.addPet(pet);
- registry.counter("create.pet").increment();
save(pet, petRequest);
}
@@ -66,7 +65,6 @@ class PetResource {
public void processUpdateForm(@RequestBody PetRequest petRequest) {
int petId = petRequest.getId();
Pet pet = findPetById(petId);
- registry.counter("update.pet").increment();
save(pet, petRequest);
}
diff --git a/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java
index 5b2b3303..04a6e007 100644
--- a/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java
+++ b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java
@@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.customers.web;
import java.util.Optional;
-import io.micrometer.core.instrument.MeterRegistry;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +41,6 @@ class PetResourceTest {
@MockBean
OwnerRepository ownerRepository;
- @MockBean
- MeterRegistry registry;
-
@Test
void shouldGetAPetInJSonFormat() throws Exception {
diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml
index 99b95770..9f3c58cd 100644
--- a/spring-petclinic-vets-service/pom.xml
+++ b/spring-petclinic-vets-service/pom.xml
@@ -93,10 +93,6 @@
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml
index c6073740..2bf6cc5d 100644
--- a/spring-petclinic-visits-service/pom.xml
+++ b/spring-petclinic-visits-service/pom.xml
@@ -76,10 +76,6 @@
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-core</artifactId>
- </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
diff --git a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
index 5905f371..8f6bd5ca 100644
--- a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
+++ b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
@@ -18,7 +18,7 @@ package org.springframework.samples.petclinic.visits.web;
import java.util.List;
import javax.validation.Valid;
-import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.annotation.Timed;
import lombok.RequiredArgsConstructor;
import lombok.Value;
import lombok.extern.slf4j.Slf4j;
@@ -43,10 +43,10 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
@Slf4j
+@Timed("petclinic.visit")
class VisitResource {
private final VisitRepository visitRepository;
- private final MeterRegistry registry;
@PostMapping("owners/*/pets/{petId}/visits")
@ResponseStatus(HttpStatus.NO_CONTENT)
@@ -56,7 +56,6 @@ class VisitResource {
visit.setPetId(petId);
log.info("Saving visit {}", visit);
- registry.counter("create.visit").increment();
visitRepository.save(visit);
}
diff --git a/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/web/VisitResourceTest.java b/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/web/VisitResourceTest.java
index 3409b30a..25d33f24 100644
--- a/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/web/VisitResourceTest.java
+++ b/spring-petclinic-visits-service/src/test/java/org/springframework/samples/petclinic/visits/web/VisitResourceTest.java
@@ -1,6 +1,5 @@
package org.springframework.samples.petclinic.visits.web;
-import io.micrometer.core.instrument.MeterRegistry;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +29,6 @@ class VisitResourceTest {
@MockBean
VisitRepository visitRepository;
- @MockBean
- MeterRegistry registry;
-
@Test
void shouldFetchVisits() throws Exception {
given(visitRepository.findByPetIdIn(asList(111, 222)))
--
GitLab