Merge pull request #159 from DataDog/ark/fix_ci

Fix CI Memory and HttpClient Test

Author: realark

.circleci/config.yml

@@ -12,9 +12,13 @@ jobs:
           # Reset the cache approx every release
           key: dd-trace-java-{{ checksum "dd-trace-java.gradle" }}
 
+      - run:
+          name: Build Project
+          command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew clean compileJava compileTestJava compileGroovy compileTestGroovy shadowJar --stacktrace --no-daemon
+
       - run:
           name: Run Tests
-          command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx1G -Xms512M" ./gradlew clean check --parallel --stacktrace --no-daemon --max-workers=3
+          command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew check --parallel --stacktrace --no-daemon --max-workers=3
 
       - run:
           name: Verify Version Scan

dd-java-agent-ittests/src/test/java/com/datadoghq/agent/integration/ApacheHTTPClientTest.java

@@ -6,14 +6,19 @@
 import org.junit.Test;
 
 public class ApacheHTTPClientTest {
+  static {
+    try {
+      // Since the HttpClientBuilder initializer doesn't work, invoke manually.
+      Class.forName("com.datadoghq.agent.InstrumentationRulesManager")
+          .getMethod("registerClassLoad", Object.class)
+          .invoke(null, Thread.currentThread().getContextClassLoader());
+    } catch (Exception e) {
+      System.err.println("clinit error: " + e.getMessage());
+    }
+  }
 
   @Test
   public void test() throws Exception {
-    // Since the HttpClientBuilder initializer doesn't work, invoke manually.
-    Class.forName("com.datadoghq.agent.InstrumentationRulesManager")
-        .getMethod("registerClassLoad")
-        .invoke(null);
-
     final HttpClientBuilder builder = HttpClientBuilder.create();
     assertThat(builder.getClass().getSimpleName()).isEqualTo("TracingHttpClientBuilder");
   }