Skip to content

Commit fe667ec

Browse files
gpolaertgpolaert
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents ca32835 + c7353c8 commit fe667ec

3 files changed

Lines changed: 56 additions & 11 deletions

File tree

‎dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,4 @@ private static String buildWithTags(CtMethod javassistMethod){
177177
}
178178
return "";
179179
};
180-
181-
182-
@Trace
183-
public static void main(String[] args) throws Throwable{
184-
loadRules(ClassLoader.getSystemClassLoader());
185-
}
186180
}

‎dd-java-agent/src/test/java/io/opentracing/contrib/agent/SayTracedHello.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@
22

33
public class SayTracedHello {
44

5-
@Trace
6-
public String sayHello(){
5+
@Trace(operationName="SAY_HELLO",tagsKV={"service-name","test"})
6+
public static String sayHello(){
77
return "hello!";
88
}
99

10+
@Trace(operationName="SAY_HA",tagsKV={"service-name","test","span-type","DB"})
11+
public static String sayHA(){
12+
return "HA!!";
13+
}
14+
15+
@Trace(operationName="NEW_TRACE",tagsKV={"service-name","test2"})
16+
public static String sayHELLOsayHA(){
17+
return sayHello()+sayHA();
18+
}
19+
1020
}

‎dd-java-agent/src/test/java/io/opentracing/contrib/agent/TraceAnnotationsManagerTest.java‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,56 @@
11
package io.opentracing.contrib.agent;
22

3-
import static org.junit.Assert.*;
3+
import static org.assertj.core.api.Assertions.assertThat;
44

5+
import org.junit.Before;
56
import org.junit.Test;
67

8+
import io.opentracing.mock.MockTracer;
9+
import io.opentracing.util.GlobalTracer;
10+
711
public class TraceAnnotationsManagerTest {
812

13+
protected MockTracer tracer = new MockTracer();
14+
15+
@Before
16+
public void beforeTest() throws Exception {
17+
GlobalTracer.register(tracer);
18+
}
19+
920
@Test
1021
public void test() {
22+
//Test single span in new trace
23+
SayTracedHello.sayHello();
24+
25+
assertThat(tracer.finishedSpans().size()).isEqualTo(1);
26+
assertThat(tracer.finishedSpans().get(0).operationName()).isEqualTo("SAY_HELLO");
27+
assertThat(tracer.finishedSpans().get(0).tags().get("service-name")).isEqualTo("test");
28+
29+
tracer.reset();
30+
31+
//Test new trace with 2 children spans
32+
SayTracedHello.sayHELLOsayHA();
33+
assertThat(tracer.finishedSpans().size()).isEqualTo(3);
34+
assertThat(tracer.finishedSpans().get(0).operationName()).isEqualTo("SAY_HELLO");
35+
assertThat(tracer.finishedSpans().get(0).tags().get("service-name")).isEqualTo("test");
36+
37+
long traceId = tracer.finishedSpans().get(0).context().traceId();
38+
long parentId = tracer.finishedSpans().get(0).parentId();
39+
40+
assertThat(tracer.finishedSpans().get(1).operationName()).isEqualTo("SAY_HA");
41+
assertThat(tracer.finishedSpans().get(1).parentId()).isEqualTo(parentId);
42+
assertThat(tracer.finishedSpans().get(1).context().traceId()).isEqualTo(traceId);
43+
assertThat(tracer.finishedSpans().get(1).tags().get("span-type")).isEqualTo("DB");
44+
assertThat(tracer.finishedSpans().get(1).tags().get("service-name")).isEqualTo("test");
45+
46+
assertThat(tracer.finishedSpans().get(2).operationName()).isEqualTo("NEW_TRACE");
47+
assertThat(tracer.finishedSpans().get(2).parentId()).isEqualTo(0);//ROOT / no parent
48+
assertThat(tracer.finishedSpans().get(2).context().traceId()).isEqualTo(traceId);
49+
assertThat(tracer.finishedSpans().get(2).tags().get("service-name")).isEqualTo("test2");
50+
1151

12-
System.out.println("hello");
52+
System.out.println(tracer.finishedSpans());
53+
tracer.reset();
1354
}
1455

15-
}
56+
}

0 commit comments

Comments
 (0)