Use apachecomponents asyncHttpClient instead of ning

Author: Ankur Chauhan

Diff for: .gitignore

@@ -2,3 +2,5 @@
 .project
 .settings
 target
+.idea
+*.iml

Diff for: pom.xml

@@ -87,9 +87,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.ning</groupId>
-            <artifactId>async-http-client</artifactId>
-            <version>1.7.20</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

Diff for: src/main/java/com/yammer/metrics/reporting/AwsHelper.java

@@ -1,21 +1,22 @@
 package com.yammer.metrics.reporting;
 
-import java.io.IOException;
-import java.util.concurrent.Future;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
+import org.apache.http.util.EntityUtils;
 
-import com.ning.http.client.*;
+import java.io.IOException;
 
 public class AwsHelper {
 
   public static final String url = "http://169.254.169.254/latest/meta-data/instance-id";
 
   public static String getEc2InstanceId() throws IOException {
-    AsyncHttpClient client = new AsyncHttpClient();
+      CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();;
     try {
-      Future<Response> f = client.prepareGet(url).execute();
-      Response resp = f.get();
-
-      return resp.getResponseBody();
+      final HttpResponse response = client.execute(new HttpGet(url), null).get();
+      return EntityUtils.toString(response.getEntity());
     } catch (Throwable t) {
       throw new IOException(t);
     }

Diff for: src/main/java/com/yammer/metrics/reporting/HttpTransport.java

@@ -1,83 +1,68 @@
 package com.yammer.metrics.reporting;
 
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.concurrent.FutureCallback;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ning.http.client.AsyncHandler;
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
-import com.ning.http.client.HttpResponseBodyPart;
-import com.ning.http.client.HttpResponseHeaders;
-import com.ning.http.client.HttpResponseStatus;
+import java.util.concurrent.Future;
 
 public class HttpTransport implements Transport {
-  private final String apiKey;
-  private final AsyncHttpClient client;
-  private final String seriesUrl;
-  private static final Logger LOG = LoggerFactory
-      .getLogger(HttpTransport.class);
+    private final CloseableHttpAsyncClient client;
+    private final String seriesUrl;
 
-  public HttpTransport(String host, String apiKey) {
-    this.apiKey = apiKey;
-    this.client = new AsyncHttpClient();
-    this.seriesUrl = String.format("https://%s/api/v1/series?api_key=%s", host,
-        apiKey);
-  }
-
-  public static class HttpRequest implements Transport.Request {
-    private final BoundRequestBuilder requestBuilder;
-    private final ByteArrayOutputStream out;
-
-    public HttpRequest(HttpTransport transport, String apiKey,
-        BoundRequestBuilder requestBuilder) throws IOException {
-      this.requestBuilder = requestBuilder;
-      this.requestBuilder.addHeader("Content-Type", "application/json");
-      this.out = new ByteArrayOutputStream();
+    public HttpTransport(String host, String apiKey) {
+        this.client = HttpAsyncClients.createDefault();
+        this.seriesUrl = String.format("https://%s/api/v1/series?api_key=%s", host, apiKey);
     }
 
-    public OutputStream getBodyWriter() {
-      return out;
+    public Request prepare() throws IOException {
+        return new HttpRequest(this);
     }
 
-    public void send() throws Exception {
-      out.flush();
-      out.close();
-      requestBuilder.setBody(out.toByteArray())
-          .execute(new AsyncHandler<Void>() {
-
-            public STATE onBodyPartReceived(HttpResponseBodyPart bp)
-                throws Exception {
-              return STATE.CONTINUE;
+    public Future<HttpResponse> execute(HttpUriRequest request) throws Exception {
+        return this.client.execute(request, new FutureCallback<HttpResponse>() {
+            public void completed(HttpResponse result) {
+                LOG.debug("Completed sending metrics to datadog");
             }
 
-            public Void onCompleted() throws Exception {
-              return null;
+            public void failed(Exception ex) {
+                LOG.error("Error Writing Datadog metrics", ex);
             }
 
-            public STATE onHeadersReceived(HttpResponseHeaders headers)
-                throws Exception {
-              return STATE.CONTINUE;
+            public void cancelled() {
+                LOG.debug("Cancelled request to send metrics to datadog");
             }
-
-            public STATE onStatusReceived(HttpResponseStatus arg0)
-                throws Exception {
-              return STATE.CONTINUE;
-            }
-
-            public void onThrowable(Throwable t) {
-              LOG.error("Error Writing Datadog metrics", t);
-            }
-
-          }).get();
+        });
     }
-  }
 
-  public HttpRequest prepare() throws IOException {
-    BoundRequestBuilder builder = client.preparePost(seriesUrl);
-    return new HttpRequest(this, apiKey, builder);
-  }
+    public static class HttpRequest implements Transport.Request {
+        private final HttpTransport transport;
+        private final HttpPost request;
+        private final ByteArrayOutputStream out;
+
+        public HttpRequest(HttpTransport transport) throws IOException {
+            this.transport = transport;
+            this.request = new HttpPost(this.transport.seriesUrl);
+            this.out = new ByteArrayOutputStream();
+        }
+
+        public OutputStream getBodyWriter() {
+            return out;
+        }
+
+        public void send() throws Exception {
+            this.out.flush();
+            this.out.close();
+            this.request.setEntity(new ByteArrayEntity(out.toByteArray(), ContentType.APPLICATION_JSON));
+            this.transport.execute(this.request).get();
+        }
+    }
 }

Diff for: src/main/java/com/yammer/metrics/reporting/Transport.java

@@ -1,11 +1,17 @@
 package com.yammer.metrics.reporting;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.OutputStream;
 
 public interface Transport {
-  public Request prepare() throws IOException ;
-  
+
+  static final Logger LOG = LoggerFactory.getLogger(Transport.class);
+
+  public Request prepare() throws IOException;
+
   public interface Request {
     OutputStream getBodyWriter();
     void send() throws Exception;

Diff for: src/test/java/com/yammer/metrics/reporting/DatadogCounterTest.java

@@ -1,13 +1,11 @@
 package com.yammer.metrics.reporting;
 
-import static org.junit.Assert.*;
+import com.yammer.metrics.reporting.model.DatadogCounter;
+import org.junit.Test;
 
 import java.util.List;
 
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.yammer.metrics.reporting.model.DatadogCounter;
+import static org.junit.Assert.assertEquals;
 
 public class DatadogCounterTest {
 
@@ -23,17 +21,4 @@ public void testSplitNameAndTags() {
     assertEquals("tag3:value3", tags.get(2));
   }
 
-  @Ignore("Rely on datadog to strip tags")
-  @Test
-  public void testStripInvalidCharsFromTags() {
-    DatadogCounter counter = new DatadogCounter(
-        "test[tag1:va  lue1,tag2:va .%lue2,ta  %# g3:value3]", 1L, 1234L, "Test Host");
-    List<String> tags = counter.getTags();
-
-    assertEquals(3, tags.size());
-    assertEquals("tag1:value1", tags.get(0));
-    assertEquals("tag2:value2", tags.get(1));
-    assertEquals("tag3:value3", tags.get(2));
-  }
-
 }

Diff for: src/test/java/com/yammer/metrics/reporting/DatadogGaugeTest.java

@@ -1,13 +1,11 @@
 package com.yammer.metrics.reporting;
 
-import static org.junit.Assert.*;
+import com.yammer.metrics.reporting.model.DatadogGauge;
+import org.junit.Test;
 
 import java.util.List;
 
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.yammer.metrics.reporting.model.DatadogGauge;
+import static org.junit.Assert.assertEquals;
 
 public class DatadogGaugeTest {
 
@@ -22,19 +20,4 @@ public void testSplitNameAndTags() {
     assertEquals("tag2:value2", tags.get(1));
     assertEquals("tag3:value3", tags.get(2));
   }
-
-  @Ignore("Rely on datadog to strip tags")
-  @Test
-  public void testStripInvalidCharsFromTags() {
-    DatadogGauge gauge = new DatadogGauge(
-        "test[tag1:va  lue1,tag2:va .%lue2,ta  %# g3:value3]", 1L, 1234L,
-        "Test Host");
-    List<String> tags = gauge.getTags();
-
-    assertEquals(3, tags.size());
-    assertEquals("tag1:value1", tags.get(0));
-    assertEquals("tag2:value2", tags.get(1));
-    assertEquals("tag3:value3", tags.get(2));
-  }
-
 }