From e50d42401136da5a8bc0959e04fa4ad7d74f6acb Mon Sep 17 00:00:00 2001 From: jackshirazi Date: Wed, 29 Oct 2025 13:25:25 +0000 Subject: [PATCH] Update ApacheHttpClient5ApiAdapter.java --- .../httpclient/v5/helper/ApacheHttpClient5ApiAdapter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient5-plugin/src/main/java/co/elastic/apm/agent/httpclient/v5/helper/ApacheHttpClient5ApiAdapter.java b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient5-plugin/src/main/java/co/elastic/apm/agent/httpclient/v5/helper/ApacheHttpClient5ApiAdapter.java index 46d63539b94..c9010cfda22 100644 --- a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient5-plugin/src/main/java/co/elastic/apm/agent/httpclient/v5/helper/ApacheHttpClient5ApiAdapter.java +++ b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient5-plugin/src/main/java/co/elastic/apm/agent/httpclient/v5/helper/ApacheHttpClient5ApiAdapter.java @@ -70,8 +70,9 @@ public CharSequence getHostName(@Nullable HttpHost httpHost, ClassicHttpRequest } try { - return RoutingSupport.determineHost(request) - .getHostName(); + HttpHost host = RoutingSupport.determineHost(request); + return host == null ? + null : host.getHostName(); } catch (HttpException e) { logger.error("Exception while determining HostName", e);