Use operation name and namespace

Author: bclozel

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java

@@ -53,6 +53,12 @@
  */
 public abstract class AbstractMethodEndpointMapping<T> extends AbstractEndpointMapping {
 
+	/**
+	 * {@link MessageContext#getProperty(String) Property name} for the endpoint mapping
+	 * lookup key.
+	 */
+	public static final String LOOKUP_KEY_PROPERTY = AbstractMethodEndpointMapping.class.getName() + ".lookupKey";
+
 	private final Map<T, MethodEndpoint> endpointMap = new HashMap<>();
 
 	/**
@@ -70,6 +76,7 @@ public abstract class AbstractMethodEndpointMapping<T> extends AbstractEndpointM
 		if (this.logger.isDebugEnabled()) {
 			this.logger.debug("Looking up endpoint for [" + key + "]");
 		}
+		messageContext.setProperty(LOOKUP_KEY_PROPERTY, key);
 		return lookupEndpoint(key);
 	}
 

spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java

@@ -18,6 +18,8 @@
 
 import java.net.URISyntaxException;
 
+import javax.xml.namespace.QName;
+
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.Observation.Scope;
 import io.micrometer.observation.ObservationRegistry;
@@ -32,6 +34,7 @@
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
+import org.springframework.ws.server.endpoint.mapping.AbstractMethodEndpointMapping;
 import org.springframework.ws.transport.EndpointAwareWebServiceConnection;
 import org.springframework.ws.transport.FaultAwareWebServiceConnection;
 import org.springframework.ws.transport.WebServiceConnection;
@@ -117,6 +120,11 @@ protected final void handleConnection(WebServiceConnection connection, WebServic
 			MessageContext messageContext = new DefaultMessageContext(request, getMessageFactory());
 			observationContext.setAsCurrent(messageContext);
 			receiver.receive(messageContext);
+			Object lookupKey = messageContext.getProperty(AbstractMethodEndpointMapping.LOOKUP_KEY_PROPERTY);
+			if (lookupKey instanceof QName qName) {
+				observationContext.setNamespace(qName.getNamespaceURI());
+				observationContext.setOperationName(qName.getLocalPart());
+			}
 			if (messageContext.hasResponse()) {
 				WebServiceMessage response = messageContext.getResponse();
 				if (response instanceof FaultAwareWebServiceMessage faultResponse

spring-ws-core/src/test/java/org/springframework/ws/transport/observation/DefaultSoapServerObservationConventionTests.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2005-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.ws.transport.observation;
 
 import java.net.URI;
@@ -77,9 +93,9 @@ void protocol() throws Exception {
 
 	@Test
 	void namespace() {
-		this.context.setNamespace("CountriesPort");
+		this.context.setNamespace("https://spring.io/guides/gs-producing-web-service");
 		assertThat(this.convention.getLowCardinalityKeyValues(this.context))
-			.contains(KeyValue.of("namespace", "CountriesPort"));
+			.contains(KeyValue.of("namespace", "https://spring.io/guides/gs-producing-web-service"));
 	}
 
 	@Test

spring-ws-core/src/test/java/org/springframework/ws/transport/support/MessageReceiverObservationTests.java

@@ -1,12 +1,33 @@
+/*
+ * Copyright 2005-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.ws.transport.support;
 
+import java.util.Objects;
+
+import javax.xml.namespace.QName;
+
 import io.micrometer.observation.tck.TestObservationRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ws.MockWebServiceMessage;
 import org.springframework.ws.MockWebServiceMessageFactory;
 import org.springframework.ws.NoEndpointFoundException;
+import org.springframework.ws.server.endpoint.mapping.AbstractMethodEndpointMapping;
 import org.springframework.ws.transport.FaultAwareWebServiceConnection;
 import org.springframework.ws.transport.WebServiceMessageReceiver;
 import org.springframework.ws.transport.observation.SoapServerObservationContext;
@@ -84,6 +105,24 @@ void shouldRecordNoEndpointFoundExceptions() throws Exception {
 			.isInstanceOf(NoEndpointFoundException.class);
 	}
 
+	@Test
+	void shouldSetQNameInObservationContext() throws Exception {
+		QName qName = QName.valueOf("{https://spring.io/guides/gs-producing-web-service}getCountryRequest");
+		WebServiceMessageReceiver receiver = messageContext -> messageContext
+			.setProperty(AbstractMethodEndpointMapping.LOOKUP_KEY_PROPERTY, qName);
+		this.receiver.handleConnection(this.connectionMock, receiver);
+		assertThat(this.observationRegistry).hasObservationWithNameEqualTo("soap.server.requests")
+			.that()
+			.matches(context -> {
+				if (context instanceof SoapServerObservationContext observationContext) {
+					return Objects.equals(observationContext.getNamespace(),
+							"https://spring.io/guides/gs-producing-web-service")
+							&& Objects.equals(observationContext.getOperationName(), "getCountryRequest");
+				}
+				return false;
+			});
+	}
+
 	static class ObservationMessageReceiver extends WebServiceMessageReceiverObjectSupport {
 
 	}