From fef44f4f80770e422bb0123724cfda1067819999 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 24 Nov 2022 09:31:42 +0200 Subject: [PATCH] chore(deps): update dependency expect to v29 (#1233) * chore: upgrade expect to v29.2.0 * fix: commit forgotten file --- packages/opentelemetry-propagation-utils/package.json | 2 +- .../test/pubsub-propagation.test.ts | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- .../node/instrumentation-amqplib/test/amqplib-callbacks.test.ts | 2 +- .../instrumentation-amqplib/test/amqplib-connection.test.ts | 2 +- .../node/instrumentation-amqplib/test/amqplib-promise.test.ts | 2 +- plugins/node/instrumentation-amqplib/test/utils.test.ts | 2 +- plugins/node/instrumentation-amqplib/test/utils.ts | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/test/index.test.ts | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-mongoose/test/asserts.ts | 2 +- plugins/node/instrumentation-mongoose/test/mongoose.test.ts | 2 +- plugins/node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../test/MessageAttributes.test.ts | 2 +- .../test/aws-sdk-v2.test.ts | 2 +- .../test/aws-sdk-v3.test.ts | 2 +- .../opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts | 2 +- .../opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/test/sqs.test.ts | 2 +- .../opentelemetry-instrumentation-aws-sdk/test/testing-utils.ts | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index adae4993a20..44d2e89f8db 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -49,7 +49,7 @@ "@types/mocha": "^9.1.1", "@types/node": "18.11.7", "@types/sinon": "^10.0.11", - "expect": "27.4.2", + "expect": "29.2.0", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts b/packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts index 8c853b791f0..62199d4f33c 100644 --- a/packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts +++ b/packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts @@ -20,7 +20,7 @@ import { resetMemoryExporter, } from '@opentelemetry/contrib-test-utils'; import { ROOT_CONTEXT, trace } from '@opentelemetry/api'; -import * as expect from 'expect'; +import { expect } from 'expect'; registerInstrumentationTestingProvider(); diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 0588be63b9d..6a4282a7e6a 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -59,7 +59,7 @@ "@types/sinon": "10.0.2", "@types/node": "18.11.7", "amqplib": "0.8.0", - "expect": "27.4.2", + "expect": "29.2.0", "lodash": "4.17.21", "mocha": "7.2.0", "ts-mocha": "10.0.0", diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts b/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts index 424554e4dda..e9fbdf96e86 100644 --- a/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts +++ b/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import 'mocha'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { AmqplibInstrumentation } from '../src'; import { getTestSpans, diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts b/plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts index 748f06c7eed..7ac3e686e55 100644 --- a/plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts +++ b/plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import 'mocha'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { shouldTest } from './utils'; import { censoredUrl, diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts b/plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts index b343dc71ea2..e130f5e942a 100644 --- a/plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts +++ b/plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import 'mocha'; -import * as expect from 'expect'; +import { expect } from 'expect'; import * as sinon from 'sinon'; import * as lodash from 'lodash'; import { diff --git a/plugins/node/instrumentation-amqplib/test/utils.test.ts b/plugins/node/instrumentation-amqplib/test/utils.test.ts index efa69b58866..34e6fb7aa90 100644 --- a/plugins/node/instrumentation-amqplib/test/utils.test.ts +++ b/plugins/node/instrumentation-amqplib/test/utils.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import 'mocha'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { getConnectionAttributesFromServer, getConnectionAttributesFromUrl, diff --git a/plugins/node/instrumentation-amqplib/test/utils.ts b/plugins/node/instrumentation-amqplib/test/utils.ts index f6297dfb662..d1e3a2e4ca4 100644 --- a/plugins/node/instrumentation-amqplib/test/utils.ts +++ b/plugins/node/instrumentation-amqplib/test/utils.ts @@ -15,7 +15,7 @@ */ import type * as amqp from 'amqplib'; import type * as amqpCallback from 'amqplib/callback_api'; -import * as expect from 'expect'; +import { expect } from 'expect'; export const asyncConfirmSend = ( confirmChannel: amqp.ConfirmChannel | amqpCallback.ConfirmChannel, diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 49c7e6e37d4..caec77996e3 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -47,7 +47,7 @@ "@types/lru-cache": "7.10.9", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "expect": "25.5.0", + "expect": "29.2.0", "gts": "3.1.0", "lru-memoizer": "2.1.4", "mocha": "7.2.0", diff --git a/plugins/node/instrumentation-lru-memoizer/test/index.test.ts b/plugins/node/instrumentation-lru-memoizer/test/index.test.ts index 95969e8be83..bb80c9994d2 100644 --- a/plugins/node/instrumentation-lru-memoizer/test/index.test.ts +++ b/plugins/node/instrumentation-lru-memoizer/test/index.test.ts @@ -15,7 +15,7 @@ */ import LruMemoizerInstrumentation from '../src'; import { trace, context } from '@opentelemetry/api'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { registerInstrumentationTesting } from '@opentelemetry/contrib-test-utils'; diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 6edb5db0394..99e77cf6a3d 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -50,7 +50,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "expect": "27.4.2", + "expect": "29.2.0", "gts": "3.1.0", "mocha": "7.2.0", "mongoose": "6.5.2", diff --git a/plugins/node/instrumentation-mongoose/test/asserts.ts b/plugins/node/instrumentation-mongoose/test/asserts.ts index f6c7e15ec36..ad21f9a7162 100644 --- a/plugins/node/instrumentation-mongoose/test/asserts.ts +++ b/plugins/node/instrumentation-mongoose/test/asserts.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as expect from 'expect'; +import { expect } from 'expect'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { SpanStatusCode } from '@opentelemetry/api'; diff --git a/plugins/node/instrumentation-mongoose/test/mongoose.test.ts b/plugins/node/instrumentation-mongoose/test/mongoose.test.ts index 6ba0297bd53..9049762e0eb 100644 --- a/plugins/node/instrumentation-mongoose/test/mongoose.test.ts +++ b/plugins/node/instrumentation-mongoose/test/mongoose.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import 'mocha'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { context, ROOT_CONTEXT } from '@opentelemetry/api'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { MongooseInstrumentation } from '../src'; diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 48cb5b90b5f..4535cbdc8f7 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -66,7 +66,7 @@ "@types/sinon": "10.0.6", "aws-sdk": "2.1008.0", "eslint": "8.7.0", - "expect": "27.4.2", + "expect": "29.2.0", "gts": "3.1.0", "mocha": "7.2.0", "nock": "13.2.1", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts index 77717b53c53..51d63442f05 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as expect from 'expect'; +import { expect } from 'expect'; import { MAX_MESSAGE_ATTRIBUTES, contextSetter, diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v2.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v2.test.ts index f40f80903bc..0d7d8a8aea7 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v2.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v2.test.ts @@ -31,7 +31,7 @@ import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { SpanStatusCode, Span, SpanKind } from '@opentelemetry/api'; import { AttributeNames } from '../src/enums'; import { mockV2AwsSend } from './testing-utils'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; describe('instrumentation-aws-sdk-v2', () => { diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts index 8623b6e8733..0fb17f7ffdd 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts @@ -47,7 +47,7 @@ import { SemanticAttributes, } from '@opentelemetry/semantic-conventions'; import { AttributeNames } from '../src/enums'; -import * as expect from 'expect'; +import { expect } from 'expect'; import * as fs from 'fs'; import * as nock from 'nock'; diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts index 41b715770a6..5ff0c2b0abb 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts @@ -27,7 +27,7 @@ import { DbSystemValues, SemanticAttributes, } from '@opentelemetry/semantic-conventions'; -import * as expect from 'expect'; +import { expect } from 'expect'; import type { ConsumedCapacity as ConsumedCapacityV2 } from 'aws-sdk/clients/dynamodb'; import type { ConsumedCapacity as ConsumedCapacityV3 } from '@aws-sdk/client-dynamodb'; diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts index 372ebc4e674..be3965a8725 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts @@ -27,7 +27,7 @@ import { SpanKind } from '@opentelemetry/api'; import { Lambda, InvocationType } from '@aws-sdk/client-lambda'; import { ClientRequest } from 'http'; import * as nock from 'nock'; -import * as expect from 'expect'; +import { expect } from 'expect'; process.env.AWS_ACCESS_KEY_ID = 'testing'; process.env.AWS_SECRET_ACCESS_KEY = 'testing'; diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts index a930dba4a15..ce6ce9c8857 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts @@ -27,7 +27,7 @@ import * as fs from 'fs'; import * as nock from 'nock'; import { mockV2AwsSend } from './testing-utils'; -import * as expect from 'expect'; +import { expect } from 'expect'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import * as sinon from 'sinon'; import { diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sqs.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sqs.test.ts index 901b4fca1d4..e162fa57e85 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sqs.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sqs.test.ts @@ -39,7 +39,7 @@ import { import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { mockV2AwsSend } from './testing-utils'; import { Message } from 'aws-sdk/clients/sqs'; -import * as expect from 'expect'; +import { expect } from 'expect'; import * as sinon from 'sinon'; import * as messageAttributes from '../src/services/MessageAttributes'; import { AttributeNames } from '../src/enums'; diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/testing-utils.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/testing-utils.ts index a08f3e1237b..7ce6d373cc8 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/testing-utils.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/testing-utils.ts @@ -16,7 +16,7 @@ import { context } from '@opentelemetry/api'; import { isTracingSuppressed } from '@opentelemetry/core'; import { getInstrumentation } from '@opentelemetry/contrib-test-utils'; -import * as expect from 'expect'; +import { expect } from 'expect'; import * as AWS from 'aws-sdk'; // we want to mock the request object and trigger events on it's events emitter.