Hacking

Author: snicoll

spring-ws-core/build.gradle

@@ -55,6 +55,7 @@ dependencies {
 
 	testImplementation("com.fasterxml.woodstox:woodstox-core")
 	testImplementation("commons-io:commons-io")
+	testImplementation("io.micrometer:micrometer-observation-test")
 	testImplementation("net.minidev:json-smart:jar")
 	testImplementation("org.apache.logging.log4j:log4j-core")
 	testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl")

spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

@@ -736,11 +736,13 @@ public boolean sendAndReceive(String uri, WebServiceMessageCallback requestCallb
 		}
 		catch (TransformerException ex) {
 			triggerAfterCompletion(interceptorIndex, messageContext, ex);
+			observation.error(ex);
 			throw new WebServiceTransformerException("Transformation error: " + ex.getMessage(), ex);
 		}
 		catch (RuntimeException | IOException ex) {
 			// Trigger after-completion for thrown exception.
 			triggerAfterCompletion(interceptorIndex, messageContext, ex);
+			observation.error(ex);
 			throw ex;
 		}
 		finally {

spring-ws-core/src/main/java/org/springframework/ws/client/core/observation/ClientWebServiceObservationDocumentation.java

@@ -21,11 +21,11 @@
 import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.docs.ObservationDocumentation;
 
-import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.ws.WebServiceMessage;
 
 /**
- * Documented {@link io.micrometer.common.KeyValue KeyValues} for
- * {@link ClientHttpRequestFactory web service client} observations.
+ * Documented {@link io.micrometer.common.KeyValue KeyValues} for {@link WebServiceMessage
+ * web service client} observations.
  * <p>
  * This class is used by automated tools to document KeyValues attached to the web service
  * client observations.

spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java

@@ -23,6 +23,7 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 
+import io.micrometer.observation.tck.TestObservationRegistry;
 import org.assertj.core.api.AbstractObjectAssert;
 import org.assertj.core.api.AbstractThrowableAssert;
 import org.assertj.core.api.AssertProvider;
@@ -62,6 +63,8 @@
 @SuppressWarnings("unchecked")
 class WebServiceTemplateTests {
 
+	private static final URI CONNECTION_URI = URI.create("http://www.springframework.org/spring-ws");
+
 	private WebServiceTemplate template;
 
 	private FaultAwareWebServiceConnection connectionMock;
@@ -74,8 +77,7 @@ void setUp() throws Exception {
 		this.messageFactory = new MockWebServiceMessageFactory();
 		this.template = new WebServiceTemplate(this.messageFactory);
 		this.connectionMock = mock(FaultAwareWebServiceConnection.class);
-		final URI expectedUri = new URI("http://www.springframework.org/spring-ws");
-		when(this.connectionMock.getUri()).thenReturn(expectedUri);
+		when(this.connectionMock.getUri()).thenReturn(CONNECTION_URI);
 		this.template.setMessageSender(new WebServiceMessageSender() {
 
 			@Override
@@ -86,12 +88,12 @@ public WebServiceConnection createConnection(URI uri) {
 			@Override
 			public boolean supports(URI uri) {
 
-				assertThat(uri).isEqualTo(expectedUri);
+				assertThat(uri).isEqualTo(CONNECTION_URI);
 				return true;
 			}
 		});
 
-		this.template.setDefaultUri(expectedUri.toString());
+		this.template.setDefaultUri(CONNECTION_URI.toString());
 	}
 
 	@Test
@@ -619,6 +621,20 @@ public boolean supports(URI uri) {
 		assertThat(result).isNull();
 	}
 
+	@Test
+	void testObservationWithSendAndReceiveResultResponse() throws Exception {
+		TestObservationRegistry observationRegistry = TestObservationRegistry.create();
+		this.template.setObservationRegistry(observationRegistry);
+		Object unmarshalled = new Object();
+		setupMarshallerAndUnmarshaller(unmarshalled);
+		this.template.marshalSendAndReceive(new Object());
+		assertThat(observationRegistry).hasObservationWithNameEqualTo("soap.client")
+			.that()
+			.hasLowCardinalityKeyValue("protocol", "http")
+			.hasHighCardinalityKeyValue("uri", CONNECTION_URI.toString());
+
+	}
+
 	private static WebServiceMessageExtractor<Object> mockWebServiceMessageExtractor() {
 		return mock(WebServiceMessageExtractor.class);
 	}

spring-ws-platform/build.gradle

@@ -23,6 +23,7 @@ javaPlatform {
 }
 
 dependencies {
+	api(platform("io.micrometer:micrometer-bom:1.16.1"))
 	api(platform("org.apache.logging.log4j:log4j-bom:2.25.2"))
 	api(platform("org.apache.activemq:activemq-bom:6.1.8"))
 	api(platform("org.eclipse.jetty:jetty-bom:12.1.4"))