lint fixes

Author: ezhang6811

propagators/propagator-aws-xray/src/AWSXRayPropagator.ts

@@ -50,8 +50,8 @@ const SAMPLED_FLAG_KEY = 'Sampled';
 const IS_SAMPLED = '1';
 const NOT_SAMPLED = '0';
 
-const LINEAGE_KEY = "Lineage";
-const LINEAGE_DELIMITER = ":";
+const LINEAGE_KEY = 'Lineage';
+const LINEAGE_DELIMITER = ':';
 const LINEAGE_HASH_LENGTH = 8;
 const LINEAGE_MAX_REQUEST_COUNTER = 255;
 const LINEAGE_MAX_LOOP_COUNTER = 32767;
@@ -82,24 +82,24 @@ export class AWSXRayPropagator implements TextMapPropagator {
         : NOT_SAMPLED;
     // TODO: Add OT trace state to the X-Ray trace header
 
-    let traceHeader = 
-        `${TRACE_ID_KEY}` +
-        `${KV_DELIMITER}` +
-        `${xrayTraceId}` +
-        `${TRACE_HEADER_DELIMITER}` +
-        `${PARENT_ID_KEY}` +
-        `${KV_DELIMITER}` +
-        `${parentId}` +
-        `${TRACE_HEADER_DELIMITER}` +
-        `${SAMPLED_FLAG_KEY}` +
-        `${KV_DELIMITER}` +
-        `${samplingFlag}`;
+    let traceHeader =
+      `${TRACE_ID_KEY}` +
+      `${KV_DELIMITER}` +
+      `${xrayTraceId}` +
+      `${TRACE_HEADER_DELIMITER}` +
+      `${PARENT_ID_KEY}` +
+      `${KV_DELIMITER}` +
+      `${parentId}` +
+      `${TRACE_HEADER_DELIMITER}` +
+      `${SAMPLED_FLAG_KEY}` +
+      `${KV_DELIMITER}` +
+      `${samplingFlag}`;
 
     const baggage = propagation.getBaggage(context);
     const lineageV2Header = baggage?.getEntry(LINEAGE_KEY)?.value;
 
     if (lineageV2Header) {
-      traceHeader += 
+      traceHeader +=
         `${TRACE_HEADER_DELIMITER}` +
         `${LINEAGE_KEY}` +
         `${KV_DELIMITER}` +
@@ -138,7 +138,8 @@ export class AWSXRayPropagator implements TextMapPropagator {
       return context;
     }
 
-    let baggage: Baggage = propagation.getBaggage(context) || propagation.createBaggage();
+    let baggage: Baggage =
+      propagation.getBaggage(context) || propagation.createBaggage();
 
     let pos = 0;
     let trimmedPart: string;
@@ -167,7 +168,7 @@ export class AWSXRayPropagator implements TextMapPropagator {
         parsedTraceFlags = AWSXRayPropagator._parseTraceFlag(value);
       } else if (trimmedPart.startsWith(LINEAGE_KEY)) {
         if (AWSXRayPropagator._isValidLineageV2Header(value)) {
-          baggage = baggage.setEntry(LINEAGE_KEY, {value});
+          baggage = baggage.setEntry(LINEAGE_KEY, { value });
         }
       }
     }
@@ -181,7 +182,10 @@ export class AWSXRayPropagator implements TextMapPropagator {
       isRemote: true,
     };
     if (isSpanContextValid(resultSpanContext)) {
-      context = trace.setSpan(context, trace.wrapSpanContext(resultSpanContext));
+      context = trace.setSpan(
+        context,
+        trace.wrapSpanContext(resultSpanContext)
+      );
     }
     if (baggage.getAllEntries().length > 0) {
       context = propagation.setBaggage(context, baggage);
@@ -233,17 +237,21 @@ export class AWSXRayPropagator implements TextMapPropagator {
 
   private static _isValidLineageV2Header(xrayLineageHeader: string): boolean {
     const lineageSubstrings = xrayLineageHeader.split(LINEAGE_DELIMITER);
-    if (lineageSubstrings.length != 3) {
+    if (lineageSubstrings.length !== 3) {
       return false;
     }
 
     const requestCounter = parseInt(lineageSubstrings[0]);
     const hashedResourceId = lineageSubstrings[1];
     const loopCounter = parseInt(lineageSubstrings[2]);
-  
-    const isValidKey = hashedResourceId.length == LINEAGE_HASH_LENGTH && !!hashedResourceId.match(/^[0-9a-fA-F]+$/);
-    const isValidRequestCounter = requestCounter >= 0 && requestCounter <= LINEAGE_MAX_REQUEST_COUNTER;
-    const isValidLoopCounter = loopCounter >= 0 && loopCounter <= LINEAGE_MAX_LOOP_COUNTER;
+
+    const isValidKey =
+      hashedResourceId.length === LINEAGE_HASH_LENGTH &&
+      !!hashedResourceId.match(/^[0-9a-fA-F]+$/);
+    const isValidRequestCounter =
+      requestCounter >= 0 && requestCounter <= LINEAGE_MAX_REQUEST_COUNTER;
+    const isValidLoopCounter =
+      loopCounter >= 0 && loopCounter <= LINEAGE_MAX_LOOP_COUNTER;
 
     return isValidKey && isValidRequestCounter && isValidLoopCounter;
   }

propagators/propagator-aws-xray/test/AWSXRayPropagator.test.ts

@@ -121,17 +121,20 @@ describe('AWSXRayPropagator', () => {
 
       assert.deepStrictEqual(carrier, {});
     });
-    
+
     it('should inject with lineage', () => {
       const spanContext: SpanContext = {
         traceId: TRACE_ID,
         spanId: SPAN_ID,
         traceFlags: SAMPLED_TRACE_FLAG,
       };
       xrayPropagator.inject(
-        propagation.setBaggage(trace.setSpan(ROOT_CONTEXT, trace.wrapSpanContext(spanContext)), propagation.createBaggage({
-          'Lineage': { value: LINEAGE_ID }
-        })),
+        propagation.setBaggage(
+          trace.setSpan(ROOT_CONTEXT, trace.wrapSpanContext(spanContext)),
+          propagation.createBaggage({
+            Lineage: { value: LINEAGE_ID },
+          })
+        ),
         carrier,
         defaultTextMapSetter
       );
@@ -370,30 +373,45 @@ describe('AWSXRayPropagator', () => {
     it('should extract lineage into baggage', () => {
       carrier[AWSXRAY_TRACE_ID_HEADER] =
         'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Lineage=100:e3b0c442:11';
-      const extractedContext = xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
+      const extractedContext = xrayPropagator.extract(
+        ROOT_CONTEXT,
+        carrier,
+        defaultTextMapGetter
+      );
 
-      assert.deepStrictEqual(propagation.getBaggage(extractedContext)?.getEntry('Lineage'), {
-        "value": LINEAGE_ID
-      });
+      assert.deepStrictEqual(
+        propagation.getBaggage(extractedContext)?.getEntry('Lineage'),
+        {
+          value: LINEAGE_ID,
+        }
+      );
     });
 
     const invalidLineageHeaders = [
-      "",
-      "::",
-      "1::",
-      "1::1",
-      "1:badc0de:13",
-      ":fbadc0de:13",
-      "65535:fbadc0de:255"
+      '',
+      '::',
+      '1::',
+      '1::1',
+      '1:badc0de:13',
+      ':fbadc0de:13',
+      '65535:fbadc0de:255',
     ];
 
-    invalidLineageHeaders.forEach((lineageHeader) => {
+    invalidLineageHeaders.forEach(lineageHeader => {
       it(`should ignore invalid lineage header: ${lineageHeader}`, () => {
-        carrier[AWSXRAY_TRACE_ID_HEADER] =
-          `Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Lineage=${lineageHeader}`;
-        const extractedContext = xrayPropagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter)
-
-        assert.deepStrictEqual(propagation.getBaggage(extractedContext), undefined);
+        carrier[
+          AWSXRAY_TRACE_ID_HEADER
+        ] = `Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Lineage=${lineageHeader}`;
+        const extractedContext = xrayPropagator.extract(
+          ROOT_CONTEXT,
+          carrier,
+          defaultTextMapGetter
+        );
+
+        assert.deepStrictEqual(
+          propagation.getBaggage(extractedContext),
+          undefined
+        );
       });
     });