diff options
| author | Bogdan Drutu <bdrutu@google.com> | 2018-08-27 15:40:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 15:40:12 -0700 |
| commit | 8901e4eb583785efaa2c3adea882d850662d93fc (patch) | |
| tree | 313ebea77d5fabad42082dd059acd0f418a03242 /impl_core | |
| parent | 217a1e86dd1082296b7278253f5f51633191fb06 (diff) | |
| download | opencensus-java-8901e4eb583785efaa2c3adea882d850662d93fc.tar.gz | |
Add get/from{Byte} methods on TraceOptions and deprecate get/from{Bytes}. (#1392)
* Add get/from{Byte} methods on TraceOptions and deprecate get/from{Bytes}.
* Update changelog.
Diffstat (limited to 'impl_core')
3 files changed, 5 insertions, 5 deletions
diff --git a/impl_core/src/main/java/io/opencensus/implcore/trace/propagation/BinaryFormatImpl.java b/impl_core/src/main/java/io/opencensus/implcore/trace/propagation/BinaryFormatImpl.java index 1af24854..233fbd31 100644 --- a/impl_core/src/main/java/io/opencensus/implcore/trace/propagation/BinaryFormatImpl.java +++ b/impl_core/src/main/java/io/opencensus/implcore/trace/propagation/BinaryFormatImpl.java @@ -141,7 +141,7 @@ final class BinaryFormatImpl extends BinaryFormat { if (bytes.length < ALL_FORMAT_LENGTH) { throw new SpanContextParseException("Invalid input: truncated"); } - traceOptions = TraceOptions.fromBytes(bytes, pos + ID_SIZE); + traceOptions = TraceOptions.fromByte(bytes[pos + ID_SIZE]); } return SpanContext.create(traceId, spanId, traceOptions, TRACESTATE_DEFAULT); } diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/B3FormatTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/B3FormatTest.java index 45514d06..29553f3f 100644 --- a/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/B3FormatTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/B3FormatTest.java @@ -49,8 +49,8 @@ public class B3FormatTest { TraceId.fromLowerBase16("0000000000000000" + TRACE_ID_BASE16_EIGHT_BYTES); private static final String SPAN_ID_BASE16 = "ff00000000000041"; private static final SpanId SPAN_ID = SpanId.fromLowerBase16(SPAN_ID_BASE16); - private static final byte[] TRACE_OPTIONS_BYTES = new byte[] {1}; - private static final TraceOptions TRACE_OPTIONS = TraceOptions.fromBytes(TRACE_OPTIONS_BYTES); + private static final byte TRACE_OPTIONS_BYTE = 1; + private static final TraceOptions TRACE_OPTIONS = TraceOptions.fromByte(TRACE_OPTIONS_BYTE); private final B3Format b3Format = new B3Format(); @Rule public ExpectedException thrown = ExpectedException.none(); private final Setter<Map<String, String>> setter = diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/BinaryFormatImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/BinaryFormatImplTest.java index 398b18a3..f43be479 100644 --- a/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/BinaryFormatImplTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/trace/propagation/BinaryFormatImplTest.java @@ -39,8 +39,8 @@ public class BinaryFormatImplTest { private static final TraceId TRACE_ID = TraceId.fromBytes(TRACE_ID_BYTES); private static final byte[] SPAN_ID_BYTES = new byte[] {97, 98, 99, 100, 101, 102, 103, 104}; private static final SpanId SPAN_ID = SpanId.fromBytes(SPAN_ID_BYTES); - private static final byte[] TRACE_OPTIONS_BYTES = new byte[] {1}; - private static final TraceOptions TRACE_OPTIONS = TraceOptions.fromBytes(TRACE_OPTIONS_BYTES); + private static final byte TRACE_OPTIONS_BYTES = 1; + private static final TraceOptions TRACE_OPTIONS = TraceOptions.fromByte(TRACE_OPTIONS_BYTES); private static final byte[] EXAMPLE_BYTES = new byte[] { 0, 0, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 1, 97, 98, 99, 100, |