Replace the MeterRegistery by the @timed Micrometer annotation #120

spring-petclinic · Mar 10, 2019 · aa688d5 · aa688d5
1 parent 759c7a8
commit aa688d5
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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/...vice/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java b/...vice/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,20 +36,19 @@
  */
 @RequestMapping("/owners")
 @RestController
+@Timed("petclinic.owner")
 @RequiredArgsConstructor
 @Slf4j
 class OwnerResource {
 
     private final OwnerRepository ownerRepository;
-    private final MeterRegistry registry;
 
     /**
      * Create Owner
      */
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
     public void createOwner(@Valid @RequestBody Owner owner) {
-        registry.counter("create.owner").increment();
         ownerRepository.save(owner);
     }
 
@@ -84,7 +83,6 @@ public Owner updateOwner(@PathVariable("ownerId") int ownerId, @Valid @RequestBo
         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/...ervice/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java b/...ervice/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 @@
  * @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 @@ public void processCreationForm(
         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 @@ public void processCreationForm(
     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/...ce/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java b/...ce/src/test/java/org/springframework/samples/petclinic/customers/web/PetResourceTest.java
@@ -2,7 +2,6 @@
 
 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
@@ -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
@@ -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/...service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java b/...service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java
@@ -18,7 +18,7 @@
 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 @@
 @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 @@ void create(
 
         visit.setPetId(petId);
         log.info("Saving visit {}", visit);
-        registry.counter("create.visit").increment();
         visitRepository.save(visit);
     }
 

diff --git a/...ice/src/test/java/org/springframework/samples/petclinic/visits/web/VisitResourceTest.java b/...ice/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)))