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

Merge pull request #660 from DataDog/mar-kolya/fix-JsonSpan-conversion-bug 

Fix JsonSpan boolean conversion problem
This commit is contained in:
Nikolay Martynov 2019-01-15 16:00:09 -05:00 committed by GitHub
parent a620983fb1 95c1c47799
commit 4d7bb59e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-trace/src/test/groovy/datadog/trace/tracer/JsonSpan.groovy
View File

@ -3,11 +3,13 @@ package datadog.trace.tracer
import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import groovy.transform.EqualsAndHashCode import groovy.transform.EqualsAndHashCode
import groovy.transform.ToString
/** /**
* Helper class to parse serialized span to verify serialization logic * Helper class to parse serialized span to verify serialization logic
*/ */
@EqualsAndHashCode @EqualsAndHashCode
@ToString
class JsonSpan { class JsonSpan {
@JsonProperty("trace_id") @JsonProperty("trace_id")
BigInteger traceId BigInteger traceId
@ -31,7 +33,9 @@ class JsonSpan {
String name String name
@JsonProperty("error") @JsonProperty("error")
boolean error // Somehow MsgPack formatter can not convert number to boolean with newer jackson so we have to do this manually
//@JsonFormat(shape = JsonFormat.Shape.NUMBER)
int error
@JsonProperty("meta") @JsonProperty("meta")
Map<String, String> meta Map<String, String> meta
@ -52,7 +56,7 @@ class JsonSpan {
type = span.getType() type = span.getType()
name = span.getName() name = span.getName()
error = span.isErrored() error = span.isErrored() ? 1 : 0
meta = span.getMeta() meta = span.getMeta()
} }

8
dd-trace/src/test/groovy/datadog/trace/tracer/writer/AgentClientTest.groovy
View File

@ -72,6 +72,7 @@ class AgentClientTest extends Specification {
response.getRate("another test") == 0.2d response.getRate("another test") == 0.2d
response.getRate("doesn't exist") == null response.getRate("doesn't exist") == null
and: "request got expected parameters" and: "request got expected parameters"
byte[] requestBody = null
verify(putRequestedFor(urlEqualTo(AgentClient.TRACES_ENDPOINT)) verify(putRequestedFor(urlEqualTo(AgentClient.TRACES_ENDPOINT))
.withHeader(AgentClient.CONTENT_TYPE, equalTo(AgentClient.MSGPACK)) .withHeader(AgentClient.CONTENT_TYPE, equalTo(AgentClient.MSGPACK))
.withHeader(AgentClient.DATADOG_META_LANG, equalTo("java")) .withHeader(AgentClient.DATADOG_META_LANG, equalTo("java"))
@ -81,9 +82,12 @@ class AgentClientTest extends Specification {
// .withHeader(AgentClient.DATADOG_META_TRACER_VERSION, equalTo("java")) // .withHeader(AgentClient.DATADOG_META_TRACER_VERSION, equalTo("java"))
.withHeader(AgentClient.X_DATADOG_TRACE_COUNT, equalTo(Integer.toString(TRACE_COUNT))) .withHeader(AgentClient.X_DATADOG_TRACE_COUNT, equalTo(Integer.toString(TRACE_COUNT)))
.andMatching({ Request request -> .andMatching({ Request request ->
// Note: it is hard to see what's wrong when this fails... is there a better way? requestBody = request.getBody()
MatchResult.of(objectMapper.readValue(request.getBody(), new TypeReference<List<List<JsonSpan>>>() {}) == traces.collect {it.getSpans().collect {new JsonSpan(it)}}) MatchResult.of(true)
})) }))
objectMapper.readValue(requestBody, new TypeReference<List<List<JsonSpan>>>() {}) == traces.collect {
it.getSpans().collect { new JsonSpan(it) }
}
} }
def "test send empty list"() { def "test send empty list"() {