diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index b1958a2065..c45516e080 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.0.2", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@types/mocha": "8.2.3", "@types/node": "14.17.9", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts index 032fdf0eeb..be25ea604a 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts @@ -21,7 +21,7 @@ import { alibabaCloudEcsDetector } from '../../src'; import { assertCloudResource, assertHostResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; const ALIYUN_HOST = 'http://' + alibabaCloudEcsDetector.ALIBABA_CLOUD_IDMS_ENDPOINT; diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index e0811d9518..9c22c0a181 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.0.2", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@types/mocha": "8.2.3", "@types/node": "14.17.9", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts index 48f80f54df..60e285fd58 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts @@ -20,7 +20,7 @@ import { awsBeanstalkDetector, AwsBeanstalkDetector } from '../../src'; import { assertEmptyResource, assertServiceResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; import { CloudPlatformValues } from '@opentelemetry/semantic-conventions'; describe('BeanstalkResourceDetector', () => { diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts index 4c2d072f0d..62375965d1 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts @@ -21,7 +21,7 @@ import { awsEc2Detector } from '../../src'; import { assertCloudResource, assertHostResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; const AWS_HOST = 'http://' + awsEc2Detector.AWS_IDMS_ENDPOINT; const AWS_TOKEN_PATH = awsEc2Detector.AWS_INSTANCE_TOKEN_DOCUMENT_PATH; diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts index f69ccd014e..04a3c24b12 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts @@ -23,7 +23,7 @@ import { import { assertEmptyResource, assertContainerResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; import * as os from 'os'; describe('BeanstalkResourceDetector', () => { diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts index 60b9218b5e..7073743b59 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts @@ -23,7 +23,7 @@ import { assertK8sResource, assertContainerResource, assertEmptyResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; const K8S_SVC_URL = awsEksDetector.K8S_SVC_URL; const AUTH_CONFIGMAP_PATH = awsEksDetector.AUTH_CONFIGMAP_PATH; diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts index ed75af59b7..daaa34c61b 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts @@ -18,7 +18,7 @@ import * as assert from 'assert'; import { assertCloudResource, assertEmptyResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; import { awsLambdaDetector } from '../../src'; diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index 81329657ed..eb462055d1 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -44,7 +44,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/core": "0.25.0", - "@opentelemetry/test-utils": "0.24.0", + "@opentelemetry/contrib-test-utils": "0.24.0", "@types/mocha": "8.2.3", "@types/node": "14.17.9", "@types/semver": "7.3.8", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts b/detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts index 36eaa58632..5845e4687a 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts +++ b/detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts @@ -31,7 +31,7 @@ import { assertK8sResource, assertContainerResource, assertEmptyResource, -} from '@opentelemetry/test-utils'; +} from '@opentelemetry/contrib-test-utils'; import { Resource } from '@opentelemetry/resources'; const HEADERS = { diff --git a/packages/opentelemetry-test-utils/LICENSE b/packages/opentelemetry-test-utils/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/packages/opentelemetry-test-utils/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + http://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. diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index e26642fdb9..959cebdef6 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -1,8 +1,7 @@ { - "name": "@opentelemetry/test-utils", - "private": true, + "name": "@opentelemetry/contrib-test-utils", "version": "0.24.0", - "description": "Test utilities.", + "description": "Test utilities for opentelemetry components", "main": "build/index.js", "scripts": { "lint": "eslint . --ext .ts", @@ -15,7 +14,14 @@ "repository": "open-telemetry/opentelemetry-js-contrib", "keywords": [ "opentelemetry", - "test-utils" + "contrib-test-utils" + ], + "files": [ + "build/**/*.js", + "build/**/*.js.map", + "build/**/*.d.ts", + "LICENSE", + "README.md" ], "author": "OpenTelemetry Authors", "license": "Apache-2.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index a2accd5f28..d75baedc38 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -49,7 +49,7 @@ "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts b/plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts index 5e9992f670..ba8ba21e5b 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts +++ b/plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts @@ -32,7 +32,7 @@ import { DbSystemValues, } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import type * as CassandraDriver from 'cassandra-driver'; import { CassandraDriverInstrumentation, diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml b/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml index b7f91b0bef..249e1f531b 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml @@ -3,5 +3,5 @@ ioredis: versions: ">1 < 4.19.0 || > 4.19.0 < 5" commands: npm run test - # Fix missing `test-utils` package + # Fix missing `contrib-test-utils` package pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 594c3aad91..9eef5b7b39 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -53,7 +53,7 @@ "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts b/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts index 226f4a1096..fab08a76c6 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts +++ b/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts @@ -24,7 +24,7 @@ import { } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { InMemorySpanExporter, ReadableSpan, diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 607ac94119..d48ce05d14 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -50,7 +50,7 @@ "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/test/index.test.ts b/plugins/node/opentelemetry-instrumentation-memcached/test/index.test.ts index eb3b073e18..1c86a16d54 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/test/index.test.ts +++ b/plugins/node/opentelemetry-instrumentation-memcached/test/index.test.ts @@ -17,7 +17,7 @@ import { context, SpanKind, SpanStatusCode, trace } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { InMemorySpanExporter, SimpleSpanProcessor, diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 7d06069e64..5a2e0efb7a 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/test/index.test.ts b/plugins/node/opentelemetry-instrumentation-mysql/test/index.test.ts index df5944da74..746e4b501b 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/test/index.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/test/index.test.ts @@ -17,7 +17,7 @@ import { context, trace, SpanStatusCode } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { BasicTracerProvider, InMemorySpanExporter, diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 5e62c3b183..d5eef4d897 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts b/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts index 71aa6fe206..d0b1d9b1b9 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts @@ -17,7 +17,7 @@ import { context, trace, SpanStatusCode } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { BasicTracerProvider, InMemorySpanExporter, diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index dd55de24bd..3fd7d1054c 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -54,7 +54,7 @@ "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts b/plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts index 0ac001f481..d6f6727df3 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts @@ -30,7 +30,7 @@ import { PgResponseHookInformation, } from '../src'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { InMemorySpanExporter, SimpleSpanProcessor, diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts b/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts index 8b5e725fd8..31f179fe94 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts @@ -24,7 +24,7 @@ import { trace, } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { BasicTracerProvider, InMemorySpanExporter, diff --git a/plugins/node/opentelemetry-instrumentation-redis/.tav.yml b/plugins/node/opentelemetry-instrumentation-redis/.tav.yml index 9c8d1f239e..24622537c6 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-redis/.tav.yml @@ -2,5 +2,5 @@ redis: versions: ^2.6.0 || ^3.0.0 commands: npm run test - # Fix missing `test-utils` package + # Fix missing `contrib-test-utils` package pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 5939eeb69c..b322e1ce6d 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -52,7 +52,7 @@ "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "0.25.0", "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/test-utils": "^0.24.0", + "@opentelemetry/contrib-test-utils": "^0.24.0", "@opentelemetry/sdk-trace-base": "0.25.0", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts b/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts index e871505b4a..9728e05b12 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts +++ b/plugins/node/opentelemetry-instrumentation-redis/test/redis.test.ts @@ -24,7 +24,7 @@ import { } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; -import * as testUtils from '@opentelemetry/test-utils'; +import * as testUtils from '@opentelemetry/contrib-test-utils'; import { InMemorySpanExporter, SimpleSpanProcessor,