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

Format

This commit is contained in:
Trask Stalnaker 2019-10-03 18:26:23 -07:00
parent e32bf1816a
commit 8c558fa00e
25 changed files with 75 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java
View File

@ -23,5 +23,4 @@ public class EchoServiceImpl implements EchoService {
public List<String> tracedMethod() {
return java.util.Arrays.asList("msg1", "msg2", "msg3");
}
}

10
dd-java-agent/instrumentation/elasticsearch/rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -51,11 +51,11 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
client = RestClient.builder(new HttpHost("localhost", httpPort))
.setMaxRetryTimeoutMillis(Integer.MAX_VALUE)
.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
.build()
}

10
dd-java-agent/instrumentation/elasticsearch/rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy
View File

@ -56,11 +56,11 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
client = RestClient.builder(new HttpHost("localhost", httpPort))
.setMaxRetryTimeoutMillis(Integer.MAX_VALUE)
.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
.build()
}

10
dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -54,11 +54,11 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
client = RestClient.builder(new HttpHost("localhost", httpPort))
.setMaxRetryTimeoutMillis(Integer.MAX_VALUE)
.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
.build()
}

10
dd-java-agent/instrumentation/elasticsearch/rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -51,11 +51,11 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
client = RestClient.builder(new HttpHost("localhost", httpPort))
.setMaxRetryTimeoutMillis(Integer.MAX_VALUE)
.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
@Override
RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder builder) {
return builder.setConnectTimeout(Integer.MAX_VALUE).setSocketTimeout(Integer.MAX_VALUE)
}
})
.build()
}

4
dd-java-agent/instrumentation/instrumentation.gradle
View File

@ -16,7 +16,7 @@ plugins {
apply from: "${rootDir}/gradle/java.gradle"
Project instr_project = project
subprojects {Project subProj ->
subprojects { Project subProj ->
apply plugin: "net.bytebuddy.byte-buddy"
apply plugin: 'muzzle'
@ -48,7 +48,7 @@ subprojects {Project subProj ->
compile project(':dd-trace-api')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy
if(jdkCompile) {
if (jdkCompile) {
"$jdkCompile" project(':dd-trace-api')
"$jdkCompile" project(':dd-java-agent:agent-tooling')
"$jdkCompile" deps.bytebuddy

12
dd-java-agent/instrumentation/java-concurrent/kotlin-testing/src/test/kotlin/KotlinCoroutineTests.kt
View File

@ -14,7 +14,7 @@ class KotlinCoroutineTests(private val dispatcher: CoroutineDispatcher) {
@Trace
fun tracedAcrossChannels(): Int = runTest {
val producer = produce {
repeat(3){
repeat(3) {
tracedChild("produce_$it")
send(it)
}
@ -94,7 +94,7 @@ class KotlinCoroutineTests(private val dispatcher: CoroutineDispatcher) {
5
}
/**
/**
* @return Number of expected spans in the trace
*/
@Trace
@ -123,17 +123,17 @@ class KotlinCoroutineTests(private val dispatcher: CoroutineDispatcher) {
}
}
4
4
}
@Trace
fun tracedChild(opName: String){
fun tracedChild(opName: String) {
activeSpan().setSpanName(opName)
}
private fun <T> runTest(asyncPropagation: Boolean = true, block: suspend CoroutineScope.()->T ): T {
private fun <T> runTest(asyncPropagation: Boolean = true, block: suspend CoroutineScope.() -> T): T {
activeScope().setAsyncPropagation(asyncPropagation)
return runBlocking(dispatcher,block = block)
return runBlocking(dispatcher, block = block)
}
}

2
dd-java-agent/instrumentation/jax-rs-client-2.0/src/test/groovy/JaxRsClientAsyncTest.groovy
View File

@ -24,7 +24,7 @@ abstract class JaxRsClientAsyncTest extends HttpClientTest<JaxRsClientDecorator>
AsyncInvoker request = builder.async()
def body = BODY_METHODS.contains(method) ? Entity.text("") : null
Response response = request.method(method, (Entity) body, new InvocationCallback<Response>(){
Response response = request.method(method, (Entity) body, new InvocationCallback<Response>() {
@Override
void completed(Response s) {
callback?.call()

4
dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterable.java
View File

@ -20,11 +20,11 @@ public class TracingIterable implements Iterable<ConsumerRecord> {
@Override
public Iterator<ConsumerRecord> iterator() {
Iterator<ConsumerRecord> it;
final Iterator<ConsumerRecord> it;
// We should only return one iterator with tracing.
// However, this is not thread-safe, but usually the first (hopefully only) traversal of
// ConsumerRecords is performed in the same thread that called poll()
if (this.firstIterator) {
if (firstIterator) {
it = new TracingIterator(delegate.iterator(), operationName, decorator);
firstIterator = false;
} else {

2
dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
View File

@ -131,7 +131,7 @@ class KafkaClientTest extends AgentTestRunner {
def kafkaPartition = 0
def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka)
consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest")
def consumer = new KafkaConsumer<String,String>(consumerProperties)
def consumer = new KafkaConsumer<String, String>(consumerProperties)
def senderProps = KafkaTestUtils.senderProps(embeddedKafka.getBrokersAsString())
def producer = new KafkaProducer(senderProps)

2
dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoClientTest.groovy
View File

@ -26,7 +26,7 @@ class MongoClientTest extends MongoBaseTest {
def setup() throws Exception {
client = new MongoClient(new ServerAddress("localhost", port),
MongoClientOptions.builder()
.description("some-description")
.description("some-description")
.build())
}

2
dd-java-agent/instrumentation/mongo/driver-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy
View File

@ -104,7 +104,7 @@ class MongoAsyncClientTest extends MongoBaseTest {
assertTraces(1) {
trace(0, 1) {
mongoSpan(it, 0) {
assert it.replaceAll(" ", "") == "{\"count\":\"$collectionName\",\"query\":{}}" ||
assert it.replaceAll(" ", "") == "{\"count\":\"$collectionName\",\"query\":{}}" ||
it == "{\"count\": \"$collectionName\", \"query\": {}, \"\$db\": \"?\", \"\$readPreference\": {\"mode\": \"?\"}}"
true
}

25
dd-java-agent/instrumentation/spring-webflux-5/src/main/java8/datadog/trace/instrumentation/springwebflux/client/DefaultWebClientAdvice.java
View File

@ -10,18 +10,21 @@ public class DefaultWebClientAdvice {
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void methodExit(
@Advice.Thrown final Throwable throwable,
@Advice.This final ExchangeFunction exchangeFunction,
@Advice.Argument(0) final ClientRequest clientRequest,
@Advice.Return(readOnly = false) Mono<ClientResponse> mono) {
@Advice.Thrown final Throwable throwable,
@Advice.This final ExchangeFunction exchangeFunction,
@Advice.Argument(0) final ClientRequest clientRequest,
@Advice.Return(readOnly = false) Mono<ClientResponse> mono) {
if (throwable == null
&& mono != null
// The response of the org.springframework.web.reactive.function.client.ExchangeFunction.exchange method is
// replaced by a decorator that in turn also calls the
// org.springframework.web.reactive.function.client.ExchangeFunction.exchange method. If the original return value
// is already decorated (we detect this if the "x-datadog-trace-id" is added), the result is not decorated again
// to avoid StackOverflowErrors.
&& !clientRequest.headers().keySet().contains("x-datadog-trace-id")) {
&& mono != null
// The response of the
// org.springframework.web.reactive.function.client.ExchangeFunction.exchange method is
// replaced by a decorator that in turn also calls the
// org.springframework.web.reactive.function.client.ExchangeFunction.exchange method. If the
// original return value
// is already decorated (we detect this if the "x-datadog-trace-id" is added), the result is
// not decorated again
// to avoid StackOverflowErrors.
&& !clientRequest.headers().keySet().contains("x-datadog-trace-id")) {
mono = new TracingClientResponseMono(clientRequest, exchangeFunction);
}
}

28
dd-java-agent/instrumentation/spring-webflux-5/src/main/java8/datadog/trace/instrumentation/springwebflux/client/TracingClientResponseSubscriber.java
View File

@ -49,22 +49,22 @@ public class TracingClientResponseSubscriber implements CoreSubscriber<ClientRes
DECORATE.onRequest(span, clientRequest);
subscriber.onSubscribe(
new Subscription() {
@Override
public void request(final long n) {
try (final AgentScope scope = activateSpan(span, false)) {
subscription.request(n);
new Subscription() {
@Override
public void request(final long n) {
try (final AgentScope scope = activateSpan(span, false)) {
subscription.request(n);
}
}
}
@Override
public void cancel() {
DECORATE.onCancel(span);
DECORATE.beforeFinish(span);
subscription.cancel();
span.finish();
}
});
@Override
public void cancel() {
DECORATE.onCancel(span);
DECORATE.beforeFinish(span);
subscription.cancel();
span.finish();
}
});
}
}

2
dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientTest.groovy
View File

@ -32,7 +32,7 @@ class SpringWebfluxHttpClientTest extends HttpClientTest<SpringWebfluxHttpClient
}
.block()
if(hasParent) {
if (hasParent) {
blockUntilChildSpansFinished(callback ? 3 : 2)
}
response.statusCode().value()

1
dd-java-agent/instrumentation/tomcat-classloading/tomcat-classloading.gradle
View File

@ -1,4 +1,3 @@
muzzle {
pass {
group = "org.apache.tomcat"

2
dd-smoke-tests/springboot/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java
View File

@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class SpringbootApplication {
public static void main(String[] args) {
public static void main(final String[] args) {
SpringApplication.run(SpringbootApplication.class, args);
}
}