Skip to content

Commit 5963042

Browse files
renaudboutetrenaudboutet
authored
Merge pull request #8 from DataDog/refactor-skel
refactoring skel
2 parents 83a30ad + cbf4e0f commit 5963042

20 files changed

Lines changed: 333 additions & 311 deletions

File tree

‎dd-java-agent-ittests/pom.xml‎

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
4+
<parent>
5+
<groupId>com.datadoghq</groupId>
6+
<artifactId>dd-trace-java</artifactId>
7+
<version>0.0.3-SNAPSHOT</version>
8+
</parent>
9+
10+
<artifactId>dd-java-agent-ittests</artifactId>
11+
<packaging>jar</packaging>
12+
<name>dd-java-agent-ittests</name>
13+
<description>Datadog Java Agent integration tests</description>
14+
<url>https://github.com/datadog/dd-trace-java</url>
15+
16+
17+
<properties>
18+
<dd-trace.version>0.0.3-SNAPSHOT</dd-trace.version>
19+
</properties>
20+
21+
<dependencies>
22+
23+
<!-- DD Agent tests (@Trace annotation)-->
24+
<dependency>
25+
<groupId>com.datadoghq</groupId>
26+
<artifactId>dd-java-agent</artifactId>
27+
<version>${dd-trace.version}</version>
28+
<scope>test</scope>
29+
</dependency>
30+
31+
<!-- JUnit tests -->
32+
<dependency>
33+
<groupId>io.opentracing</groupId>
34+
<artifactId>opentracing-mock</artifactId>
35+
<version>${opentracing.version}</version>
36+
<scope>test</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>junit</groupId>
40+
<artifactId>junit</artifactId>
41+
<version>4.12</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.assertj</groupId>
46+
<artifactId>assertj-core</artifactId>
47+
<version>3.6.2</version>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.mockito</groupId>
52+
<artifactId>mockito-core</artifactId>
53+
<version>2.7.22</version>
54+
<scope>test</scope>
55+
</dependency>
56+
57+
<!-- Mongo tests -->
58+
<dependency>
59+
<groupId>org.mongodb</groupId>
60+
<artifactId>mongo-java-driver</artifactId>
61+
<version>3.4.2</version>
62+
<scope>test</scope>
63+
</dependency>
64+
65+
<!-- Jetty Servlet tests -->
66+
<dependency>
67+
<groupId>org.eclipse.jetty</groupId>
68+
<artifactId>jetty-server</artifactId>
69+
<version>9.4.1.v20170120</version>
70+
<scope>test</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.eclipse.jetty</groupId>
74+
<artifactId>jetty-servlet</artifactId>
75+
<version>9.4.1.v20170120</version>
76+
<scope>test</scope>
77+
</dependency>
78+
79+
<!-- Tomcat Servlet tests -->
80+
<dependency>
81+
<groupId>org.apache.tomcat.embed</groupId>
82+
<artifactId>tomcat-embed-core</artifactId>
83+
<version>8.0.41</version>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.apache.tomcat.embed</groupId>
88+
<artifactId>tomcat-embed-jasper</artifactId>
89+
<version>8.0.41</version>
90+
<scope>test</scope>
91+
</dependency>
92+
93+
<!-- AWS SDK tests -->
94+
<dependency>
95+
<groupId>com.amazonaws</groupId>
96+
<artifactId>aws-java-sdk</artifactId>
97+
<version>1.11.132</version>
98+
<scope>test</scope>
99+
<exclusions>
100+
<exclusion>
101+
<groupId>org.apache.httpcomponents</groupId>
102+
<artifactId>httpclient</artifactId>
103+
</exclusion>
104+
</exclusions>
105+
</dependency>
106+
107+
<!-- OkHTTP tests -->
108+
<dependency>
109+
<groupId>com.squareup.okhttp3</groupId>
110+
<artifactId>okhttp</artifactId>
111+
<version>3.6.0</version>
112+
<scope>test</scope>
113+
</dependency>
114+
115+
<!-- Apache HTTP client tests -->
116+
<dependency>
117+
<groupId>org.apache.httpcomponents</groupId>
118+
<artifactId>httpclient</artifactId>
119+
<version>4.5.3</version>
120+
<scope>test</scope>
121+
</dependency>
122+
123+
</dependencies>
124+
<build>
125+
<plugins>
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-javadoc-plugin</artifactId>
129+
<version>2.10.4</version>
130+
<executions>
131+
<execution>
132+
<id>attach-javadocs</id>
133+
<goals>
134+
<goal>jar</goal>
135+
</goals>
136+
</execution>
137+
</executions>
138+
</plugin>
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-surefire-plugin</artifactId>
142+
<version>2.20</version>
143+
<configuration>
144+
<!-- TODO fixit, Due to a Java Heap error, skiping test-->
145+
<skipTests>true</skipTests>
146+
<includes>
147+
<include>*Test.java</include>
148+
</includes>
149+
<forkCount>3</forkCount>
150+
<reuseForks>false</reuseForks>
151+
<argLine>-Xmx1g -Xms1g -XX:MaxPermSize=512m -Dorg.jboss.byteman.verbose=true
152+
-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
153+
</argLine>
154+
<workingDirectory>target/FORK_DIRECTORY_${surefire.forkNumber}</workingDirectory>
155+
</configuration>
156+
</plugin>
157+
<plugin>
158+
<groupId>org.apache.maven.plugins</groupId>
159+
<artifactId>maven-shade-plugin</artifactId>
160+
<version>2.4.3</version>
161+
<executions>
162+
<execution>
163+
<phase>package</phase>
164+
<goals>
165+
<goal>shade</goal>
166+
</goals>
167+
<configuration>
168+
<artifactSet>
169+
<excludes>
170+
<!-- <exclude>ch.qos.logback:*</exclude> -->
171+
<!-- <exclude>org.slf4j:*</exclude> -->
172+
</excludes>
173+
</artifactSet>
174+
<transformers>
175+
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
176+
<resource>otarules.btm</resource>
177+
</transformer>
178+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
179+
<manifestEntries>
180+
<Agent-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent</Agent-Class>
181+
<Premain-Class>io.opentracing.contrib.agent.AnnotationsTracingAgent
182+
</Premain-Class>
183+
<Can-Redefine-Classes>true</Can-Redefine-Classes>
184+
<Can-Retransform-Classes>true</Can-Retransform-Classes>
185+
<Boot-Class-Path>./${project.artifactId}.jar</Boot-Class-Path>
186+
</manifestEntries>
187+
</transformer>
188+
</transformers>
189+
</configuration>
190+
</execution>
191+
</executions>
192+
</plugin>
193+
</plugins>
194+
</build>
195+
196+
</project>

dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java renamed to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java

File renamed without changes.

dd-java-agent/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java renamed to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/ApacheHTTPClientTest.java

File renamed without changes.

dd-java-agent/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java renamed to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/JettyServletInstrumentationTest.java

File renamed without changes.

dd-java-agent/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java renamed to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/MongoClientInstrumentationTest.java

File renamed without changes.

dd-java-agent/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java renamed to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/OkHTTPInstrumentationTest.java

File renamed without changes.

dd-java-agent/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java renamed to dd-java-agent-ittests/src/test/java/com/datadoghq/trace/instrument/TomcatServletInstrumentationTest.java

File renamed without changes.

dd-java-agent/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java renamed to dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java

File renamed without changes.

dd-java-agent/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java renamed to dd-java-agent-ittests/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java

File renamed without changes.

‎dd-java-agent-ittests/src/test/resources/logback.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
4+
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
5+
<layout class="ch.qos.logback.classic.PatternLayout">
6+
<Pattern>
7+
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
8+
</Pattern>
9+
</layout>
10+
</appender>
11+
12+
<root level="INFO">
13+
<appender-ref ref="console"/>
14+
</root>
15+
16+
</configuration>

0 commit comments

Comments
 (0)