Skip to content

refactoring skel #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renaudboutet merged 6 commits into from
Jun 1, 2017
Merged

refactoring skel #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a41751
refactoring skel
gpolaert May 31, 2017
69b6207
[maven-release-plugin] prepare release v0.0.2
gpolaert May 31, 2017
1bb36a8
[maven-release-plugin] prepare for next development iteration
gpolaert May 31, 2017
fcb214b
fix version deps
gpolaert May 31, 2017
c4f35a9
updating manualy some dep issues
gpolaert May 31, 2017
cbf4e0f
updating manualy some dep issues
gpolaert May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 196 additions & 0 deletions dd-java-agent-ittests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.datadoghq</groupId>
<artifactId>dd-trace-java</artifactId>
<version>0.0.3-SNAPSHOT</version>
</parent>

<artifactId>dd-java-agent-ittests</artifactId>
<packaging>jar</packaging>
<name>dd-java-agent-ittests</name>
<description>Datadog Java Agent integration tests</description>
<url>https://github.com/datadog/dd-trace-java</url>


<properties>
<dd-trace.version>0.0.3-SNAPSHOT</dd-trace.version>
</properties>

<dependencies>

<!-- DD Agent tests (@Trace annotation)-->
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>dd-java-agent</artifactId>
<version>${dd-trace.version}</version>
<scope>test</scope>
</dependency>

<!-- JUnit tests -->
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
<version>${opentracing.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.7.22</version>
<scope>test</scope>
</dependency>

<!-- Mongo tests -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>3.4.2</version>
<scope>test</scope>
</dependency>

<!-- Jetty Servlet tests -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.1.v20170120</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>9.4.1.v20170120</version>
<scope>test</scope>
</dependency>

<!-- Tomcat Servlet tests -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.41</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>8.0.41</version>
<scope>test</scope>
</dependency>

<!-- AWS SDK tests -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.11.132</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- OkHTTP tests -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.6.0</version>
<scope>test</scope>
</dependency>

<!-- Apache HTTP client tests -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
<scope>test</scope>
</dependency>

</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<configuration>
<!-- TODO fixit, Due to a Java Heap error, skiping test-->
<skipTests>true</skipTests>
<includes>
<include>*Test.java</include>
</includes>
<forkCount>3</forkCount>
<reuseForks>false</reuseForks>
<argLine>-Xmx1g -Xms1g -XX:MaxPermSize=512m -Dorg.jboss.byteman.verbose=true
-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar
</argLine>
<workingDirectory>target/FORK_DIRECTORY_${surefire.forkNumber}</workingDirectory>
</configuration>
</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>
</build>

</project>
0 ...ce/instrument/AWSInstrumentationTest.java → ...ce/instrument/AWSInstrumentationTest.java
View file
Open in desktop
File renamed without changes.
0 ...race/instrument/ApacheHTTPClientTest.java → ...race/instrument/ApacheHTTPClientTest.java
View file
Open in desktop
File renamed without changes.
0 ...ment/JettyServletInstrumentationTest.java → ...ment/JettyServletInstrumentationTest.java
View file
Open in desktop
File renamed without changes.
0 ...ument/MongoClientInstrumentationTest.java → ...ument/MongoClientInstrumentationTest.java
View file
Open in desktop
File renamed without changes.
0 ...instrument/OkHTTPInstrumentationTest.java → ...instrument/OkHTTPInstrumentationTest.java
View file
Open in desktop
File renamed without changes.
0 ...ent/TomcatServletInstrumentationTest.java → ...ent/TomcatServletInstrumentationTest.java
View file
Open in desktop
File renamed without changes.
0 ...tracing/contrib/agent/SayTracedHello.java → ...tracing/contrib/agent/SayTracedHello.java
View file
Open in desktop
File renamed without changes.
0 ...ib/agent/TraceAnnotationsManagerTest.java → ...ib/agent/TraceAnnotationsManagerTest.java
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions dd-java-agent-ittests/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>

<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</Pattern>
</layout>
</appender>

<root level="INFO">
<appender-ref ref="console"/>
</root>

</configuration>
4 changes: 2 additions & 2 deletions dd-java-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ To instrument your project or your servers you simply have to declare the provid

```
# use latest version
curl -OL http://central.maven.org/maven2/com/datadoghq/dd-java-agent/0.0.1/dd-java-agent-0.0.1.jar
curl -OL http://central.maven.org/maven2/com/datadoghq/dd-java-agent/{version}/dd-java-agent-{version}.jar
```

- Then add the following JVM argument when launching your application (in IDE, using Maven run or simply in collaboration with the `>java -jar` command):

```
-javaagent:/path/to/the/dd-java-agent-0.0.1.jar
-javaagent:/path/to/the/dd-java-agent-{version}.jar
```

That's it! If you did this properly the agent was executed at pre-main, had detected and instrumented the supported libraries and custom traces. You should then see traces on [Datadog APM](https://app.datadoghq.com/apm/search).
Expand Down
Loading