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

shading all stuff and removing from the scope all libs which can crash the app

This commit is contained in:
Guillaume Polaert 2017-06-29 15:08:12 +02:00 committed by Tyler Benson
parent b16ca52ce0
commit d3ce6b1a3e
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,12 @@
</dependency>
<!-- JUnit tests -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>

8
dd-java-agent/pom.xml
View File

@ -236,7 +236,13 @@
</dependency>
<!-- JUnit tests -->
<!-- Tests -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>

11
dd-trace-annotations/pom.xml
View File

@ -11,15 +11,4 @@
<name>dd-trace-annotations</name>
<url>https://github.com/datadog/dd-trace-java</url>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

43
dd-trace/pom.xml
View File

@ -56,11 +56,6 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<!-- Required for the tracer resolver / annotation -->
<dependency>
@ -70,6 +65,12 @@
</dependency>
<!-- Testing dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -108,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
@ -119,23 +120,31 @@
<relocations>
<relocation>
<pattern>com.fasterxml</pattern>
<shadedPattern>dd.com.fasterxml</shadedPattern>
<shadedPattern>shaded.com.fasterxml</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.guava</pattern>
<shadedPattern>shaded.com.google.guava</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>shaded.com.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.auto</pattern>
<shadedPattern>shaded.com.google.auto</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
<shadedPattern>shaded.com.google.thirdparty</shadedPattern>
</relocation>
<!--<relocation>-->
<!--<pattern>com.google</pattern>-->
<!--<shadedPattern>dd.com.google</shadedPattern>-->
<!--</relocation>-->
<relocation>
<pattern>org.yaml</pattern>
<shadedPattern>dd.org.yaml</shadedPattern>
<shadedPattern>shaded.org.yaml</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>dd.org.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>ch.qos</pattern>
<shadedPattern>dd.ch.qos</shadedPattern>
<shadedPattern>shaded.org.slf4j</shadedPattern>
</relocation>
</relocations>
<transformers>

5
pom.xml
View File

@ -32,8 +32,8 @@
<url>https://github.com/datadog/dd-trace-java</url>
<connection>scm:git:git://github.com/datadog/dd-trace-java.git</connection>
<developerConnection>scm:git:git@github.com:datadog/dd-trace-java.git</developerConnection>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>
<modules>
<module>dd-trace</module>
@ -47,6 +47,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<opentracing.version>0.30.0</opentracing.version>
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<distributionManagement>