Format
This commit is contained in:
parent
e32bf1816a
commit
8c558fa00e
|
@ -23,5 +23,4 @@ public class EchoServiceImpl implements EchoService {
|
|||
public List<String> tracedMethod() {
|
||||
return java.util.Arrays.asList("msg1", "msg2", "msg3");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
@ -127,13 +127,13 @@ class KotlinCoroutineTests(private val dispatcher: CoroutineDispatcher) {
|
|||
}
|
||||
|
||||
@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)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -16,10 +16,13 @@ public class DefaultWebClientAdvice {
|
|||
@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
|
||||
// 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
|
||||
// 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);
|
||||
|
|
|
@ -32,7 +32,7 @@ class SpringWebfluxHttpClientTest extends HttpClientTest<SpringWebfluxHttpClient
|
|||
}
|
||||
.block()
|
||||
|
||||
if(hasParent) {
|
||||
if (hasParent) {
|
||||
blockUntilChildSpansFinished(callback ? 3 : 2)
|
||||
}
|
||||
response.statusCode().value()
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
muzzle {
|
||||
pass {
|
||||
group = "org.apache.tomcat"
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue