diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-09-06 15:03:48 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-09-06 15:03:48 +0200 |
| commit | d2d3bbb982362759a773f4b08f8fa3e864446bef (patch) | |
| tree | 8a3bcee18cb3e531797a79f4e8ab6329f6cc2140 /container-core | |
| parent | db8f9d346d37ec87833a87582ffb31cb0857f1eb (diff) | |
Remove 'clientIp' dimension
Diffstat (limited to 'container-core')
3 files changed, 1 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java index 2a382d22a68..e4775fba46f 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java @@ -14,7 +14,6 @@ class MetricDefinitions { static final String METHOD_DIMENSION = "httpMethod"; static final String SCHEME_DIMENSION = "scheme"; static final String REQUEST_TYPE_DIMENSION = "requestType"; - static final String CLIENT_IP_DIMENSION = "clientIp"; static final String CLIENT_AUTHENTICATED_DIMENSION = "clientAuthenticated"; static final String REQUEST_SERVER_NAME_DIMENSION = "requestServerName"; static final String FILTER_CHAIN_ID_DIMENSION = "chainId"; diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java index d96989830ab..817a99bb57f 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListener.java @@ -7,11 +7,8 @@ import org.eclipse.jetty.io.ssl.SslHandshakeListener; import javax.net.ssl.SSLHandshakeException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; -import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.regex.Pattern; /** * A {@link SslHandshakeListener} that reports metrics for SSL handshake failures. @@ -45,8 +42,6 @@ class SslHandshakeFailedListener implements SslHandshakeListener { Map<String, Object> dimensions = new HashMap<>(); dimensions.put(MetricDefinitions.NAME_DIMENSION, connectorName); dimensions.put(MetricDefinitions.PORT_DIMENSION, listenPort); - Optional.ofNullable(event.getSSLEngine().getPeerHost()) - .ifPresent(clientIp -> dimensions.put(MetricDefinitions.CLIENT_IP_DIMENSION, clientIp)); return Map.copyOf(dimensions); } } diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java index 3858d6b9e4e..ad34cc5f024 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeFailedListenerTest.java @@ -25,7 +25,7 @@ public class SslHandshakeFailedListenerTest { @Test void includes_client_ip_dimension_present_when_peer_available() { listener.handshakeFailed(handshakeEvent(true), new SSLHandshakeException("Empty server certificate chain")); - verify(metrics).createContext(eq(Map.of("clientIp", "127.0.0.1", "serverName", "connector", "serverPort", 1234))); + verify(metrics).createContext(eq(Map.of("serverName", "connector", "serverPort", 1234))); } @Test |