gts fix, revert changes to mongodb instrumentation

census-instrumentation · Jul 20, 2021 · d4c307e · d4c307e
1 parent 6fdf5ac
commit d4c307e
Show file tree

Hide file tree

Showing 17 changed files with 146 additions and 317 deletions.
diff --git a/packages/opencensus-core/src/exporters/console-exporter.ts b/packages/opencensus-core/src/exporters/console-exporter.ts
@@ -67,9 +67,7 @@ export class ConsoleExporter implements Exporter {
    */
   publish(spans: modelTypes.Span[]) {
     spans.map(span => {
-      const ROOT_STR = `RootSpan: {traceId: ${span.traceId}, spanId: ${
-        span.id
-      }, name: ${span.name} }`;
+      const ROOT_STR = `RootSpan: {traceId: ${span.traceId}, spanId: ${span.id}, name: ${span.name} }`;
       const SPANS_STR: string[] = span.spans.map(child =>
         [`\t\t{spanId: ${child.id}, name: ${child.name}}`].join('\n')
       );

diff --git a/packages/opencensus-core/test/test-recorder.ts b/packages/opencensus-core/test/test-recorder.ts
@@ -98,9 +98,7 @@ describe('Recorder', () => {
   for (const measure of measures) {
     describe(`for count aggregation data of ${measure.type} values`, () => {
       for (const testCase of testCases) {
-        it(`should record measurements ${
-          testCase.description
-        } correctly`, () => {
+        it(`should record measurements ${testCase.description} correctly`, () => {
           const countData: CountData = {
             type: AggregationType.COUNT,
             tagValues,
@@ -122,13 +120,9 @@ describe('Recorder', () => {
       }
     });
 
-    describe(`for last value aggregation data of ${
-      measure.type
-    } values`, () => {
+    describe(`for last value aggregation data of ${measure.type} values`, () => {
       for (const testCase of testCases) {
-        it(`should record measurements ${
-          testCase.description
-        } correctly`, () => {
+        it(`should record measurements ${testCase.description} correctly`, () => {
           const lastValueData: LastValueData = {
             type: AggregationType.LAST_VALUE,
             tagValues,
@@ -152,9 +146,7 @@ describe('Recorder', () => {
 
     describe(`for sum aggregation data of ${measure.type} values`, () => {
       for (const testCase of testCases) {
-        it(`should record measurements ${
-          testCase.description
-        } correctly`, () => {
+        it(`should record measurements ${testCase.description} correctly`, () => {
           const sumData: SumData = {
             type: AggregationType.SUM,
             tagValues,
@@ -177,13 +169,9 @@ describe('Recorder', () => {
       }
     });
 
-    describe(`for distribution aggregation data of ${
-      measure.type
-    } values`, () => {
+    describe(`for distribution aggregation data of ${measure.type} values`, () => {
       for (const testCase of testCases) {
-        it(`should record measurements ${
-          testCase.description
-        } correctly`, () => {
+        it(`should record measurements ${testCase.description} correctly`, () => {
           const distributionData: DistributionData = {
             type: AggregationType.DISTRIBUTION,
             tagValues,

diff --git a/packages/opencensus-core/test/test-view.ts b/packages/opencensus-core/test/test-view.ts
@@ -189,9 +189,7 @@ describe('BaseView', () => {
     tags.set(tagKey2, tagValue2);
 
     for (const aggregationTestCase of aggregationTestCases) {
-      it(`should record measurements on a View with ${
-        aggregationTestCase.description
-      } Aggregation Data type`, () => {
+      it(`should record measurements on a View with ${aggregationTestCase.description} Aggregation Data type`, () => {
         const view = new BaseView(
           'test/view/name',
           measure,
@@ -308,9 +306,7 @@ describe('BaseView', () => {
 
       const { descriptor, timeseries } = view.getMetric(mockStartTime);
 
-      describe(`Aggregation type: ${
-        aggregationTestCase.aggregationType
-      }`, () => {
+      describe(`Aggregation type: ${aggregationTestCase.aggregationType}`, () => {
         it('should have descriptor', () => {
           assert.ok(descriptor);
           assert.deepStrictEqual(descriptor, {

diff --git a/packages/opencensus-exporter-jaeger/src/jaeger-driver/index.ts b/packages/opencensus-exporter-jaeger/src/jaeger-driver/index.ts
@@ -125,9 +125,9 @@ export function spanToThrift(span: Span): ThriftSpan {
     ? Utils.encodeInt64(span.parentSpanId)
     : ThriftUtils.emptyBuffer;
 
-  const traceId = `00000000000000000000000000000000${
-    span.spanContext.traceId
-  }`.slice(-32);
+  const traceId = `00000000000000000000000000000000${span.spanContext.traceId}`.slice(
+    -32
+  );
 
   const high = traceId.slice(0, 16);
   const low = traceId.slice(16);
@@ -151,20 +151,18 @@ export function spanToThrift(span: Span): ThriftSpan {
 
 function getThriftReference(links: Link[]): ThriftReference[] {
   return links
-    .map(
-      (link): ThriftReference | null => {
-        const refType = getThriftType(link.type);
-        if (!refType) return null;
-
-        const traceId = `00000000000000000000000000000000${link.traceId}`.slice(
-          -32
-        );
-        const traceIdHigh = Utils.encodeInt64(traceId.slice(0, 16));
-        const traceIdLow = Utils.encodeInt64(traceId.slice(16));
-        const spanId = Utils.encodeInt64(link.spanId);
-        return { traceIdLow, traceIdHigh, spanId, refType };
-      }
-    )
+    .map((link): ThriftReference | null => {
+      const refType = getThriftType(link.type);
+      if (!refType) return null;
+
+      const traceId = `00000000000000000000000000000000${link.traceId}`.slice(
+        -32
+      );
+      const traceIdHigh = Utils.encodeInt64(traceId.slice(0, 16));
+      const traceIdLow = Utils.encodeInt64(traceId.slice(16));
+      const spanId = Utils.encodeInt64(link.spanId);
+      return { traceIdLow, traceIdHigh, spanId, refType };
+    })
     .filter(ref => !!ref) as ThriftReference[];
 }
 

diff --git a/packages/opencensus-exporter-prometheus/src/prometheus-stats.ts b/packages/opencensus-exporter-prometheus/src/prometheus-stats.ts
@@ -251,9 +251,7 @@ export class PrometheusStatsExporter implements StatsEventListener {
     labels.forEach(label => {
       if (label === PrometheusStatsExporter.RESERVED_HISTOGRAM_LABEL) {
         throw new Error(
-          `${
-            PrometheusStatsExporter.RESERVED_HISTOGRAM_LABEL
-          } is a reserved label keyword`
+          `${PrometheusStatsExporter.RESERVED_HISTOGRAM_LABEL} is a reserved label keyword`
         );
       }
     });

diff --git a/packages/opencensus-instrumentation-grpc/src/grpc.ts b/packages/opencensus-instrumentation-grpc/src/grpc.ts
@@ -425,9 +425,12 @@ export class GrpcPlugin extends BasePlugin {
             name: traceOptions.name,
             kind: traceOptions.kind,
           });
-          return plugin.makeGrpcClientRemoteCall(original, args, this, plugin)(
-            span
-          );
+          return plugin.makeGrpcClientRemoteCall(
+            original,
+            args,
+            this,
+            plugin
+          )(span);
         }
       };
     };

diff --git a/packages/opencensus-instrumentation-grpc/test/test-grpc.ts b/packages/opencensus-instrumentation-grpc/test/test-grpc.ts
@@ -481,12 +481,8 @@ describe('GrpcPlugin() ', function() {
   }
 
   methodList.map(method => {
-    describe(`Test automatic tracing for grpc remote method ${
-      method.description
-    }`, () => {
-      it(`should create a rootSpan for client and for server - ${
-        method.description
-      }`, async () => {
+    describe(`Test automatic tracing for grpc remote method ${method.description}`, () => {
+      it(`should create a rootSpan for client and for server - ${method.description}`, async () => {
         assert.strictEqual(rootSpanVerifier.endedRootSpans.length, 0);
         const spanName = `grpc.pkg_test.GrpcTester/${method.methodName}`;
         const args = [client, method.request];
@@ -518,9 +514,7 @@ describe('GrpcPlugin() ', function() {
           });
       });
 
-      it(`should create a rootSpan for client and for server with tag context- ${
-        method.description
-      }`, () => {
+      it(`should create a rootSpan for client and for server with tag context- ${method.description}`, () => {
         assert.strictEqual(rootSpanVerifier.endedRootSpans.length, 0);
         const spanName = `grpc.pkg_test.GrpcTester/${method.methodName}`;
         const args = [client, method.request];
@@ -559,9 +553,7 @@ describe('GrpcPlugin() ', function() {
         });
       });
 
-      it(`should create a childSpan for client and rootSpan for server -  ${
-        method.description
-      }`, () => {
+      it(`should create a childSpan for client and rootSpan for server -  ${method.description}`, () => {
         assert.strictEqual(rootSpanVerifier.endedRootSpans.length, 0);
         const options = { name: 'TestRootSpan' };
         const spanName = `grpc.pkg_test.GrpcTester/${method.methodName}`;
@@ -598,9 +590,7 @@ describe('GrpcPlugin() ', function() {
         });
       });
 
-      it(`should create a childSpan for client and rootSpan for server with tag context -  ${
-        method.description
-      }`, () => {
+      it(`should create a childSpan for client and rootSpan for server with tag context -  ${method.description}`, () => {
         assert.strictEqual(rootSpanVerifier.endedRootSpans.length, 0);
         const options = { name: 'TestRootSpan' };
         const spanName = `grpc.pkg_test.GrpcTester/${method.methodName}`;
@@ -661,9 +651,7 @@ describe('GrpcPlugin() ', function() {
         // tslint:disable-next-line:no-any
         const errorCode = Number(grpcModule.status[key as any]);
         if (errorCode > grpcModule.status.OK) {
-          it(`should raise an error for client/server rootSpans - ${
-            method.description
-          } - status = ${key}`, async () => {
+          it(`should raise an error for client/server rootSpans - ${method.description} - status = ${key}`, async () => {
             assert.strictEqual(rootSpanVerifier.endedRootSpans.length, 0);
             const spanName = `grpc.pkg_test.GrpcTester/${method.methodName}`;
             const errRequest =
@@ -685,9 +673,7 @@ describe('GrpcPlugin() ', function() {
               });
           });
 
-          it(`should raise an error for client childSpan/server rootSpan - ${
-            method.description
-          } - status = ${key}`, () => {
+          it(`should raise an error for client childSpan/server rootSpan - ${method.description} - status = ${key}`, () => {
             assert.strictEqual(rootSpanVerifier.endedRootSpans.length, 0);
             const options = { name: 'TestRootSpan' };
             const spanName = `grpc.pkg_test.GrpcTester/${method.methodName}`;

diff --git a/packages/opencensus-instrumentation-http/src/http.ts b/packages/opencensus-instrumentation-http/src/http.ts
@@ -422,9 +422,11 @@ export class HttpPlugin extends BasePlugin {
             name: traceOptions.name,
             kind: traceOptions.kind,
           });
-          return plugin.getMakeRequestTraceFunction(request, options, plugin)(
-            span
-          );
+          return plugin.getMakeRequestTraceFunction(
+            request,
+            options,
+            plugin
+          )(span);
         }
       };
     };

diff --git a/packages/opencensus-instrumentation-http/test/test-http.ts b/packages/opencensus-instrumentation-http/test/test-http.ts
@@ -309,9 +309,7 @@ describe('HttpPlugin', () => {
     const httpErrorCodes = [400, 401, 403, 404, 429, 501, 503, 504, 500];
 
     for (let i = 0; i < httpErrorCodes.length; i++) {
-      it(`should test rootSpan for GET requests with http error ${
-        httpErrorCodes[i]
-      }`, async () => {
+      it(`should test rootSpan for GET requests with http error ${httpErrorCodes[i]}`, async () => {
         const testPath = '/outgoing/rootSpan/1';
         doNock(
           urlHost,
@@ -358,9 +356,7 @@ describe('HttpPlugin', () => {
     });
 
     for (let i = 0; i < httpErrorCodes.length; i++) {
-      it(`should test a child spans for GET requests with http error ${
-        httpErrorCodes[i]
-      }`, () => {
+      it(`should test a child spans for GET requests with http error ${httpErrorCodes[i]}`, () => {
         const testPath = '/outgoing/rootSpan/childs/1';
         doNock(
           urlHost,

diff --git a/packages/opencensus-instrumentation-https/test/test-https.ts b/packages/opencensus-instrumentation-https/test/test-https.ts
@@ -251,9 +251,7 @@ describe('HttpsPlugin', () => {
         const httpErrorCodes = [400, 401, 403, 404, 429, 501, 503, 504, 500];
 
         for (let i = 0; i < httpErrorCodes.length; i++) {
-          it(`should test rootSpan for GET requests with http error ${
-            httpErrorCodes[i]
-          }`, async () => {
+          it(`should test rootSpan for GET requests with http error ${httpErrorCodes[i]}`, async () => {
             const testPath = '/outgoing/rootSpan/1';
             doNock(
               urlHost,
@@ -311,9 +309,7 @@ describe('HttpsPlugin', () => {
         });
 
         for (let i = 0; i < httpErrorCodes.length; i++) {
-          it(`should test a child spans for GET requests with http error ${
-            httpErrorCodes[i]
-          }`, () => {
+          it(`should test a child spans for GET requests with http error ${httpErrorCodes[i]}`, () => {
             const testPath = '/outgoing/rootSpan/childs/1';
             doNock(
               urlHost,