Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Upgrade proto to 0.10.0 #154

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependency-versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ ext.versionMap = [
slf4j_api : '1.7.30',
slf4j_log4j12 : '1.7.30',
validation_api : '2.0.1.Final',
opentelemetry_proto : '0.9.1'
opentelemetry_proto : '0.10.0'
]
10 changes: 5 additions & 5 deletions examples/odfe-pipes-trace-app/python-services/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
mysql-connector==2.2.9
opentelemetry-exporter-otlp==0.12b0
opentelemetry-instrumentation-flask==0.12b0
opentelemetry-instrumentation-mysql==0.12b0
opentelemetry-instrumentation-requests==0.12b0
opentelemetry-sdk==0.12b0
opentelemetry-exporter-otlp==0.14b0
opentelemetry-instrumentation-flask==0.14b0
opentelemetry-instrumentation-mysql==0.14b0
opentelemetry-instrumentation-requests==0.14b0
opentelemetry-sdk==0.14b0
protobuf==3.12.2
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ public void testInstrumentationLibraryAttributes(){

@Test
public void testStatusAttributes(){
final Status st1 = Status.newBuilder().setCode(Status.StatusCode.STATUS_CODE_ABORTED).setMessage("Some message").build();
final Status st1 = Status.newBuilder().setCode(Status.StatusCode.STATUS_CODE_ERROR).setMessage("Some message").build();
final Status st2 = Status.newBuilder().setMessage("error message").build();
final Status st3 = Status.newBuilder().setCode(Status.StatusCode.STATUS_CODE_ALREADY_EXISTS).build();
final Status st3 = Status.newBuilder().setCode(Status.StatusCode.STATUS_CODE_UNSET).build();
final Status st4 = Status.newBuilder().build();

assertThat(OTelProtoHelper.getSpanStatusAttributes(st1).size()==2).isTrue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void testRawSpan() throws DecoderException {
.setKind(Span.SpanKind.SPAN_KIND_CONSUMER)
.setStartTimeUnixNano(651242400000000321L)
.setEndTimeUnixNano(651242400000000321L+3000)
.setStatus(Status.newBuilder().setCodeValue(Status.StatusCode.STATUS_CODE_ABORTED_VALUE).setMessage("status-description").build())
.setStatus(Status.newBuilder().setCodeValue(Status.StatusCode.STATUS_CODE_UNSET_VALUE).setMessage("status-description").build())
.addAttributes(KeyValue.newBuilder()
.setKey("some-key")
.build()
Expand All @@ -51,7 +51,7 @@ public void testRawSpan() throws DecoderException {
assertThat(rawSpan.getStartTime().equals(OTelProtoHelper.getStartTimeISO8601(span))).isTrue();
assertThat(rawSpan.getEndTime().equals(OTelProtoHelper.getEndTimeISO8601(span))).isTrue();
assertThat(rawSpan.getAttributes().get(OTelProtoHelper.STATUS_MESSAGE)).isEqualTo("status-description");
assertThat(rawSpan.getAttributes().get(OTelProtoHelper.STATUS_CODE)).isEqualTo(10);
assertThat(rawSpan.getAttributes().get(OTelProtoHelper.STATUS_CODE)).isEqualTo(0);
assertThat(rawSpan.getAttributes().get(OTelProtoHelper.SPAN_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply("some-key")).equals("")).isTrue();
assertThat(rawSpan.getDroppedAttributesCount()).isEqualTo(1);
assertThat(rawSpan.getDroppedLinksCount()).isEqualTo(0);
Expand Down