chore: fix tests

open-telemetry · Oct 31, 2020 · ccdc74e · ccdc74e
1 parent 06f3b7a
commit ccdc74e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 39 deletions.
diff --git a/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts
@@ -32,6 +32,7 @@ import {
   ensureExportedValueRecorderIsCorrect,
 } from './helper';
 import { MetricRecord } from '@opentelemetry/metrics';
+import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 
 const fakeRequest = {
   end: function () {},
@@ -157,7 +158,6 @@ describe('CollectorMetricExporter - node with proto over http', () => {
     });
 
     it('should log the successful message', done => {
-      const spyLoggerDebug = sinon.stub(collectorExporter.logger, 'debug');
       const spyLoggerError = sinon.stub(collectorExporter.logger, 'error');
 
       const responseSpy = sinon.spy();
@@ -168,25 +168,15 @@ describe('CollectorMetricExporter - node with proto over http', () => {
         const callback = args[1];
         callback(mockRes);
         setTimeout(() => {
-          const response: any = spyLoggerDebug.args[1][0];
-          assert.strictEqual(response, 'statusCode: 200');
+          const result = responseSpy.args[0][0] as ExportResult;
+          assert.strictEqual(result.code, ExportResultCode.SUCCESS);
           assert.strictEqual(spyLoggerError.args.length, 0);
-          assert.strictEqual(responseSpy.args[0][0], 0);
           done();
         });
       }, waitTimeMS);
     });
 
     it('should log the error message', done => {
-      const spyLoggerError = sinon.spy();
-      const handler = core.loggingErrorHandler({
-        debug: sinon.fake(),
-        info: sinon.fake(),
-        warn: sinon.fake(),
-        error: spyLoggerError,
-      });
-      core.setGlobalErrorHandler(handler);
-
       const responseSpy = sinon.spy();
       collectorExporter.export(metrics, responseSpy);
 
@@ -195,9 +185,10 @@ describe('CollectorMetricExporter - node with proto over http', () => {
         const callback = args[1];
         callback(mockResError);
         setTimeout(() => {
-          const response = spyLoggerError.args[0][0] as string;
-          assert.ok(response.includes('"code":"400"'));
-          assert.strictEqual(responseSpy.args[0][0], 1);
+          const result = responseSpy.args[0][0] as ExportResult;
+          assert.strictEqual(result.code, ExportResultCode.FAILED);
+          // @ts-expect-error
+          assert.strictEqual(result.error?.code, 400);
           done();
         });
       }, waitTimeMS);

diff --git a/packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts
@@ -29,6 +29,7 @@ import {
   ensureProtoSpanIsCorrect,
   mockedReadableSpan,
 } from './helper';
+import { ExportResult, ExportResultCode } from '@opentelemetry/core';
 
 const fakeRequest = {
   end: function () {},
@@ -123,7 +124,6 @@ describe('CollectorTraceExporter - node with proto over http', () => {
     });
 
     it('should log the successful message', done => {
-      const spyLoggerDebug = sinon.stub(collectorExporter.logger, 'debug');
       const spyLoggerError = sinon.stub(collectorExporter.logger, 'error');
 
       const responseSpy = sinon.spy();
@@ -134,25 +134,15 @@ describe('CollectorTraceExporter - node with proto over http', () => {
         const callback = args[1];
         callback(mockRes);
         setTimeout(() => {
-          const response: any = spyLoggerDebug.args[1][0];
-          assert.strictEqual(response, 'statusCode: 200');
+          const result = responseSpy.args[0][0] as ExportResult;
+          assert.strictEqual(result.code, ExportResultCode.SUCCESS);
           assert.strictEqual(spyLoggerError.args.length, 0);
-          assert.strictEqual(responseSpy.args[0][0], 0);
           done();
         });
       }, waitTimeMS);
     });
 
     it('should log the error message', done => {
-      const spyLoggerError = sinon.spy();
-      const handler = core.loggingErrorHandler({
-        debug: sinon.fake(),
-        info: sinon.fake(),
-        warn: sinon.fake(),
-        error: spyLoggerError,
-      });
-      core.setGlobalErrorHandler(handler);
-
       const responseSpy = sinon.spy();
       collectorExporter.export(spans, responseSpy);
 
@@ -161,10 +151,10 @@ describe('CollectorTraceExporter - node with proto over http', () => {
         const callback = args[1];
         callback(mockResError);
         setTimeout(() => {
-          const response = spyLoggerError.args[0][0] as string;
-
-          assert.ok(response.includes('"code":"400"'));
-          assert.strictEqual(responseSpy.args[0][0], 1);
+          const result = responseSpy.args[0][0] as ExportResult;
+          assert.strictEqual(result.code, ExportResultCode.FAILED);
+          // @ts-expect-error
+          assert.strictEqual(result.error.code, 400);
           done();
         });
       }, waitTimeMS);

diff --git a/packages/opentelemetry-exporter-collector/test/common/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/common/CollectorMetricExporter.test.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  ExportResult,
-  ExportResultCode,
-  NoopLogger,
-} from '@opentelemetry/core';
+import { ExportResultCode, NoopLogger } from '@opentelemetry/core';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { CollectorExporterBase } from '../../src/CollectorExporterBase';

diff --git a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts
@@ -16,7 +16,6 @@
 
 import * as assert from 'assert';
 import * as nock from 'nock';
-import * as sinon from 'sinon';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import {
   ExportResult,