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

small fixes

This commit is contained in:
renaudboutet 2017-05-23 14:47:02 +02:00
parent d07bf6cfb4
commit c89db2592c
5 changed files with 588 additions and 573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1121
dd-java-agent/dependency-reduced-pom.xml
View File

File diff suppressed because it is too large Load Diff

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

@ -195,7 +195,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<configuration>
<argLine>-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${version}/dd-java-agent-${version}.jar</argLine>
<argLine>-javaagent:${M2_REPO}/com/datadoghq/dd-java-agent/${project.version}/dd-java-agent-${project.version}.jar</argLine>
<includes>
<include>*Test.java</include>
</includes>

2
dd-java-agent/src/test/java/com/datadoghq/trace/instrument/AWSInstrumentationTest.java
View File

@ -20,7 +20,7 @@ public class AWSInstrumentationTest {
assertThat(builder.getRequestHandlers()).isNotNull();
assertThat(builder.getRequestHandlers().size()).isEqualTo(1);
assertThat(builder.getRequestHandlers().get(0).getClass()).isInstanceOf(TracingRequestHandler.class);
assertThat(builder.getRequestHandlers().get(0).getClass()).isEqualTo(TracingRequestHandler.class);
}

12
dd-trace-examples/dropwizard-mongo-client/src/main/java/com/example/helloworld/resources/HelloWorldResource.java
View File

@ -1,7 +1,9 @@
package com.example.helloworld.resources;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@ -14,7 +16,6 @@ import org.bson.Document;
import com.codahale.metrics.annotation.Timed;
import com.example.helloworld.api.Saying;
import com.google.common.base.Optional;
import com.mongodb.Block;
import com.mongodb.MongoClient;
import com.mongodb.client.ListDatabasesIterable;
@ -50,8 +51,13 @@ public class HelloWorldResource {
// Trace: Do some stuff with the DB
ListDatabasesIterable<Document> documents = mongoClient.listDatabases();
ArrayList<String> list = new ArrayList<String>();
documents.forEach((Block<? super Document>) document -> list.add(document.toJson()));
final List<String> list = new ArrayList<String>();
documents.forEach(new Consumer<Document>() {
@Override
public void accept(Document t) {
list.add(t.toJson());
}
});
afterDB();

24
pom.xml
View File

@ -10,7 +10,7 @@
<properties>
<opentracing.version>0.22.0</opentracing.version>
<java.version>1.6</java.version>
<java.version>1.7</java.version>
</properties>
<licenses>
@ -92,17 +92,17 @@
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<!-- <plugin> -->
<!-- <groupId>org.sonatype.plugins</groupId> -->
<!-- <artifactId>nexus-staging-maven-plugin</artifactId> -->
<!-- <version>1.6.3</version> -->
<!-- <extensions>true</extensions> -->
<!-- <configuration> -->
<!-- <serverId>ossrh</serverId> -->
<!-- <nexusUrl>https://oss.sonatype.org/</nexusUrl> -->
<!-- <autoReleaseAfterClose>true</autoReleaseAfterClose> -->
<!-- </configuration> -->
<!-- </plugin> -->
</plugins>
</build>