open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix and re-enable integration tests at compilation time

This commit is contained in:
renaudboutet 2017-06-07 12:26:37 +02:00
parent 2e0e6de196
commit 97d98da80a
4 changed files with 33 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dd-java-agent-ittests/pom.xml
View File

@ -139,57 +139,21 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version> <version>2.19</version>
<configuration> <configuration>
<!-- TODO fixit, Due to a Java Heap error, skiping test--> <!-- TODO fixit, Due to a Java Heap error, skiping test-->
<skipTests>true</skipTests> <skipTests>false</skipTests>
<includes> <includes>
<include>*Test.java</include> <include>*Test.java</include>
</includes> </includes>
<forkCount>3</forkCount> <!-- <forkCount>1</forkCount> -->
<reuseForks>false</reuseForks> <!-- <reuseForks>false</reuseForks> -->
<argLine>-Xmx1g -Xms1g -XX:MaxPermSize=512m -Dorg.jboss.byteman.verbose=true <argLine>
-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar -javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
</argLine> </argLine>
<workingDirectory>target/FORK_DIRECTORY_${surefire.forkNumber}</workingDirectory> <!-- <workingDirectory>target/FORK_DIRECTORY_${surefire.forkNumber}</workingDirectory> -->
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<!-- <exclude>ch.qos.logback:*</exclude> -->
<!-- <exclude>org.slf4j:*</exclude> -->
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>otarules.btm</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
<Premain-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent
</Premain-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>
<Boot-Class-Path>./${project.artifactId}.jar</Boot-Class-Path>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

22
dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AAgentIntegration.java Normal file
View File

@ -0,0 +1,22 @@
package com.datadoghq.trace.instrument;
import org.junit.Before;
import io.opentracing.mock.MockTracer;
import io.opentracing.util.GlobalTracer;
public class AAgentIntegration {
protected static MockTracer tracer = new MockTracer();
@Before
public void beforeTest() throws Exception {
try{
GlobalTracer.register(tracer);
}catch(Exception e){
//DO NOTHING IF ALREADY REGISTERED
}
tracer.reset();
}
}

13
dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java
View File

@ -9,20 +9,9 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import io.opentracing.mock.MockTracer; public class ApacheHTTPClientTest extends AAgentIntegration{
import io.opentracing.util.GlobalTracer;
public class ApacheHTTPClientTest {
protected MockTracer tracer = new MockTracer();
@Before
public void beforeTest() throws Exception {
GlobalTracer.register(tracer);
}
@Test @Test
public void test() throws Exception{ public void test() throws Exception{

11
dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java
View File

@ -5,16 +5,13 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import io.opentracing.mock.MockTracer; import com.datadoghq.trace.instrument.AAgentIntegration;
import io.opentracing.util.GlobalTracer;
public class TraceAnnotationsManagerTest {
protected MockTracer tracer = new MockTracer();
public class TraceAnnotationsManagerTest extends AAgentIntegration{
@Before @Before
public void beforeTest() throws Exception { public void beforeTest() throws Exception {
GlobalTracer.register(tracer); super.beforeTest();
TraceAnnotationsManager.loadAnnotationsRules(ClassLoader.getSystemClassLoader()); TraceAnnotationsManager.loadAnnotationsRules(ClassLoader.getSystemClassLoader());
} }