From 0748c10b7296f9ebbd3453432ba3ce45b3ebbcc9 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Tue, 17 Sep 2019 10:19:38 -0400
Subject: [PATCH] Avoid unnecessary objects creation in Apache Http Client
 instrumnentation

---
 .../apachehttpclient/ApacheHttpClientDecorator.java      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java
index e357956241..562c31e3da 100644
--- a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java
+++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java
@@ -2,9 +2,7 @@ package datadog.trace.instrumentation.apachehttpclient;
 
 import datadog.trace.agent.decorator.HttpClientDecorator;
 import java.net.URI;
-import java.net.URISyntaxException;
 import org.apache.http.HttpResponse;
-import org.apache.http.RequestLine;
 import org.apache.http.client.methods.HttpUriRequest;
 
 public class ApacheHttpClientDecorator extends HttpClientDecorator<HttpUriRequest, HttpResponse> {
@@ -22,13 +20,12 @@ public class ApacheHttpClientDecorator extends HttpClientDecorator<HttpUriReques
 
   @Override
   protected String method(final HttpUriRequest httpRequest) {
-    return httpRequest.getRequestLine().getMethod();
+    return httpRequest.getMethod();
   }
 
   @Override
-  protected URI url(final HttpUriRequest request) throws URISyntaxException {
-    final RequestLine requestLine = request.getRequestLine();
-    return requestLine == null ? null : new URI(requestLine.getUri());
+  protected URI url(final HttpUriRequest request) {
+    return request.getURI();
   }
 
   @Override