From a2600de231a12084769fd2db54ed264e98fc0142 Mon Sep 17 00:00:00 2001 From: vmarchaud Date: Sat, 24 Oct 2020 11:00:47 +0200 Subject: [PATCH] chore: move MockedResponse to nodeHelper --- .../test/helper.ts | 20 ----------- .../test/node/CollectorMetricExporter.test.ts | 3 +- .../test/node/CollectorTraceExporter.test.ts | 2 +- .../test/node/nodeHelpers.ts | 36 +++++++++++++++++++ 4 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 packages/opentelemetry-exporter-collector/test/node/nodeHelpers.ts diff --git a/packages/opentelemetry-exporter-collector/test/helper.ts b/packages/opentelemetry-exporter-collector/test/helper.ts index 584ed2b67f8..e11257138e7 100644 --- a/packages/opentelemetry-exporter-collector/test/helper.ts +++ b/packages/opentelemetry-exporter-collector/test/helper.ts @@ -22,7 +22,6 @@ import { InstrumentationLibrary } from '@opentelemetry/core'; import * as assert from 'assert'; import { opentelemetryProto } from '../src/types'; import * as collectorTypes from '../src/types'; -import { Stream } from 'stream'; const meterProvider = new MeterProvider({ interval: 30000, @@ -667,22 +666,3 @@ export function ensureHeadersContain( ); }); } - -export class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { - super(); - } - - send(data: string) { - this.emit('data', data); - this.emit('end'); - } - - get statusCode() { - return this._code; - } - - get statusMessage() { - return this._msg; - } -} diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts index 86d180e6cd2..3642970fa97 100644 --- a/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/node/CollectorMetricExporter.test.ts @@ -22,7 +22,7 @@ import * as sinon from 'sinon'; import { CollectorMetricExporter } from '../../src/platform/node'; import { CollectorExporterConfigBase } from '../../src/types'; import * as collectorTypes from '../../src/types'; - +import { MockedResponse } from './nodeHelper'; import { mockCounter, mockObserver, @@ -31,7 +31,6 @@ import { mockValueRecorder, ensureValueRecorderIsCorrect, ensureObserverIsCorrect, - MockedResponse, } from '../helper'; import { MetricRecord } from '@opentelemetry/metrics'; diff --git a/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts b/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts index 0328ed0be35..995e9f885c0 100644 --- a/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/node/CollectorTraceExporter.test.ts @@ -23,7 +23,7 @@ import * as sinon from 'sinon'; import { CollectorTraceExporter } from '../../src/platform/node'; import { CollectorExporterConfigBase } from '../../src/types'; import * as collectorTypes from '../../src/types'; -import { MockedResponse } from '../helper'; +import { MockedResponse } from './nodeHelper'; import { ensureExportTraceServiceRequestIsSet, diff --git a/packages/opentelemetry-exporter-collector/test/node/nodeHelpers.ts b/packages/opentelemetry-exporter-collector/test/node/nodeHelpers.ts new file mode 100644 index 00000000000..1219f2d976b --- /dev/null +++ b/packages/opentelemetry-exporter-collector/test/node/nodeHelpers.ts @@ -0,0 +1,36 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Stream } from 'stream'; + +export class MockedResponse extends Stream { + constructor(private _code: number, private _msg?: string) { + super(); + } + + send(data: string) { + this.emit('data', data); + this.emit('end'); + } + + get statusCode() { + return this._code; + } + + get statusMessage() { + return this._msg; + } +}