Incorporate newly added TraceOptions & merge master

open-telemetry · Jul 11, 2019 · b3c859c · b3c859c
1 parent 9109b76
commit b3c859c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/opentelemetry-core/src/context/propagation/BinaryTraceContext.ts b/packages/opentelemetry-core/src/context/propagation/BinaryTraceContext.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { BinaryFormat, SpanContext } from '@opentelemetry/types';
+import { BinaryFormat, SpanContext, TraceOptions } from '@opentelemetry/types';
 
 const VERSION_ID = 0;
 const TRACE_ID_FIELD_ID = 0;
@@ -61,7 +61,7 @@ export class BinaryTraceContext implements BinaryFormat {
     result.write(spanContext.spanId, SPAN_ID_OFFSET, SPAN_ID_SIZE, 'hex');
     result.writeUInt8(TRACE_OPTION_FIELD_ID, TRACE_OPTION_FIELD_ID_OFFSET);
     result.writeUInt8(
-      Number(spanContext.traceOptions) || 0,
+      Number(spanContext.traceOptions) || TraceOptions.UNSAMPLED,
       TRACE_OPTIONS_OFFSET
     );
     return result;

diff --git a/...xt/propagation/binarytracecontext.test.ts → ...e/test/context/BinaryTraceContext.test.ts b/...xt/propagation/binarytracecontext.test.ts → ...e/test/context/BinaryTraceContext.test.ts
@@ -15,8 +15,8 @@
  */
 
 import * as assert from 'assert';
-import { BinaryTraceContext } from '../../../src/context/propagation/BinaryTraceContext';
-import { SpanContext } from '@opentelemetry/types';
+import { BinaryTraceContext } from '../../src/context/propagation/BinaryTraceContext';
+import { SpanContext, TraceOptions } from '@opentelemetry/types';
 
 describe('BinaryTraceContext', () => {
   const binaryTraceContext = new BinaryTraceContext();
@@ -32,7 +32,7 @@ describe('BinaryTraceContext', () => {
       structured: {
         traceId: commonTraceId,
         spanId: commonSpanId,
-        traceOptions: 1,
+        traceOptions: TraceOptions.SAMPLED,
       },
       binary: `0000${commonTraceId}01${commonSpanId}02${'01'}`,
       description: 'span context with 64-bit span ID',
@@ -73,7 +73,10 @@ describe('BinaryTraceContext', () => {
         assert.deepStrictEqual(
           binaryTraceContext.fromBytes(Buffer.from(testCase.binary, 'hex')),
           testCase.structured &&
-            Object.assign({ traceOptions: 0 }, testCase.structured)
+            Object.assign(
+              { traceOptions: TraceOptions.UNSAMPLED },
+              testCase.structured
+            )
         );
       })
     );