Add the ability to log the payload of spans/traces

- Add Apache httpclient dependency
- Add ZipkinRestTemplateCustomizer bean
- Customize RestTemplate with the `HttpComponentsClientHttpRequestFactory`

users/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2021 Oracle and/or its affiliates.
+  Copyright (c) 2021, 2022 Oracle and/or its affiliates.
 
   Licensed under the Universal Permissive License v 1.0 as shown at
   https://oss.oracle.com/licenses/upl.
@@ -104,6 +104,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>

users/src/main/java/com/oracle/coherence/examples/sockshop/spring/users/UsersApp.java

@@ -1,13 +1,12 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
  */
 package com.oracle.coherence.examples.sockshop.spring.users;
 
 import com.oracle.coherence.examples.sockshop.spring.users.model.User;
-import com.oracle.coherence.spring.configuration.annotation.EnableCoherence;
 import com.oracle.coherence.spring.data.config.EnableCoherenceRepositories;
 import com.oracle.coherence.examples.sockshop.spring.users.service.UserService;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -29,7 +28,9 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.sleuth.zipkin2.ZipkinRestTemplateCustomizer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.web.client.RestTemplate;
 
@@ -88,8 +89,13 @@ public void run(ApplicationArguments args) throws Exception {
 	}
 
 	@Bean
-	public RestTemplate restTemplate(RestTemplateBuilder builder) {
-		// Do any additional configuration here
-		return builder.build();
+	public ZipkinRestTemplateCustomizer zipkinRestTemplateCustomizer() {
+		return new ZipkinRestTemplateCustomizer() {
+			@Override
+			public RestTemplate customizeTemplate(RestTemplate restTemplate) {
+				restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
+				return restTemplate;
+			}
+		};
 	}
 }

users/src/main/java/com/oracle/coherence/examples/sockshop/spring/users/controller/CustomerController.java

@@ -16,6 +16,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.sleuth.SpanName;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.Link;
 
@@ -46,13 +47,11 @@ public class CustomerController {
 	@Autowired
 	private UserService userService;
 
-
 	@GetMapping
 	@Operation(summary = "Return all customers; or empty collection if no customer found")
 	@ApiResponses({
 		@ApiResponse(responseCode = "200", description = "if the retrieval is successful")
 	})
-	//@NewSpan
 	public CollectionModel<User> getAllCustomers() {
 		final Collection<User> users = this.userService.getAllUsers();
 		for (final User user : users) {
@@ -71,7 +70,6 @@ public CollectionModel<User> getAllCustomers() {
 	@ApiResponses({
 			@ApiResponse(responseCode = "200", description = "if the retrieval is successful")
 	})
-	//@NewSpan
 	public User getCustomer(
 			@Parameter(description = "Customer identifier") @PathVariable("id") String id) {
 		return userService.getOrCreate(id);
@@ -82,20 +80,17 @@ public User getCustomer(
 	@ApiResponses({
 			@ApiResponse(responseCode = "200", description = "if the delete is successful")
 	})
-	//@NewSpan
 	public BooleanStatusResponse deleteCustomer(
 			@Parameter(description = "Customer identifier") @PathVariable("id") String id) {
 		User prev = this.userService.removeUser(id);
 		return new BooleanStatusResponse(prev != null);
 	}
 
-	//
 	@GetMapping("/{id}/cards")
 	@Operation(summary = "Return all cards for the specified customer identifier")
 	@ApiResponses({
 			@ApiResponse(responseCode = "200", description = "if the retrieval is successful")
 	})
-	//@NewSpan
 	public CollectionModel<Object> getCustomerCards(
 			@Parameter(description = "Customer identifier") @PathVariable("id") String id) {
 		final User user = this.userService.getUser(id);
@@ -115,7 +110,6 @@ public CollectionModel<Object> getCustomerCards(
 	@ApiResponses({
 			@ApiResponse(responseCode = "200", description = "if the retrieval is successful")
 	})
-	//@NewSpan
 	public Object getCustomerAddresses(
 			@Parameter(description = "Customer identifier") @PathVariable("id") String id) {
 		final User user = this.userService.getUser(id);

users/src/main/resources/application.yaml

@@ -34,3 +34,4 @@ logging:
     org.springframework.security: info
     org.springframework.web: info
     com.oracle.coherence.spring: info
+    org.apache.http: info # set to debug to see logging of http payloads