Update to remove random exceptions

Author: CalvinAllen

src/main/java/org/springframework/samples/petclinic/Util.java

@@ -36,10 +36,6 @@ public static void waitWithDeviation(int median) {
 		}
 	}
 
-	public static boolean isEvenDay() {
-		return LocalDate.now().getDayOfYear() % 2 == 0;
-	}
-
 	public static boolean timeForFakeError() {
 		String nowMillisStr = Long.toString(System.currentTimeMillis());
 		return nowMillisStr.endsWith("7");

src/main/java/org/springframework/samples/petclinic/clm/ClmController.java

@@ -24,15 +24,13 @@
 public class ClmController {
 
 	private final OwnerRepository ownerRepository;
-	private final ErrorService errorService;
 	private final RestClient restClient;
 
 	private static final Logger logger = LoggerFactory.getLogger(ClmController.class);
 
-	public ClmController(OwnerRepository ownerRepository, ErrorService errorService, RestClient.Builder restClientBuilder) {
+	public ClmController(OwnerRepository ownerRepository,  RestClient.Builder restClientBuilder) {
 		this.restClient = restClientBuilder.build();
 		this.ownerRepository = ownerRepository;
-		this.errorService = errorService;
 	}
 
 	/**
@@ -47,19 +45,6 @@ public String autoOnly(Model model) {
 		return "welcome";
 	}
 
-	// What happens when error outside of controller
-	@GetMapping("/clm/error")
-	public String error(Model model) {
-		MetricService.increaseCount("/clm/error");
-		doWait();
-		logger.info("/clm/error");
-		if (timeForFakeError()) {
-			errorService.iAmError();
-		}
-		model.addAttribute("message", "on no!");
-		return "error";
-	}
-
 	/**
 	 * Besides the auto instrumentation, this also demonstrates a manual trace created by an annotation.
 	 */

src/main/java/org/springframework/samples/petclinic/clm/ClmJobs.java

@@ -0,0 +1,55 @@
+package org.springframework.samples.petclinic.clm;
+
+import com.newrelic.api.agent.Trace;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.samples.petclinic.owner.OwnerRepository;
+import org.springframework.samples.petclinic.owner.PetType;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class ClmJobs {
+
+	private final OwnerRepository ownerRepository;
+	private static final Logger logger = LoggerFactory.getLogger(ClmJobs.class);
+
+	public ClmJobs(OwnerRepository ownerRepository) {
+		this.ownerRepository = ownerRepository;
+	}
+
+    // No CLM expected - needs @Trace annotation
+    @Scheduled(fixedRate = 35000)
+    protected void doStuff1() {
+        logger.info("doStuff1");
+        List<PetType> petTypes = ownerRepository.findPetTypes();
+        logger.info("doStuff petTypes {}", petTypes);
+    }
+
+    // Expected CLM - but might be too fast to get recorded
+    @Trace(dispatcher = true)
+    @Scheduled(fixedRate = 90000)
+    protected void doStuff4() {
+        logger.info("doStuff4");
+    }
+
+    // Expected CLM
+    @Trace(dispatcher = true)
+    @Scheduled(fixedRate = 60000)
+    protected void doStuff2() {
+        logger.info("doStuff2");
+        List<PetType> petTypes = ownerRepository.findPetTypes();
+		logger.info("doStuff2 petTypes {}", petTypes);
+    }
+
+    // Expected CLM
+    @Trace(dispatcher = true, metricName = "clmJobs/doStuff3")
+    @Scheduled(fixedRate = 70000)
+    protected void doStuff3() {
+        logger.info("doStuff3");
+        List<PetType> petTypes = ownerRepository.findPetTypes();
+        logger.info("doStuff3 petTypes {}", petTypes);
+    }
+}

src/main/java/org/springframework/samples/petclinic/clm/ClmJobs.kt

@@ -20,8 +20,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.samples.petclinic.Util;
-import org.springframework.samples.petclinic.clm.RandomExceptionGenerator;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,9 +52,6 @@ public String showVetList(@RequestParam(defaultValue = "1") int page, Model mode
 		// Here we are returning an object of type 'Vets' rather than a collection of Vet
 		// objects so it is simpler for Object-Xml mapping
 		Vets vets = new Vets();
-		if (Util.isEvenDay() && System.currentTimeMillis() % 2 == 0) {
-			throw RandomExceptionGenerator.generateRandomException();
-		}
 		Page<Vet> paginated = findPaginated(page);
 		logger.info("Getting Vets for Page={}", page);
 		vets.getVetList().addAll(paginated.toList());

src/main/java/org/springframework/samples/petclinic/clm/ErrorService.java

@@ -33,10 +33,6 @@ while true; do
     sleep 1
     curl -s -o /dev/null http://localhost:8081/vets/Carter
     sleep 1
-    # curl -s -o /dev/null http://localhost:8081/oups
-    # sleep 1
-    curl -s -o /dev/null http://localhost:8081/clm/error
-    sleep 1
 
     timestamp=$(date +"%Y-%m-%dT%H:%M:%S%z")
     echo "$timestamp Completed a full set of operations."