More loggin

Author: CalvinAllen

Dockerfile

@@ -20,6 +20,7 @@ ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
 COPY src ./src
 COPY client ./client
 COPY gradle ./gradle
+COPY newrelic ./newrelic
 COPY build.gradle settings.gradle browserMonitoringTemplate.js ./
 COPY --chmod=0755 gradlew ./
 
@@ -35,12 +36,13 @@ ENV BROWSER_TRUST_KEY=$BROWSER_TRUST_KEY
 ENV BROWSER_AGENT_ID=$BROWSER_AGENT_ID
 ENV BROWSER_APPLICATION_ID=$BROWSER_APPLICATION_ID
 
+RUN --mount=type=cache,target=/root/.gradle ./gradlew downloadNewRelicAgent --console=plain --info --no-daemon --no-watch-fs
 RUN --mount=type=cache,target=/root/.gradle ./gradlew build --console=plain --info --no-daemon --no-watch-fs
 
 FROM base AS final
 WORKDIR /app
 COPY --from=build /src/build/libs/petclinic-backend-1.0.0.jar .
-COPY ["newrelic/", "./newrelic"]
+COPY --from=build /src/newrelic/ ./newrelic/
 
 COPY --chmod=0755 entrypoint.sh /
 COPY --chmod=0755 tester.sh /app

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

@@ -1,12 +1,17 @@
 package org.springframework.samples.petclinic;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 public class MetricDumper {
+	private static final Logger logger = LoggerFactory.getLogger(MetricDumper.class);
+
 	@Scheduled(fixedDelay = 60000)
 	public void dump() {
+		logger.info("MetricDumper - Dumping All Metrics");
 		MetricService.dumpMetrics();
 	}
 }

src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java

@@ -66,7 +66,7 @@ public void setAllowedFields(WebDataBinder dataBinder) {
 	@ModelAttribute("owner")
 	public Owner findOwner(@PathVariable(name = "ownerId", required = false) Integer ownerId) {
 		if(ownerId == null) {
-			logger.info("OwnerId NULL");
+			logger.info("OwnerId=NULL");
 			return new Owner();
 		}
 
@@ -89,6 +89,7 @@ public String processCreationForm(@Valid Owner owner, BindingResult result, Redi
 		}
 
 		this.owners.save(owner);
+		logger.info("Created New Owner={}", owner);
 		redirectAttributes.addFlashAttribute("message", "New Owner Created");
 		return "redirect:/owners/" + owner.getId();
 	}
@@ -104,6 +105,7 @@ public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner
 
 		// allow parameterless GET request for /owners to return all records
 		if (owner.getLastName() == null) {
+			logger.info("Retrieving ALL Owners");
 			owner.setLastName(""); // empty string signifies broadest possible search
 		}
 
@@ -160,6 +162,7 @@ public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result, @
 
 		owner.setId(ownerId);
 		this.owners.save(owner);
+		logger.info("Updated Owner={}", owner);
 		redirectAttributes.addFlashAttribute("message", "Owner Values Updated");
 		return "redirect:/owners/{ownerId}";
 	}

src/main/java/org/springframework/samples/petclinic/owner/OwnerRestController.java

@@ -1,8 +1,9 @@
 package org.springframework.samples.petclinic.owner;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.samples.petclinic.dto.OwnerDto;
@@ -21,6 +22,8 @@
 @RequestMapping("/rest")
 public class OwnerRestController {
 
+	private static final Logger logger = LoggerFactory.getLogger(OwnerRestController.class);
+
 	private final OwnerRepository owners;
 
 	private final OwnerMapper mapper;
@@ -32,12 +35,13 @@ public OwnerRestController(OwnerRepository clinicService, OwnerMapper mapper) {
 
 	@GetMapping("/owners")
 	private List<Owner> findListForOwnersLastName(String lastName) {
-		List<Owner> ownersResult = new ArrayList<>();
 		if (lastName != null) {
-			ownersResult = owners.findByLastName(lastName);
+			logger.info("Searching Owners By Last Name='{}'", lastName);
+			return owners.findByLastName(lastName);
 		}
-		return ownersResult.isEmpty() ? owners.findAll() : ownersResult;
 
+		logger.info("Retrieving ALL Owners");
+		return owners.findAll();
 	}
 
 	@GetMapping("/owners/{ownerId}")
@@ -48,6 +52,7 @@ public Owner findOwnerById(@PathVariable int ownerId) {
 	@PostMapping("/owners/new")
 	public ResponseEntity processCreationForm(@Valid @RequestBody Owner owner) {
 		this.owners.save(owner);
+		logger.info("Created New Owner={}", owner);
 		return new ResponseEntity<>(HttpStatus.CREATED);
 	}
 
@@ -57,6 +62,8 @@ public ResponseEntity<Owner> updateOwner(@PathVariable int ownerId, @RequestBody
 		mapper.updateOwnerFromDto(ownerDto, owner);
 		owners.save(owner);
 
+		logger.info("Updated Owner={}", owner);
+
 		return new ResponseEntity<>(owner, HttpStatus.OK);
 	}
 

src/main/java/org/springframework/samples/petclinic/vet/VetRestController.java

@@ -2,6 +2,8 @@
 
 import java.util.Collection;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,13 +13,15 @@
 public class VetRestController {
 
 	private final VetRepository vets;
+	private static final Logger logger = LoggerFactory.getLogger(VetRestController.class);
 
 	public VetRestController(VetRepository clinicService) {
 		this.vets = clinicService;
 	}
 
 	@GetMapping("/vets")
 	private Collection<Vet> findListForOwnersLastName() {
+		logger.info("Searching ALL Vets");
 		return vets.findAll();
 	}