From 5dc0f6974a91d86c08531d11153cdb40857eca74 Mon Sep 17 00:00:00 2001 From: Nicolas Hansse Date: Wed, 21 Jun 2023 14:16:16 +0200 Subject: [PATCH 01/94] fix(exporter-logs-otlp-http): set useHex to true (#3875) --- experimental/CHANGELOG.md | 2 + .../exporter-logs-otlp-http/package.json | 1 + .../src/platform/browser/OTLPLogExporter.ts | 2 +- .../src/platform/node/OTLPLogExporter.ts | 2 +- .../test/browser/OTLPLogExporter.test.ts | 86 ++++++++- .../exporter-logs-otlp-http/test/logHelper.ts | 166 +++++++++++++++++ .../test/node/OTLPLogExporter.test.ts | 169 +++++++++++++++++- .../exporter-logs-otlp-http/tsconfig.json | 6 +- 8 files changed, 428 insertions(+), 6 deletions(-) create mode 100644 experimental/packages/exporter-logs-otlp-http/test/logHelper.ts diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 1ac87111b..4ce74a270 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -14,6 +14,8 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) +* fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412 + ### :books: (Refine Doc) ### :house: (Internal) diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 19ec49940..41b72085b 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -73,6 +73,7 @@ "devDependencies": { "@babel/core": "7.22.5", "@opentelemetry/api-logs": "0.40.0", + "@opentelemetry/resources": "1.14.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", diff --git a/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts index ef837614e..a7ecbbac9 100644 --- a/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts @@ -48,7 +48,7 @@ export class OTLPLogExporter } convert(logRecords: ReadableLogRecord[]): IExportLogsServiceRequest { - return createExportLogsServiceRequest(logRecords); + return createExportLogsServiceRequest(logRecords, true); } getDefaultUrl(config: OTLPExporterConfigBase): string { diff --git a/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts b/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts index 7f7c538df..a1d101e87 100644 --- a/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts +++ b/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts @@ -48,7 +48,7 @@ export class OTLPLogExporter } convert(logRecords: ReadableLogRecord[]): IExportLogsServiceRequest { - return createExportLogsServiceRequest(logRecords); + return createExportLogsServiceRequest(logRecords, true); } getDefaultUrl(config: OTLPExporterNodeConfigBase): string { diff --git a/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts index 66958a9fe..2443c97ef 100644 --- a/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts @@ -13,15 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import * as assert from 'assert'; import * as sinon from 'sinon'; import * as Config from '../../src/platform/config'; import { OTLPLogExporter } from '../../src/platform/browser'; +import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import { mockedReadableLogRecord } from '../logHelper'; +import { ExportResultCode } from '@opentelemetry/core'; describe('OTLPLogExporter', () => { let envSource: Record; + let collectorExporter: OTLPLogExporter; + let collectorExporterConfig: OTLPExporterConfigBase; + + afterEach(() => { + sinon.restore(); + }); if (typeof process === 'undefined') { envSource = globalThis as unknown as Record; @@ -61,4 +70,79 @@ describe('OTLPLogExporter', () => { assert.strictEqual(getDefaultUrl.callCount, 2); }); }); + + describe('export - common', () => { + let spySend: any; + beforeEach(() => { + spySend = sinon.stub(OTLPLogExporter.prototype, 'send'); + collectorExporter = new OTLPLogExporter(collectorExporterConfig); + }); + + it('should export spans as otlpTypes.Spans', done => { + const logs: ReadableLogRecord[] = []; + logs.push(Object.assign({}, mockedReadableLogRecord)); + + collectorExporter.export(logs, () => {}); + setTimeout(() => { + const log = spySend.args[0][0][0] as ReadableLogRecord; + assert.deepStrictEqual(logs[0], log); + done(); + }); + assert.strictEqual(spySend.callCount, 1); + }); + + describe('when exporter is shutdown', () => { + it( + 'should not export anything but return callback with code' + + ' "FailedNotRetryable"', + async () => { + const spans: ReadableLogRecord[] = []; + spans.push(Object.assign({}, mockedReadableLogRecord)); + await collectorExporter.shutdown(); + spySend.resetHistory(); + + const callbackSpy = sinon.spy(); + collectorExporter.export(spans, callbackSpy); + const returnCode = callbackSpy.args[0][0]; + + assert.strictEqual( + returnCode.code, + ExportResultCode.FAILED, + 'return value is wrong' + ); + assert.strictEqual(spySend.callCount, 0, 'should not call send'); + } + ); + }); + describe('when an error occurs', () => { + it('should return failed export result', done => { + const spans: ReadableLogRecord[] = []; + spans.push(Object.assign({}, mockedReadableLogRecord)); + spySend.throws({ + code: 100, + details: 'Test error', + metadata: {}, + message: 'Non-retryable', + stack: 'Stack', + }); + const callbackSpy = sinon.spy(); + collectorExporter.export(spans, callbackSpy); + setTimeout(() => { + const returnCode = callbackSpy.args[0][0]; + assert.strictEqual( + returnCode.code, + ExportResultCode.FAILED, + 'return value is wrong' + ); + assert.strictEqual( + returnCode.error.message, + 'Non-retryable', + 'return error message is wrong' + ); + assert.strictEqual(spySend.callCount, 1, 'should call send'); + done(); + }); + }); + }); + }); }); diff --git a/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts b/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts new file mode 100644 index 000000000..1d9461f87 --- /dev/null +++ b/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts @@ -0,0 +1,166 @@ +/* + * 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 { HrTime, TraceFlags } from '@opentelemetry/api'; +import { SeverityNumber } from '@opentelemetry/api-logs'; +import { Resource } from '@opentelemetry/resources'; +import * as assert from 'assert'; +import { VERSION } from '@opentelemetry/core'; +import { + IAnyValue, + IExportLogsServiceRequest, + IKeyValue, + ILogRecord, + IResource, +} from '@opentelemetry/otlp-transformer'; +import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; + +export const mockedReadableLogRecord: ReadableLogRecord = { + resource: Resource.default().merge( + new Resource({ + 'resource-attribute': 'some resource-attr value', + }) + ), + instrumentationScope: { + name: 'scope_name_1', + version: '0.1.0', + schemaUrl: 'http://url.to.schema', + }, + hrTime: [1680253513, 123241635] as HrTime, + hrTimeObserved: [1680253513, 123241635] as HrTime, + attributes: { + 'some-attribute': 'some attribute value', + }, + severityNumber: SeverityNumber.ERROR, + severityText: 'error', + body: 'some_log_body', + spanContext: { + traceFlags: TraceFlags.SAMPLED, + traceId: '1f1008dc8e270e85c40a0d7c3939b278', + spanId: '5e107261f64fa53e', + }, +}; +export function ensureExportedAttributesAreCorrect(attributes: IKeyValue[]) { + assert.deepStrictEqual( + attributes, + [ + { + key: 'some-attribute', + value: { + stringValue: 'some attribute value', + }, + }, + ], + 'exported attributes are incorrect' + ); +} + +export function ensureExportedBodyIsCorrect(body?: IAnyValue) { + assert.deepStrictEqual( + body, + { stringValue: 'some_log_body' }, + 'exported attributes are incorrect' + ); +} + +export function ensureExportedLogRecordIsCorrect(logRecord: ILogRecord) { + ensureExportedBodyIsCorrect(logRecord.body); + ensureExportedAttributesAreCorrect(logRecord.attributes); + assert.strictEqual( + logRecord.timeUnixNano, + 1680253513123241700, + 'timeUnixNano is wrong' + ); + assert.strictEqual( + logRecord.observedTimeUnixNano, + 1680253513123241700, + 'observedTimeUnixNano is wrong' + ); + assert.strictEqual( + logRecord.severityNumber, + SeverityNumber.ERROR, + 'severityNumber is wrong' + ); + assert.strictEqual(logRecord.severityText, 'error', 'severityText is wrong'); + assert.strictEqual( + logRecord.droppedAttributesCount, + 0, + 'droppedAttributesCount is wrong' + ); + assert.strictEqual(logRecord.flags, TraceFlags.SAMPLED, 'flags is wrong'); +} + +export function ensureResourceIsCorrect(resource: IResource) { + assert.deepStrictEqual(resource, { + attributes: [ + { + key: 'service.name', + value: { + stringValue: `unknown_service:${process.argv0}`, + value: 'stringValue', + }, + }, + { + key: 'telemetry.sdk.language', + value: { + stringValue: 'nodejs', + value: 'stringValue', + }, + }, + { + key: 'telemetry.sdk.name', + value: { + stringValue: 'opentelemetry', + value: 'stringValue', + }, + }, + { + key: 'telemetry.sdk.version', + value: { + stringValue: VERSION, + value: 'stringValue', + }, + }, + { + key: 'resource-attribute', + value: { + stringValue: 'some resource-attr value', + value: 'stringValue', + }, + }, + ], + droppedAttributesCount: 0, + }); +} + +export function ensureExportLogsServiceRequestIsSet( + json: IExportLogsServiceRequest +) { + const resourceLogs = json.resourceLogs; + assert.strictEqual(resourceLogs?.length, 1, 'resourceLogs is missing'); + + const resource = resourceLogs?.[0].resource; + assert.ok(resource, 'resource is missing'); + + const scopeLogs = resourceLogs?.[0].scopeLogs; + assert.strictEqual(scopeLogs?.length, 1, 'scopeLogs is missing'); + + const scope = scopeLogs?.[0].scope; + assert.ok(scope, 'scope is missing'); + + const logRecords = scopeLogs?.[0].logRecords; + assert.strictEqual(logRecords?.length, 1, 'logs are missing'); +} diff --git a/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts b/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts index aa0d34534..2ae11142a 100644 --- a/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts +++ b/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts @@ -14,14 +14,55 @@ * limitations under the License. */ +import { diag } from '@opentelemetry/api'; import * as assert from 'assert'; +import * as http from 'http'; import * as sinon from 'sinon'; - import * as Config from '../../src/platform/config'; + import { OTLPLogExporter } from '../../src/platform/node'; +import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import { + ensureExportLogsServiceRequestIsSet, + ensureExportedLogRecordIsCorrect, + mockedReadableLogRecord, +} from '../logHelper'; +import { PassThrough, Stream } from 'stream'; +import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; +import { ExportResultCode } from '@opentelemetry/core'; + +let fakeRequest: PassThrough; + +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; + } +} describe('OTLPLogExporter', () => { let envSource: Record; + let collectorExporter: OTLPLogExporter; + let collectorExporterConfig: OTLPExporterNodeConfigBase; + let logs: ReadableLogRecord[]; + + afterEach(() => { + fakeRequest = new Stream.PassThrough(); + sinon.restore(); + }); if (typeof process === 'undefined') { envSource = globalThis as unknown as Record; @@ -61,4 +102,130 @@ describe('OTLPLogExporter', () => { assert.strictEqual(getDefaultUrl.callCount, 2); }); }); + + describe('export', () => { + beforeEach(() => { + collectorExporterConfig = { + headers: { + foo: 'bar', + }, + hostname: 'foo', + url: 'http://foo.bar.com', + keepAlive: true, + httpAgentOptions: { keepAliveMsecs: 2000 }, + }; + collectorExporter = new OTLPLogExporter(collectorExporterConfig); + logs = []; + logs.push(Object.assign({}, mockedReadableLogRecord)); + }); + afterEach(() => { + sinon.restore(); + }); + + it('should open the connection', done => { + sinon.stub(http, 'request').callsFake((options: any, cb: any) => { + assert.strictEqual(options.hostname, 'foo.bar.com'); + assert.strictEqual(options.method, 'POST'); + assert.strictEqual(options.path, '/'); + + const mockRes = new MockedResponse(200); + cb(mockRes); + mockRes.send('success'); + done(); + return fakeRequest as any; + }); + collectorExporter.export(logs, () => {}); + }); + + it('should set custom headers', done => { + sinon.stub(http, 'request').callsFake((options: any, cb: any) => { + assert.strictEqual(options.headers['foo'], 'bar'); + + const mockRes = new MockedResponse(200); + cb(mockRes); + mockRes.send('success'); + done(); + return fakeRequest as any; + }); + + collectorExporter.export(logs, () => {}); + }); + + it('should have keep alive and keepAliveMsecs option set', done => { + sinon.stub(http, 'request').callsFake((options: any, cb: any) => { + assert.strictEqual(options.agent.keepAlive, true); + assert.strictEqual(options.agent.options.keepAliveMsecs, 2000); + + const mockRes = new MockedResponse(200); + cb(mockRes); + mockRes.send('success'); + done(); + return fakeRequest as any; + }); + + collectorExporter.export(logs, () => {}); + }); + + it('should successfully send the logs', done => { + const fakeRequest = new Stream.PassThrough(); + sinon.stub(http, 'request').returns(fakeRequest as any); + + let buff = Buffer.from(''); + fakeRequest.on('end', () => { + const responseBody = buff.toString(); + const json = JSON.parse(responseBody) as IExportLogsServiceRequest; + const log1 = json.resourceLogs?.[0].scopeLogs?.[0].logRecords?.[0]; + assert.ok(typeof log1 !== 'undefined', "log doesn't exist"); + ensureExportedLogRecordIsCorrect(log1); + + ensureExportLogsServiceRequestIsSet(json); + + done(); + }); + + fakeRequest.on('data', chunk => { + buff = Buffer.concat([buff, chunk]); + }); + + const clock = sinon.useFakeTimers(); + collectorExporter.export(logs, () => {}); + clock.tick(200); + clock.restore(); + }); + + it('should log the successful message', done => { + // Need to stub/spy on the underlying logger as the "diag" instance is global + const spyLoggerError = sinon.stub(diag, 'error'); + + sinon.stub(http, 'request').callsFake((options: any, cb: any) => { + const mockRes = new MockedResponse(200); + cb(mockRes); + mockRes.send('success'); + return fakeRequest as any; + }); + + collectorExporter.export(logs, result => { + assert.strictEqual(result.code, ExportResultCode.SUCCESS); + assert.strictEqual(spyLoggerError.args.length, 0); + done(); + }); + }); + + it('should log the error message', done => { + sinon.stub(http, 'request').callsFake((options: any, cb: any) => { + const mockResError = new MockedResponse(400); + cb(mockResError); + mockResError.send('failed'); + + return fakeRequest as any; + }); + + collectorExporter.export(logs, result => { + assert.strictEqual(result.code, ExportResultCode.FAILED); + // @ts-expect-error verify error code + assert.strictEqual(result.error.code, 400); + done(); + }); + }); + }); }); diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.json index c4eda837a..52330c182 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../../tsconfig.base.json", "compilerOptions": { - "esModuleInterop": true, "outDir": "build", "rootDir": "." }, @@ -24,6 +23,9 @@ }, { "path": "../sdk-logs" - } + }, + { + "path": "../../../packages/opentelemetry-resources" + }, ] } From 19fb033900077505f43bcbacb8a5744be997fe37 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 21 Jun 2023 20:26:54 +0200 Subject: [PATCH 02/94] feat(otlp-exporters): bump otlp proto to 0.20.0 (#3932) --- experimental/CHANGELOG.md | 1 + .../packages/otlp-grpc-exporter-base/protos | 2 +- .../src/LogsExportServiceClient.ts | 6 ++++-- .../src/MetricsExportServiceClient.ts | 6 ++++-- .../src/TraceExportServiceClient.ts | 6 ++++-- .../packages/otlp-proto-exporter-base/protos | 2 +- .../packages/otlp-transformer/src/common/types.ts | 6 ++++++ .../packages/otlp-transformer/src/logs/types.ts | 13 +++++++++++++ .../packages/otlp-transformer/src/metrics/types.ts | 13 +++++++++++++ .../packages/otlp-transformer/src/trace/types.ts | 13 +++++++++++++ 10 files changed, 60 insertions(+), 8 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 4ce74a270..a1efc1844 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to experimental packages in this project will be documented ### :rocket: (Enhancement) * feat(otlp-grpc-exporters): add support for UDS endpoints. [#3853](https://github.com/open-telemetry/opentelemetry-js/pull/3853) @llc1123 +* feat(otlp-exporters): bump otlp proto to 0.20.0 [#3932](https://github.com/open-telemetry/opentelemetry-js/pull/3932) @pichlermarc ### :bug: (Bug Fix) diff --git a/experimental/packages/otlp-grpc-exporter-base/protos b/experimental/packages/otlp-grpc-exporter-base/protos index c5c8b2801..1608f92cf 160000 --- a/experimental/packages/otlp-grpc-exporter-base/protos +++ b/experimental/packages/otlp-grpc-exporter-base/protos @@ -1 +1 @@ -Subproject commit c5c8b28012583fda55b0cb16f73a820722171d49 +Subproject commit 1608f92cf08119f9aec237c910b200d1317ec696 diff --git a/experimental/packages/otlp-grpc-exporter-base/src/LogsExportServiceClient.ts b/experimental/packages/otlp-grpc-exporter-base/src/LogsExportServiceClient.ts index 148fca31a..b867743ce 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/LogsExportServiceClient.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/LogsExportServiceClient.ts @@ -16,9 +16,11 @@ import * as root from './generated/root'; import * as grpc from '@grpc/grpc-js'; -import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; +import { + IExportLogsServiceRequest, + IExportLogsServiceResponse, +} from '@opentelemetry/otlp-transformer'; import { ExportType } from './internal-types'; -import IExportLogsServiceResponse = root.opentelemetry.proto.collector.logs.v1.IExportLogsServiceResponse; const responseType = root.opentelemetry.proto.collector.logs.v1 .ExportLogsServiceResponse as ExportType; diff --git a/experimental/packages/otlp-grpc-exporter-base/src/MetricsExportServiceClient.ts b/experimental/packages/otlp-grpc-exporter-base/src/MetricsExportServiceClient.ts index 9a791ca2f..7f81be608 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/MetricsExportServiceClient.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/MetricsExportServiceClient.ts @@ -16,9 +16,11 @@ import * as root from './generated/root'; import * as grpc from '@grpc/grpc-js'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; +import { + IExportMetricsServiceRequest, + IExportMetricsServiceResponse, +} from '@opentelemetry/otlp-transformer'; import { ExportType } from './internal-types'; -import IExportMetricsServiceResponse = root.opentelemetry.proto.collector.metrics.v1.IExportMetricsServiceResponse; const responseType = root.opentelemetry.proto.collector.metrics.v1 .ExportMetricsServiceResponse as ExportType; diff --git a/experimental/packages/otlp-grpc-exporter-base/src/TraceExportServiceClient.ts b/experimental/packages/otlp-grpc-exporter-base/src/TraceExportServiceClient.ts index 6a150a24b..d332e4f4d 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/TraceExportServiceClient.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/TraceExportServiceClient.ts @@ -16,9 +16,11 @@ import * as root from './generated/root'; import * as grpc from '@grpc/grpc-js'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; +import { + IExportTraceServiceRequest, + IExportTraceServiceResponse, +} from '@opentelemetry/otlp-transformer'; import { ExportType } from './internal-types'; -import IExportTraceServiceResponse = root.opentelemetry.proto.collector.trace.v1.IExportTraceServiceResponse; const responseType = root.opentelemetry.proto.collector.trace.v1 .ExportTraceServiceResponse as ExportType; diff --git a/experimental/packages/otlp-proto-exporter-base/protos b/experimental/packages/otlp-proto-exporter-base/protos index c5c8b2801..1608f92cf 160000 --- a/experimental/packages/otlp-proto-exporter-base/protos +++ b/experimental/packages/otlp-proto-exporter-base/protos @@ -1 +1 @@ -Subproject commit c5c8b28012583fda55b0cb16f73a820722171d49 +Subproject commit 1608f92cf08119f9aec237c910b200d1317ec696 diff --git a/experimental/packages/otlp-transformer/src/common/types.ts b/experimental/packages/otlp-transformer/src/common/types.ts index 8b30231e7..159a595ba 100644 --- a/experimental/packages/otlp-transformer/src/common/types.ts +++ b/experimental/packages/otlp-transformer/src/common/types.ts @@ -21,6 +21,12 @@ export interface IInstrumentationScope { /** InstrumentationScope version */ version?: string; + + /** InstrumentationScope attributes */ + attributes?: IKeyValue[]; + + /** InstrumentationScope droppedAttributesCount */ + droppedAttributesCount?: number; } /** Properties of a KeyValue. */ diff --git a/experimental/packages/otlp-transformer/src/logs/types.ts b/experimental/packages/otlp-transformer/src/logs/types.ts index 3d3e610bc..05709af6f 100644 --- a/experimental/packages/otlp-transformer/src/logs/types.ts +++ b/experimental/packages/otlp-transformer/src/logs/types.ts @@ -27,6 +27,19 @@ export interface IExportLogsServiceRequest { resourceLogs?: IResourceLogs[]; } +export interface IExportLogsServiceResponse { + /** ExportLogsServiceResponse partialSuccess */ + partialSuccess?: IExportLogsPartialSuccess; +} + +export interface IExportLogsPartialSuccess { + /** ExportLogsPartialSuccess rejectedLogRecords */ + rejectedLogRecords?: number; + + /** ExportLogsPartialSuccess errorMessage */ + errorMessage?: string; +} + /** Properties of a ResourceLogs. */ export interface IResourceLogs { /** ResourceLogs resource */ diff --git a/experimental/packages/otlp-transformer/src/metrics/types.ts b/experimental/packages/otlp-transformer/src/metrics/types.ts index 6db9c17a9..2728ab1ab 100644 --- a/experimental/packages/otlp-transformer/src/metrics/types.ts +++ b/experimental/packages/otlp-transformer/src/metrics/types.ts @@ -22,6 +22,19 @@ export interface IExportMetricsServiceRequest { resourceMetrics: IResourceMetrics[]; } +export interface IExportMetricsServiceResponse { + /** ExportMetricsServiceResponse partialSuccess */ + partialSuccess?: IExportMetricsPartialSuccess; +} + +export interface IExportMetricsPartialSuccess { + /** ExportMetricsPartialSuccess rejectedDataPoints */ + rejectedDataPoints?: number; + + /** ExportMetricsPartialSuccess errorMessage */ + errorMessage?: string; +} + /** Properties of a ResourceMetrics. */ export interface IResourceMetrics { /** ResourceMetrics resource */ diff --git a/experimental/packages/otlp-transformer/src/trace/types.ts b/experimental/packages/otlp-transformer/src/trace/types.ts index 08e52c7a0..a6cfb82ad 100644 --- a/experimental/packages/otlp-transformer/src/trace/types.ts +++ b/experimental/packages/otlp-transformer/src/trace/types.ts @@ -23,6 +23,19 @@ export interface IExportTraceServiceRequest { resourceSpans?: IResourceSpans[]; } +export interface IExportTraceServiceResponse { + /** ExportTraceServiceResponse partialSuccess */ + partialSuccess?: IExportTracePartialSuccess; +} + +export interface IExportTracePartialSuccess { + /** ExportLogsServiceResponse rejectedLogRecords */ + rejectedSpans?: number; + + /** ExportLogsServiceResponse errorMessage */ + errorMessage?: string; +} + /** Properties of a ResourceSpans. */ export interface IResourceSpans { /** ResourceSpans resource */ From 856c25211567104ced8b2a2b56d0818a3c48e671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Th=C3=A9riault?= <113933910+raphael-theriault-swi@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:46:56 -0700 Subject: [PATCH 03/94] feat: add sqlcommenter comment to mysql2 queries (#1523) * chore: extract sql commenting logic to common package * feat(instrumentation-mysql2): sqlcommenter support * fix(instrumentation-mysql2): properly assign commented sql * chore(instrumentation-mysql2): test sqlcommenter * chore(instrumentation-mysql2): update readme with new option * chore: revert workflows autoformat * chore(sql-common): specify api devDep * chore: update release-please manifests * chore(sql-common): fix copy pasted readme * fix(instrumentation-mysql2): proper test cleanup logic * fix(instrumentation-mysql2): proper test config handling --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .github/workflows/test-all-versions.yml | 5 +- .github/workflows/unit-test.yml | 5 +- .release-please-manifest.json | 2 +- .../opentelemetry-sql-common/.eslintignore | 1 + .../opentelemetry-sql-common/.eslintrc.js | 7 + packages/opentelemetry-sql-common/LICENSE | 201 ++++++++++++++++++ packages/opentelemetry-sql-common/README.md | 6 + .../opentelemetry-sql-common/package.json | 57 +++++ .../opentelemetry-sql-common/src/index.ts | 89 ++++++++ .../test/sql-common.test.ts | 115 ++++++++++ .../opentelemetry-sql-common/tsconfig.json | 8 + .../src/test-utils.ts | 2 +- .../README.md | 1 + .../package.json | 1 + .../src/instrumentation.ts | 29 ++- .../src/types.ts | 6 + .../test/mysql.test.ts | 187 ++++++++++++++-- .../package.json | 1 + .../src/instrumentation.ts | 14 +- .../src/utils.ts | 69 ------ .../test/pg.test.ts | 2 +- .../test/utils.test.ts | 99 +-------- release-please-config.json | 1 + 23 files changed, 701 insertions(+), 207 deletions(-) create mode 100644 packages/opentelemetry-sql-common/.eslintignore create mode 100644 packages/opentelemetry-sql-common/.eslintrc.js create mode 100644 packages/opentelemetry-sql-common/LICENSE create mode 100644 packages/opentelemetry-sql-common/README.md create mode 100644 packages/opentelemetry-sql-common/package.json create mode 100644 packages/opentelemetry-sql-common/src/index.ts create mode 100644 packages/opentelemetry-sql-common/test/sql-common.test.ts create mode 100644 packages/opentelemetry-sql-common/tsconfig.json diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index ddc3f6679..bc0b61193 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -93,8 +93,9 @@ jobs: MONGODB_PORT: 27017 MSSQL_PASSWORD: mssql_passw0rd MYSQL_DATABASE: otel_mysql_database - MYSQL_HOST: localhost + MYSQL_HOST: 127.0.0.1 MYSQL_PASSWORD: secret + MYSQL_ROOT_PASSWORD: rootpw MYSQL_PORT: 3306 MYSQL_USER: otel OPENTELEMETRY_REDIS_HOST: localhost @@ -118,6 +119,8 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + - name: Set MySQL variables + run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql - name: Cache Dependencies uses: actions/cache@v3 with: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 50179edd3..57c9f4e14 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -101,8 +101,9 @@ jobs: MONGODB_PORT: 27017 MSSQL_PASSWORD: mssql_passw0rd MYSQL_DATABASE: otel_mysql_database - MYSQL_HOST: localhost + MYSQL_HOST: 127.0.0.1 MYSQL_PASSWORD: secret + MYSQL_ROOT_PASSWORD: rootpw MYSQL_PORT: 3306 MYSQL_USER: otel OPENTELEMETRY_MEMCACHED_HOST: localhost @@ -123,6 +124,8 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + - name: Set MySQL variables + run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql - name: Cache Dependencies uses: actions/cache@v3 with: diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 0d35de43a..b91425697 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.7","detectors/node/opentelemetry-resource-detector-aws":"1.2.5","detectors/node/opentelemetry-resource-detector-container":"0.2.5","detectors/node/opentelemetry-resource-detector-gcp":"0.28.3","detectors/node/opentelemetry-resource-detector-github":"0.27.1","detectors/node/opentelemetry-resource-detector-instana":"0.4.4","metapackages/auto-instrumentations-node":"0.37.1","metapackages/auto-instrumentations-web":"0.32.3","packages/opentelemetry-host-metrics":"0.32.2","packages/opentelemetry-id-generator-aws-xray":"1.1.2","packages/opentelemetry-propagation-utils":"0.29.5","packages/opentelemetry-redis-common":"0.35.1","packages/opentelemetry-test-utils":"0.33.4","plugins/node/instrumentation-amqplib":"0.32.5","plugins/node/instrumentation-dataloader":"0.4.3","plugins/node/instrumentation-fs":"0.7.4","plugins/node/instrumentation-lru-memoizer":"0.32.4","plugins/node/instrumentation-mongoose":"0.32.4","plugins/node/instrumentation-socket.io":"0.33.4","plugins/node/instrumentation-tedious":"0.5.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.3","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.4","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.4","plugins/node/opentelemetry-instrumentation-connect":"0.31.4","plugins/node/opentelemetry-instrumentation-dns":"0.31.5","plugins/node/opentelemetry-instrumentation-express":"0.32.4","plugins/node/opentelemetry-instrumentation-fastify":"0.31.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.4","plugins/node/opentelemetry-instrumentation-graphql":"0.34.3","plugins/node/opentelemetry-instrumentation-hapi":"0.31.4","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.3","plugins/node/opentelemetry-instrumentation-knex":"0.31.4","plugins/node/opentelemetry-instrumentation-koa":"0.34.6","plugins/node/opentelemetry-instrumentation-memcached":"0.31.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql":"0.33.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.5","plugins/node/opentelemetry-instrumentation-net":"0.31.4","plugins/node/opentelemetry-instrumentation-pg":"0.35.3","plugins/node/opentelemetry-instrumentation-pino":"0.33.4","plugins/node/opentelemetry-instrumentation-redis":"0.34.7","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.6","plugins/node/opentelemetry-instrumentation-restify":"0.32.4","plugins/node/opentelemetry-instrumentation-router":"0.32.4","plugins/node/opentelemetry-instrumentation-winston":"0.31.4","plugins/web/opentelemetry-instrumentation-document-load":"0.32.3","plugins/web/opentelemetry-instrumentation-long-task":"0.32.5","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.4","plugins/web/opentelemetry-plugin-react-load":"0.28.2","propagators/opentelemetry-propagator-aws-xray":"1.2.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.1","propagators/opentelemetry-propagator-instana":"0.2.2","propagators/opentelemetry-propagator-ot-trace":"0.26.3"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.7","detectors/node/opentelemetry-resource-detector-aws":"1.2.5","detectors/node/opentelemetry-resource-detector-container":"0.2.5","detectors/node/opentelemetry-resource-detector-gcp":"0.28.3","detectors/node/opentelemetry-resource-detector-github":"0.27.1","detectors/node/opentelemetry-resource-detector-instana":"0.4.4","metapackages/auto-instrumentations-node":"0.37.1","metapackages/auto-instrumentations-web":"0.32.3","packages/opentelemetry-host-metrics":"0.32.2","packages/opentelemetry-id-generator-aws-xray":"1.1.2","packages/opentelemetry-propagation-utils":"0.29.5","packages/opentelemetry-redis-common":"0.35.1","packages/opentelemetry-sql-common":"0.39.0","packages/opentelemetry-test-utils":"0.33.4","plugins/node/instrumentation-amqplib":"0.32.5","plugins/node/instrumentation-dataloader":"0.4.3","plugins/node/instrumentation-fs":"0.7.4","plugins/node/instrumentation-lru-memoizer":"0.32.4","plugins/node/instrumentation-mongoose":"0.32.4","plugins/node/instrumentation-socket.io":"0.33.4","plugins/node/instrumentation-tedious":"0.5.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.3","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.4","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.4","plugins/node/opentelemetry-instrumentation-connect":"0.31.4","plugins/node/opentelemetry-instrumentation-dns":"0.31.5","plugins/node/opentelemetry-instrumentation-express":"0.32.4","plugins/node/opentelemetry-instrumentation-fastify":"0.31.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.4","plugins/node/opentelemetry-instrumentation-graphql":"0.34.3","plugins/node/opentelemetry-instrumentation-hapi":"0.31.4","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.3","plugins/node/opentelemetry-instrumentation-knex":"0.31.4","plugins/node/opentelemetry-instrumentation-koa":"0.34.6","plugins/node/opentelemetry-instrumentation-memcached":"0.31.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql":"0.33.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.5","plugins/node/opentelemetry-instrumentation-net":"0.31.4","plugins/node/opentelemetry-instrumentation-pg":"0.35.3","plugins/node/opentelemetry-instrumentation-pino":"0.33.4","plugins/node/opentelemetry-instrumentation-redis":"0.34.7","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.6","plugins/node/opentelemetry-instrumentation-restify":"0.32.4","plugins/node/opentelemetry-instrumentation-router":"0.32.4","plugins/node/opentelemetry-instrumentation-winston":"0.31.4","plugins/web/opentelemetry-instrumentation-document-load":"0.32.3","plugins/web/opentelemetry-instrumentation-long-task":"0.32.5","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.4","plugins/web/opentelemetry-plugin-react-load":"0.28.2","propagators/opentelemetry-propagator-aws-xray":"1.2.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.1","propagators/opentelemetry-propagator-instana":"0.2.2","propagators/opentelemetry-propagator-ot-trace":"0.26.3"} diff --git a/packages/opentelemetry-sql-common/.eslintignore b/packages/opentelemetry-sql-common/.eslintignore new file mode 100644 index 000000000..378eac25d --- /dev/null +++ b/packages/opentelemetry-sql-common/.eslintignore @@ -0,0 +1 @@ +build diff --git a/packages/opentelemetry-sql-common/.eslintrc.js b/packages/opentelemetry-sql-common/.eslintrc.js new file mode 100644 index 000000000..15096b665 --- /dev/null +++ b/packages/opentelemetry-sql-common/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + env: { + mocha: true, + node: true, + }, + ...require('../../eslint.config.js'), +}; diff --git a/packages/opentelemetry-sql-common/LICENSE b/packages/opentelemetry-sql-common/LICENSE new file mode 100644 index 000000000..e50e8c80f --- /dev/null +++ b/packages/opentelemetry-sql-common/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 [2022] 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 + + 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-sql-common/README.md b/packages/opentelemetry-sql-common/README.md new file mode 100644 index 000000000..8a7ba446d --- /dev/null +++ b/packages/opentelemetry-sql-common/README.md @@ -0,0 +1,6 @@ +# Common Utils for OpenTelemetry SQL packages + +This is an internal utils package used for the different SQL instrumentations: + +1. mysql2 +2. pg diff --git a/packages/opentelemetry-sql-common/package.json b/packages/opentelemetry-sql-common/package.json new file mode 100644 index 000000000..a194f9252 --- /dev/null +++ b/packages/opentelemetry-sql-common/package.json @@ -0,0 +1,57 @@ +{ + "name": "@opentelemetry/sql-common", + "version": "0.39.0", + "description": "Utilities for SQL instrumentations", + "main": "build/src/index.js", + "types": "build/src/index.d.ts", + "publishConfig": { + "access": "public" + }, + "scripts": { + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "compile": "tsc --build tsconfig.json", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sql-common --include-dependencies", + "prewatch": "npm run precompile", + "prepare": "npm run compile", + "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "watch": "tsc -w" + }, + "repository": "open-telemetry/opentelemetry-js-contrib", + "keywords": [ + "opentelemetry", + "contrib", + "sql" + ], + "files": [ + "build/**/*.js", + "build/**/*.js.map", + "build/**/*.d.ts", + "LICENSE", + "README.md" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/sql-common#readme", + "peerDependencies": { + "@opentelemetry/api": "^1.1.0" + }, + "dependencies": { + "@opentelemetry/core": "^1.1.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.1.0", + "@types/mocha": "^7.0.2", + "@types/node": "18.11.7", + "mocha": "7.2.0", + "nyc": "15.1.0", + "ts-mocha": "10.0.0", + "typescript": "4.4.4" + } +} diff --git a/packages/opentelemetry-sql-common/src/index.ts b/packages/opentelemetry-sql-common/src/index.ts new file mode 100644 index 000000000..b5d2e5fa4 --- /dev/null +++ b/packages/opentelemetry-sql-common/src/index.ts @@ -0,0 +1,89 @@ +/* + * 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 { + trace, + Span, + ROOT_CONTEXT, + defaultTextMapSetter, +} from '@opentelemetry/api'; +import { W3CTraceContextPropagator } from '@opentelemetry/core'; + +// NOTE: This function currently is returning false-positives +// in cases where comment characters appear in string literals +// ("SELECT '-- not a comment';" would return true, although has no comment) +function hasValidSqlComment(query: string): boolean { + const indexOpeningDashDashComment = query.indexOf('--'); + if (indexOpeningDashDashComment >= 0) { + return true; + } + + const indexOpeningSlashComment = query.indexOf('/*'); + if (indexOpeningSlashComment < 0) { + return false; + } + + const indexClosingSlashComment = query.indexOf('*/'); + return indexOpeningDashDashComment < indexClosingSlashComment; +} + +// sqlcommenter specification (https://google.github.io/sqlcommenter/spec/#value-serialization) +// expects us to URL encode based on the RFC 3986 spec (https://en.wikipedia.org/wiki/Percent-encoding), +// but encodeURIComponent does not handle some characters correctly (! ' ( ) *), +// which means we need special handling for this +// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent +function fixedEncodeURIComponent(str: string) { + return encodeURIComponent(str).replace( + /[!'()*]/g, + c => `%${c.charCodeAt(0).toString(16).toUpperCase()}` + ); +} + +export function addSqlCommenterComment(span: Span, query: string): string { + if (typeof query !== 'string' || query.length === 0) { + return query; + } + + // As per sqlcommenter spec we shall not add a comment if there already is a comment + // in the query + if (hasValidSqlComment(query)) { + return query; + } + + const propagator = new W3CTraceContextPropagator(); + const headers: { [key: string]: string } = {}; + propagator.inject( + trace.setSpan(ROOT_CONTEXT, span), + headers, + defaultTextMapSetter + ); + + // sqlcommenter spec requires keys in the comment to be sorted lexicographically + const sortedKeys = Object.keys(headers).sort(); + + if (sortedKeys.length === 0) { + return query; + } + + const commentString = sortedKeys + .map(key => { + const encodedValue = fixedEncodeURIComponent(headers[key]); + return `${key}='${encodedValue}'`; + }) + .join(','); + + return `${query} /*${commentString}*/`; +} diff --git a/packages/opentelemetry-sql-common/test/sql-common.test.ts b/packages/opentelemetry-sql-common/test/sql-common.test.ts new file mode 100644 index 000000000..16bc2d228 --- /dev/null +++ b/packages/opentelemetry-sql-common/test/sql-common.test.ts @@ -0,0 +1,115 @@ +/* + * 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 * as assert from 'assert'; +import { + trace, + SpanContext, + TraceFlags, + INVALID_SPAN_CONTEXT, + createTraceState, +} from '@opentelemetry/api'; +import { addSqlCommenterComment } from '../src/index'; + +describe('addSqlCommenterComment', () => { + it('adds comment to a simple query', () => { + const spanContext: SpanContext = { + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: TraceFlags.SAMPLED, + }; + + const query = 'SELECT * from FOO;'; + assert.strictEqual( + addSqlCommenterComment(trace.wrapSpanContext(spanContext), query), + "SELECT * from FOO; /*traceparent='00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-01'*/" + ); + }); + + it('does not add a comment if query already has a comment', () => { + const span = trace.wrapSpanContext({ + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: TraceFlags.SAMPLED, + }); + + const blockComment = 'SELECT * from FOO; /* Test comment */'; + assert.strictEqual( + addSqlCommenterComment(span, blockComment), + blockComment + ); + + const dashedComment = 'SELECT * from FOO; -- Test comment'; + assert.strictEqual( + addSqlCommenterComment(span, dashedComment), + dashedComment + ); + }); + + it('does not add a comment to an empty query', () => { + const spanContext: SpanContext = { + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: TraceFlags.SAMPLED, + }; + + assert.strictEqual( + addSqlCommenterComment(trace.wrapSpanContext(spanContext), ''), + '' + ); + }); + + it('does not add a comment if span context is invalid', () => { + const query = 'SELECT * from FOO;'; + assert.strictEqual( + addSqlCommenterComment( + trace.wrapSpanContext(INVALID_SPAN_CONTEXT), + query + ), + query + ); + }); + + it('correctly also sets trace state', () => { + const spanContext: SpanContext = { + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: TraceFlags.SAMPLED, + traceState: createTraceState('foo=bar,baz=qux'), + }; + + const query = 'SELECT * from FOO;'; + assert.strictEqual( + addSqlCommenterComment(trace.wrapSpanContext(spanContext), query), + "SELECT * from FOO; /*traceparent='00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-01',tracestate='foo%3Dbar%2Cbaz%3Dqux'*/" + ); + }); + + it('escapes special characters in values', () => { + const spanContext: SpanContext = { + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: TraceFlags.SAMPLED, + traceState: createTraceState("foo='bar,baz='qux!()*',hack='DROP TABLE"), + }; + + const query = 'SELECT * from FOO;'; + assert.strictEqual( + addSqlCommenterComment(trace.wrapSpanContext(spanContext), query), + "SELECT * from FOO; /*traceparent='00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-01',tracestate='foo%3D%27bar%2Cbaz%3D%27qux%21%28%29%2A%27%2Chack%3D%27DROP%20TABLE'*/" + ); + }); +}); diff --git a/packages/opentelemetry-sql-common/tsconfig.json b/packages/opentelemetry-sql-common/tsconfig.json new file mode 100644 index 000000000..8f29202a9 --- /dev/null +++ b/packages/opentelemetry-sql-common/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/packages/opentelemetry-test-utils/src/test-utils.ts b/packages/opentelemetry-test-utils/src/test-utils.ts index 4e2dfbb6a..d9d7f3e2e 100644 --- a/packages/opentelemetry-test-utils/src/test-utils.ts +++ b/packages/opentelemetry-test-utils/src/test-utils.ts @@ -38,7 +38,7 @@ const dockerRunCmds = { mssql: 'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2017-latest', mysql: - 'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7', + 'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7 --log_output=TABLE --general_log=ON', postgres: 'docker run --rm -d --name otel-postgres -p 54320:5432 -e POSTGRES_PASSWORD=postgres postgres:15-alpine', redis: 'docker run --rm -d --name otel-redis -p 63790:6379 redis:alpine', diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/README.md b/plugins/node/opentelemetry-instrumentation-mysql2/README.md index d0940894b..04f15355e 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/README.md +++ b/plugins/node/opentelemetry-instrumentation-mysql2/README.md @@ -47,6 +47,7 @@ You can set the following instrumentation options: | Options | Type | Description | | ------- | ---- | ----------- | | `responseHook` | `MySQL2InstrumentationExecutionResponseHook` (function) | Function for adding custom attributes from db response | +| `addSqlCommenterCommentToQueries` | `boolean` | If true, adds [sqlcommenter](https://github.com/open-telemetry/opentelemetry-sqlcommenter) specification compliant comment to queries with tracing context (default false). _NOTE: A comment will not be added to queries that already contain `--` or `/* ... */` in them, even if these are not actually part of comments_ | ## Useful links diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 21014d84f..0ca042b94 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -51,6 +51,7 @@ "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/contrib-test-utils": "^0.33.4", "@opentelemetry/sdk-trace-base": "^1.8.0", + "@opentelemetry/sql-common": "^0.39.0", "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", "@types/node": "18.11.7", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts index 682ebe0b0..ea792f802 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts @@ -25,6 +25,7 @@ import { DbSystemValues, SemanticAttributes, } from '@opentelemetry/semantic-conventions'; +import { addSqlCommenterComment } from '@opentelemetry/sql-common'; import type * as mysqlTypes from 'mysql2'; import { MySQL2InstrumentationConfig } from './types'; import { @@ -52,7 +53,7 @@ export class MySQL2Instrumentation extends InstrumentationBase { 'mysql2', ['>= 1.4.2 < 4.0'], (moduleExports: any, moduleVersion) => { - api.diag.debug(`Patching mysql@${moduleVersion}`); + api.diag.debug(`Patching mysql2@${moduleVersion}`); const ConnectionPrototype: mysqlTypes.Connection = moduleExports.Connection.prototype; @@ -63,7 +64,7 @@ export class MySQL2Instrumentation extends InstrumentationBase { this._wrap( ConnectionPrototype, 'query', - this._patchQuery(moduleExports.format) as any + this._patchQuery(moduleExports.format, false) as any ); if (isWrapped(ConnectionPrototype.execute)) { @@ -72,7 +73,7 @@ export class MySQL2Instrumentation extends InstrumentationBase { this._wrap( ConnectionPrototype, 'execute', - this._patchQuery(moduleExports.format) as any + this._patchQuery(moduleExports.format, true) as any ); return moduleExports; @@ -88,7 +89,7 @@ export class MySQL2Instrumentation extends InstrumentationBase { ]; } - private _patchQuery(format: formatType) { + private _patchQuery(format: formatType, isPrepared: boolean) { return (originalQuery: Function): Function => { const thisPlugin = this; api.diag.debug('MySQL2Instrumentation: patched mysql query/execute'); @@ -99,6 +100,9 @@ export class MySQL2Instrumentation extends InstrumentationBase { _valuesOrCallback?: unknown[] | Function, _callback?: Function ) { + const thisPluginConfig: MySQL2InstrumentationConfig = + thisPlugin._config; + let values; if (Array.isArray(_valuesOrCallback)) { values = _valuesOrCallback; @@ -118,6 +122,16 @@ export class MySQL2Instrumentation extends InstrumentationBase { ), }, }); + + if (!isPrepared && thisPluginConfig.addSqlCommenterCommentToQueries) { + arguments[0] = query = + typeof query === 'string' + ? addSqlCommenterComment(span, query) + : Object.assign(query, { + sql: addSqlCommenterComment(span, query.sql), + }); + } + const endSpan = once((err?: any, results?: any) => { if (err) { span.setStatus({ @@ -125,11 +139,12 @@ export class MySQL2Instrumentation extends InstrumentationBase { message: err.message, }); } else { - const config: MySQL2InstrumentationConfig = thisPlugin._config; - if (typeof config.responseHook === 'function') { + if (typeof thisPluginConfig.responseHook === 'function') { safeExecuteInTheMiddle( () => { - config.responseHook!(span, { queryResults: results }); + thisPluginConfig.responseHook!(span, { + queryResults: results, + }); }, err => { if (err) { diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/types.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/types.ts index c14743495..01e9f8a43 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/src/types.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql2/src/types.ts @@ -33,4 +33,10 @@ export interface MySQL2InstrumentationConfig extends InstrumentationConfig { * @default undefined */ responseHook?: MySQL2InstrumentationExecutionResponseHook; + + /** + * If true, queries are modified to also include a comment with + * the tracing context, following the {@link https://github.com/open-telemetry/opentelemetry-sqlcommenter sqlcommenter} format + */ + addSqlCommenterCommentToQueries?: boolean; } diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts b/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts index 3874ccf17..0e81e55a6 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts @@ -37,6 +37,7 @@ const database = process.env.MYSQL_DATABASE || 'test_db'; const host = process.env.MYSQL_HOST || '127.0.0.1'; const user = process.env.MYSQL_USER || 'otel'; const password = process.env.MYSQL_PASSWORD || 'secret'; +const rootPassword = process.env.MYSQL_ROOT_PASSWORD || 'rootpw'; const instrumentation = new MySQL2Instrumentation(); instrumentation.enable(); @@ -48,9 +49,10 @@ interface Result extends mysqlTypes.RowDataPacket { solution: number; } -describe('mysql@2.x', () => { +describe('mysql2@2.x', () => { let contextManager: AsyncHooksContextManager; let connection: mysqlTypes.Connection; + let rootConnection: mysqlTypes.Connection; let pool: mysqlTypes.Pool; let poolCluster: mysqlTypes.PoolCluster; const provider = new BasicTracerProvider(); @@ -59,6 +61,24 @@ describe('mysql@2.x', () => { const shouldTest = testMysql || testMysqlLocally; // Skips these tests if false (default) const memoryExporter = new InMemorySpanExporter(); + const getLastQueries = (count: number) => + new Promise(res => { + const queries: string[] = []; + const query = rootConnection.query({ + sql: "SELECT * FROM mysql.general_log WHERE command_type = 'Query' ORDER BY event_time DESC LIMIT ? OFFSET 1", + values: [count], + }); + + query.on('result', (row: { argument: string | Buffer }) => { + if (typeof row.argument === 'string') { + queries.push(row.argument); + } else { + queries.push(row.argument.toString('utf-8')); + } + }); + query.on('end', () => res(queries)); + }); + before(function (done) { if (!shouldTest) { // this.skip() workaround @@ -67,6 +87,13 @@ describe('mysql@2.x', () => { this.skip(); } provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter)); + rootConnection = mysqlTypes.createConnection({ + port, + user: 'root', + host, + password: rootPassword, + database, + }); if (testMysqlLocally) { testUtils.startDocker('mysql'); // wait 15 seconds for docker container to start @@ -77,11 +104,14 @@ describe('mysql@2.x', () => { } }); - after(function () { - if (testMysqlLocally) { - this.timeout(5000); - testUtils.cleanUpDocker('mysql'); - } + after(function (done) { + rootConnection.end(() => { + if (testMysqlLocally) { + this.timeout(5000); + testUtils.cleanUpDocker('mysql'); + } + done(); + }); }); beforeEach(() => { @@ -119,6 +149,7 @@ describe('mysql@2.x', () => { afterEach(done => { context.disable(); memoryExporter.reset(); + instrumentation.setConfig(); instrumentation.disable(); connection.end(() => { pool.end(() => { @@ -299,6 +330,71 @@ describe('mysql@2.x', () => { }); }); }); + + it('should not add comment by default', done => { + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + connection.query('SELECT 1+1 as solution', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.doesNotMatch(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); + + it('should not add comment when specified if existing block comment', done => { + instrumentation.setConfig({ + addSqlCommenterCommentToQueries: true, + } as any); + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + connection.query('SELECT 1+1 as solution /*block comment*/', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.doesNotMatch(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); + + it('should not add comment when specified if existing line comment', done => { + instrumentation.setConfig({ + addSqlCommenterCommentToQueries: true, + } as any); + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + connection.query('SELECT 1+1 as solution -- line comment', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.doesNotMatch(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); + + it('should add comment when specified if no existing comment', done => { + instrumentation.setConfig({ + addSqlCommenterCommentToQueries: true, + } as any); + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + connection.query('SELECT 1+1 as solution', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.match(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); }); describe('#Connection.execute', () => { @@ -587,6 +683,71 @@ describe('mysql@2.x', () => { }); }); }); + + it('should not add comment by default', done => { + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + pool.query('SELECT 1+1 as solution', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.doesNotMatch(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); + + it('should not add comment when specified if existing block comment', done => { + instrumentation.setConfig({ + addSqlCommenterCommentToQueries: true, + } as any); + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + pool.query('SELECT 1+1 as solution /*block comment*/', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.doesNotMatch(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); + + it('should not add comment when specified if existing line comment', done => { + instrumentation.setConfig({ + addSqlCommenterCommentToQueries: true, + } as any); + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + pool.query('SELECT 1+1 as solution -- line comment', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.doesNotMatch(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); + + it('should add comment when specified if no existing comment', done => { + instrumentation.setConfig({ + addSqlCommenterCommentToQueries: true, + } as any); + const span = provider.getTracer('default').startSpan('test span'); + context.with(trace.setSpan(context.active(), span), () => { + pool.query('SELECT 1+1 as solution', () => { + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + getLastQueries(1).then(([query]) => { + assert.match(query, /.*traceparent.*/); + done(); + }); + }); + }); + }); }); describe('#Pool.execute', () => { @@ -940,21 +1101,14 @@ describe('mysql@2.x', () => { describe('#responseHook', () => { const queryResultAttribute = 'query_result'; - after(() => { - instrumentation.setConfig({}); - }); - describe('invalid repsonse hook', () => { - before(() => { - instrumentation.disable(); - instrumentation.setTracerProvider(provider); + beforeEach(() => { const config: MySQL2InstrumentationConfig = { responseHook: (span, responseHookInfo) => { throw new Error('random failure!'); }, }; instrumentation.setConfig(config); - instrumentation.enable(); }); it('should not affect the behavior of the query', done => { @@ -972,9 +1126,7 @@ describe('mysql@2.x', () => { }); describe('valid response hook', () => { - before(() => { - instrumentation.disable(); - instrumentation.setTracerProvider(provider); + beforeEach(() => { const config: MySQL2InstrumentationConfig = { responseHook: (span, responseHookInfo) => { span.setAttribute( @@ -984,7 +1136,6 @@ describe('mysql@2.x', () => { }, }; instrumentation.setConfig(config); - instrumentation.enable(); }); it('should extract data from responseHook - connection', done => { diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 8d9dd67f2..94b881c9b 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -77,6 +77,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", + "@opentelemetry/sql-common": "^0.39.0", "@types/pg": "8.6.1", "@types/pg-pool": "2.0.3" }, diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts index 00ea20e78..f47b1e81b 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts @@ -44,6 +44,7 @@ import { SemanticAttributes, DbSystemValues, } from '@opentelemetry/semantic-conventions'; +import { addSqlCommenterComment } from '@opentelemetry/sql-common'; import { VERSION } from './version'; const PG_POOL_COMPONENT = 'pg-pool'; @@ -214,20 +215,13 @@ export class PgInstrumentation extends InstrumentationBase { // Modify query text w/ a tracing comment before invoking original for // tracing, but only if args[0] has one of our expected shapes. - // - // TODO: remove the `as ...` casts below when the TS version is upgraded. - // Newer TS versions will use the result of firstArgIsQueryObjectWithText - // to properly narrow arg0, but TS 4.3.5 does not. if (instrumentationConfig.addSqlCommenterCommentToQueries) { args[0] = firstArgIsString - ? utils.addSqlCommenterComment(span, arg0 as string) + ? addSqlCommenterComment(span, arg0) : firstArgIsQueryObjectWithText ? { - ...(arg0 as utils.ObjectWithText), - text: utils.addSqlCommenterComment( - span, - (arg0 as utils.ObjectWithText).text - ), + ...arg0, + text: addSqlCommenterComment(span, arg0.text), } : args[0]; } diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/utils.ts b/plugins/node/opentelemetry-instrumentation-pg/src/utils.ts index 1565d6d03..d97f7f9c3 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/src/utils.ts @@ -22,10 +22,7 @@ import { Tracer, SpanKind, diag, - defaultTextMapSetter, - ROOT_CONTEXT, } from '@opentelemetry/api'; -import { W3CTraceContextPropagator } from '@opentelemetry/core'; import { AttributeNames } from './enums/AttributeNames'; import { SemanticAttributes, @@ -266,72 +263,6 @@ export function patchClientConnectCallback(span: Span, cb: Function): Function { }; } -// NOTE: This function currently is returning false-positives -// in cases where comment characters appear in string literals -// ("SELECT '-- not a comment';" would return true, although has no comment) -function hasValidSqlComment(query: string): boolean { - const indexOpeningDashDashComment = query.indexOf('--'); - if (indexOpeningDashDashComment >= 0) { - return true; - } - - const indexOpeningSlashComment = query.indexOf('/*'); - if (indexOpeningSlashComment < 0) { - return false; - } - - const indexClosingSlashComment = query.indexOf('*/'); - return indexOpeningDashDashComment < indexClosingSlashComment; -} - -// sqlcommenter specification (https://google.github.io/sqlcommenter/spec/#value-serialization) -// expects us to URL encode based on the RFC 3986 spec (https://en.wikipedia.org/wiki/Percent-encoding), -// but encodeURIComponent does not handle some characters correctly (! ' ( ) *), -// which means we need special handling for this -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent -function fixedEncodeURIComponent(str: string) { - return encodeURIComponent(str).replace( - /[!'()*]/g, - c => `%${c.charCodeAt(0).toString(16).toUpperCase()}` - ); -} - -export function addSqlCommenterComment(span: Span, query: string): string { - if (typeof query !== 'string' || query.length === 0) { - return query; - } - - // As per sqlcommenter spec we shall not add a comment if there already is a comment - // in the query - if (hasValidSqlComment(query)) { - return query; - } - - const propagator = new W3CTraceContextPropagator(); - const headers: { [key: string]: string } = {}; - propagator.inject( - trace.setSpan(ROOT_CONTEXT, span), - headers, - defaultTextMapSetter - ); - - // sqlcommenter spec requires keys in the comment to be sorted lexicographically - const sortedKeys = Object.keys(headers).sort(); - - if (sortedKeys.length === 0) { - return query; - } - - const commentString = sortedKeys - .map(key => { - const encodedValue = fixedEncodeURIComponent(headers[key]); - return `${key}='${encodedValue}'`; - }) - .join(','); - - return `${query} /*${commentString}*/`; -} - /** * Attempt to get a message string from a thrown value, while being quite * defensive, to recognize the fact that, in JS, any kind of value (even diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts b/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts index a6c368ad3..dec92cd7c 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts @@ -45,7 +45,7 @@ import { SemanticAttributes, DbSystemValues, } from '@opentelemetry/semantic-conventions'; -import { addSqlCommenterComment } from '../src/utils'; +import { addSqlCommenterComment } from '@opentelemetry/sql-common'; const memoryExporter = new InMemorySpanExporter(); diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts b/plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts index d7c4f1f6a..ec32b5569 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts @@ -14,14 +14,7 @@ * limitations under the License. */ -import { - context, - createTraceState, - INVALID_SPAN_CONTEXT, - SpanContext, - trace, - TraceFlags, -} from '@opentelemetry/api'; +import { context, trace } from '@opentelemetry/api'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { InstrumentationConfig } from '@opentelemetry/instrumentation'; import { @@ -200,94 +193,4 @@ describe('utils.ts', () => { assert.deepStrictEqual(pgValues, ['0']); }); }); - - describe('addSqlCommenterComment', () => { - it('adds comment to a simple query', () => { - const spanContext: SpanContext = { - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92', - traceFlags: TraceFlags.SAMPLED, - }; - - const query = 'SELECT * from FOO;'; - assert.strictEqual( - utils.addSqlCommenterComment(trace.wrapSpanContext(spanContext), query), - "SELECT * from FOO; /*traceparent='00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-01'*/" - ); - }); - - it('does not add a comment if query already has a comment', () => { - const span = trace.wrapSpanContext({ - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92', - traceFlags: TraceFlags.SAMPLED, - }); - - const blockComment = 'SELECT * from FOO; /* Test comment */'; - assert.strictEqual( - utils.addSqlCommenterComment(span, blockComment), - blockComment - ); - - const dashedComment = 'SELECT * from FOO; -- Test comment'; - assert.strictEqual( - utils.addSqlCommenterComment(span, dashedComment), - dashedComment - ); - }); - - it('does not add a comment to an empty query', () => { - const spanContext: SpanContext = { - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92', - traceFlags: TraceFlags.SAMPLED, - }; - - assert.strictEqual( - utils.addSqlCommenterComment(trace.wrapSpanContext(spanContext), ''), - '' - ); - }); - - it('does not add a comment if span context is invalid', () => { - const query = 'SELECT * from FOO;'; - assert.strictEqual( - utils.addSqlCommenterComment( - trace.wrapSpanContext(INVALID_SPAN_CONTEXT), - query - ), - query - ); - }); - - it('correctly also sets trace state', () => { - const spanContext: SpanContext = { - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92', - traceFlags: TraceFlags.SAMPLED, - traceState: createTraceState('foo=bar,baz=qux'), - }; - - const query = 'SELECT * from FOO;'; - assert.strictEqual( - utils.addSqlCommenterComment(trace.wrapSpanContext(spanContext), query), - "SELECT * from FOO; /*traceparent='00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-01',tracestate='foo%3Dbar%2Cbaz%3Dqux'*/" - ); - }); - - it('escapes special characters in values', () => { - const spanContext: SpanContext = { - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92', - traceFlags: TraceFlags.SAMPLED, - traceState: createTraceState("foo='bar,baz='qux!()*',hack='DROP TABLE"), - }; - - const query = 'SELECT * from FOO;'; - assert.strictEqual( - utils.addSqlCommenterComment(trace.wrapSpanContext(spanContext), query), - "SELECT * from FOO; /*traceparent='00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-01',tracestate='foo%3D%27bar%2Cbaz%3D%27qux%21%28%29%2A%27%2Chack%3D%27DROP%20TABLE'*/" - ); - }); - }); }); diff --git a/release-please-config.json b/release-please-config.json index 424fe6824..c92ac926d 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -18,6 +18,7 @@ "packages/opentelemetry-id-generator-aws-xray": {}, "packages/opentelemetry-propagation-utils": {}, "packages/opentelemetry-redis-common": {}, + "packages/opentelemetry-sql-common": {}, "packages/opentelemetry-test-utils": {}, "plugins/node/instrumentation-amqplib": {}, "plugins/node/instrumentation-dataloader": {}, From 9977de79242cba0985595dd917ab302face0809b Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 22 Jun 2023 16:06:59 +0200 Subject: [PATCH 04/94] fix(otlp-proto-exporter-base): add missing type import (#3937) --- experimental/CHANGELOG.md | 1 + .../packages/otlp-proto-exporter-base/src/platform/util.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index a1efc1844..097f9925f 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) * fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412 + fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc ### :books: (Refine Doc) diff --git a/experimental/packages/otlp-proto-exporter-base/src/platform/util.ts b/experimental/packages/otlp-proto-exporter-base/src/platform/util.ts index c6e127281..2fe428b43 100644 --- a/experimental/packages/otlp-proto-exporter-base/src/platform/util.ts +++ b/experimental/packages/otlp-proto-exporter-base/src/platform/util.ts @@ -16,6 +16,7 @@ import * as root from '../generated/root'; import { ServiceClientType } from './types'; +import type * as protobuf from 'protobufjs'; export interface ExportRequestType unknown }> { create(properties?: T): R; From 4514522e57a862b880df9c43b606f2ea21def942 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 22 Jun 2023 21:19:48 +0200 Subject: [PATCH 05/94] fix(ci): use npx to run lerna (#1546) --- .github/workflows/peer-api.yaml | 5 +---- .github/workflows/test-all-versions.yml | 4 ++-- scripts/check-release-please.mjs | 2 +- scripts/parse-lerna-scopes.mjs | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/peer-api.yaml b/.github/workflows/peer-api.yaml index 6067d2fd5..44a1a9f34 100644 --- a/.github/workflows/peer-api.yaml +++ b/.github/workflows/peer-api.yaml @@ -15,11 +15,8 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install lerna - run: npm install -g lerna@5.5.2 - - name: Install script dependencies run: npm install - name: Check API dependency semantics - run: lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js" + run: npx lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js" diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index bc0b61193..f272f039a 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -146,6 +146,6 @@ jobs: - name: Install Root Dependencies run: npm install --ignore-scripts - name: Bootstrap Dependencies - run: lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha' + run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha' - name: Run test-all-versions - run: lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1 + run: npx lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1 diff --git a/scripts/check-release-please.mjs b/scripts/check-release-please.mjs index 0496533bc..699133c35 100644 --- a/scripts/check-release-please.mjs +++ b/scripts/check-release-please.mjs @@ -30,7 +30,7 @@ const getProcessOutput = (cmd, args) => { } const lernaList = JSON.parse( - getProcessOutput('lerna', ['list', '--json']) + getProcessOutput('npx', ['lerna', 'list', '--json']) ); const manifest = readJson('.release-please-manifest.json'); const config = readJson('release-please-config.json'); diff --git a/scripts/parse-lerna-scopes.mjs b/scripts/parse-lerna-scopes.mjs index af66a5af1..53a10dbd7 100644 --- a/scripts/parse-lerna-scopes.mjs +++ b/scripts/parse-lerna-scopes.mjs @@ -14,7 +14,7 @@ import { readFileSync } from 'fs'; const labels = JSON.parse(process.argv[2]); const lernaList = JSON.parse( - childProcess.spawnSync('lerna', ['list', '--json']).stdout + childProcess.spawnSync('npx', ['lerna', 'list', '--json']).stdout .toString('utf8') ); const packageList = new Map( From 655e373c53416c23dc1caa7430f8f8898a85024b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 23 Jun 2023 06:55:45 +0200 Subject: [PATCH 06/94] chore(deps): update dependency semver to v7.5.3 (#3942) --- .../packages/opentelemetry-instrumentation-grpc/package.json | 2 +- experimental/packages/opentelemetry-sdk-node/package.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index b05ee5172..85e49c1c2 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -62,7 +62,7 @@ "mocha": "10.2.0", "node-pre-gyp": "0.17.0", "nyc": "15.1.0", - "semver": "7.5.2", + "semver": "7.5.3", "sinon": "15.1.2", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 66c4bf947..d62cc04d5 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -74,7 +74,7 @@ "lerna": "7.0.2", "mocha": "10.2.0", "nyc": "15.1.0", - "semver": "7.5.2", + "semver": "7.5.3", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", diff --git a/package.json b/package.json index d52d6225d..b2b015c26 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "linkinator": "5.0.1", "markdownlint-cli": "0.35.0", "prettier": "2.8.8", - "semver": "7.5.2", + "semver": "7.5.3", "typedoc": "0.22.18", "typedoc-plugin-missing-exports": "1.0.0", "typedoc-plugin-resolve-crossmodule-references": "0.2.2", From 32fde65f77e031610d60f05e4197e0bff1991a83 Mon Sep 17 00:00:00 2001 From: Martin Kuba Date: Fri, 23 Jun 2023 10:34:09 -0700 Subject: [PATCH 07/94] chore: Update component owners for the Document Load web instrumentation (#1550) --- .github/component_owners.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/component_owners.yml b/.github/component_owners.yml index ddbde76e1..f04e7f200 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -109,7 +109,8 @@ components: plugins/node/opentelemetry-instrumentation-winston: - seemk plugins/web/opentelemetry-instrumentation-document-load: - - obecny + - pkanal + - martinkuba plugins/web/opentelemetry-instrumentation-long-task: - mhennoch - t2t2 From a30952cc50e9a7a7be11e661bc3190fbe71ee400 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 26 Jun 2023 09:35:45 +0200 Subject: [PATCH 08/94] chore(deps): update dependency nightwatch to v3 (#3950) --- selenium-tests/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selenium-tests/package.json b/selenium-tests/package.json index cc0ee0108..6d7726c13 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -44,7 +44,7 @@ "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", - "nightwatch": "2.0.10", + "nightwatch": "3.0.1", "selenium-server": "3.141.59", "terser-webpack-plugin": "4.2.3", "webpack": "4.46.0", From 4dc8416f9e1c808ba0eaa74bdbcbdb73c2e31e02 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 26 Jun 2023 11:04:48 +0200 Subject: [PATCH 09/94] fix(exporter-logs-otlp-http): update tsconfigs (#3936) --- .../packages/exporter-logs-otlp-http/tsconfig.esm.json | 3 +++ .../packages/exporter-logs-otlp-http/tsconfig.esnext.json | 3 +++ .../packages/exporter-logs-otlp-http/tsconfig.json | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json index 554367c37..f7353a3e8 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json @@ -12,6 +12,9 @@ { "path": "../../../packages/opentelemetry-core" }, + { + "path": "../../../packages/opentelemetry-resources" + }, { "path": "../api-logs" }, diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json index 87a369521..7a3b4e394 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json @@ -12,6 +12,9 @@ { "path": "../../../packages/opentelemetry-core" }, + { + "path": "../../../packages/opentelemetry-resources" + }, { "path": "../api-logs" }, diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.json index 52330c182..e347a2eef 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../../../packages/opentelemetry-core" }, + { + "path": "../../../packages/opentelemetry-resources" + }, { "path": "../api-logs" }, @@ -23,9 +26,6 @@ }, { "path": "../sdk-logs" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, + } ] } From 15ede4700b6049c44f30e511a7e8a643519ad254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B2=92=E7=B2=92=E6=A9=99?= Date: Mon, 26 Jun 2023 20:20:53 +0800 Subject: [PATCH 10/94] fix(example-opencensus-shim): avoid OpenCensus auto instrumentations (#3951) * fix(example-opencensus-shim): avoid opencensus instrumentations being auto imported * chore: changelog --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- experimental/CHANGELOG.md | 1 + experimental/examples/opencensus-shim/package.json | 2 +- experimental/examples/opencensus-shim/setup.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 097f9925f..dca209e1a 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -17,6 +17,7 @@ All notable changes to experimental packages in this project will be documented * fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412 fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc +* fix(example-opencensus-shim): avoid OpenCensus auto instrumentations [#3951](https://github.com/open-telemetry/opentelemetry-js/pull/3951) @llc1123 ### :books: (Refine Doc) diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index 689d1c7c2..fd231ef11 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -30,7 +30,7 @@ "@opentelemetry/api": "1.4.1", "@opentelemetry/sdk-trace-node": "1.14.0", "@opencensus/core": "0.1.0", - "@opencensus/nodejs": "0.1.0", + "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/semantic-conventions": "1.14.0", "@opentelemetry/exporter-trace-otlp-grpc": "0.40.0", "@opentelemetry/resources": "1.14.0", diff --git a/experimental/examples/opencensus-shim/setup.js b/experimental/examples/opencensus-shim/setup.js index e96c62ae0..37206971e 100644 --- a/experimental/examples/opencensus-shim/setup.js +++ b/experimental/examples/opencensus-shim/setup.js @@ -29,7 +29,7 @@ const { } = require('@opentelemetry/semantic-conventions'); module.exports = function setup(serviceName) { - const tracing = require('@opencensus/nodejs'); + const tracing = require('@opencensus/nodejs-base'); diag.setLogger(new DiagConsoleLogger(), { logLevel: DiagLogLevel.ALL }); const provider = new NodeTracerProvider({ From 10c3e934cc743211af9811037e6fa63bea2744ee Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 27 Jun 2023 07:08:03 +0200 Subject: [PATCH 11/94] fix(selenium-tests): restore tests to functional state (#3923) --- selenium-tests/babel.config.js | 8 ++++---- selenium-tests/pages/fetch/index.js | 2 +- selenium-tests/pages/xhr/index.js | 4 ++-- selenium-tests/tests-helpers/constants.js | 2 +- selenium-tests/webpack.common.js | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/selenium-tests/babel.config.js b/selenium-tests/babel.config.js index 26b15edca..31007c148 100644 --- a/selenium-tests/babel.config.js +++ b/selenium-tests/babel.config.js @@ -22,12 +22,12 @@ module.exports = function (api) { ]; const plugins = [ ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], - ['@babel/plugin-proposal-class-properties', { 'loose': true }], - ["@babel/plugin-proposal-private-methods", { "loose": true }], - ["@babel/plugin-proposal-private-property-in-object", { "loose": true }], + ['@babel/plugin-transform-class-properties', { 'loose': true }], + ["@babel/plugin-transform-private-methods", { "loose": true }], + ["@babel/plugin-transform-private-property-in-object", { "loose": true }], ]; return { presets, plugins, }; -}; \ No newline at end of file +}; diff --git a/selenium-tests/pages/fetch/index.js b/selenium-tests/pages/fetch/index.js index dbd2fe116..4a3b7ae37 100644 --- a/selenium-tests/pages/fetch/index.js +++ b/selenium-tests/pages/fetch/index.js @@ -29,7 +29,7 @@ const getData = (url) => fetch(url, { // example of keeping track of context between async operations const prepareClickEvent = () => { - const url = 'https://httpbin.org/get'; + const url = 'https://httpstat.us/200'; const element = document.getElementById('button1'); diff --git a/selenium-tests/pages/xhr/index.js b/selenium-tests/pages/xhr/index.js index e998c5896..ba03da9c4 100644 --- a/selenium-tests/pages/xhr/index.js +++ b/selenium-tests/pages/xhr/index.js @@ -10,7 +10,7 @@ const provider = loadOtel([ new XMLHttpRequestInstrumentation({ ignoreUrls: [/localhost:8090\/sockjs-node/], propagateTraceHeaderCorsUrls: [ - 'https://httpbin.org/get', + 'https://httpstat.us/200', ], clearTimingResources: true, }), @@ -35,7 +35,7 @@ const getData = (url) => new Promise((resolve, reject) => { // example of keeping track of context between async operations const prepareClickEvent = () => { - const url = 'https://httpbin.org/get'; + const url = 'https://httpstat.us/200'; const element = document.getElementById('button1'); diff --git a/selenium-tests/tests-helpers/constants.js b/selenium-tests/tests-helpers/constants.js index 3362a3585..2549a7fc2 100644 --- a/selenium-tests/tests-helpers/constants.js +++ b/selenium-tests/tests-helpers/constants.js @@ -2,4 +2,4 @@ const TIMEOUT_ELEMENT_MS = 5000; module.exports = { TIMEOUT_ELEMENT_MS, -}; \ No newline at end of file +}; diff --git a/selenium-tests/webpack.common.js b/selenium-tests/webpack.common.js index 0d00b07c6..3306d91b0 100644 --- a/selenium-tests/webpack.common.js +++ b/selenium-tests/webpack.common.js @@ -11,7 +11,7 @@ module.exports = { filename: '[name].js', sourceMapFilename: '[file].map', }, - target: ['web', 'es5'], + target: 'web', module: { rules: [ { @@ -35,4 +35,4 @@ module.exports = { ], extensions: ['.ts', '.js', '.jsx', '.json'], }, -}; \ No newline at end of file +}; From 65f612e35c4d67b9935dc3a9155588b35d915482 Mon Sep 17 00:00:00 2001 From: Nev <54870357+MSNev@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:38:49 -0700 Subject: [PATCH 12/94] feat(minification): Add importHelpers and tslib as a dependency (#1545) Co-authored-by: Marc Pichler --- .../opentelemetry-browser-extension-autoinjection/package.json | 3 ++- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 3 ++- .../node/opentelemetry-resource-detector-aws/package.json | 3 ++- .../opentelemetry-resource-detector-container/package.json | 3 ++- .../node/opentelemetry-resource-detector-gcp/package.json | 3 ++- .../node/opentelemetry-resource-detector-github/package.json | 3 ++- .../node/opentelemetry-resource-detector-instana/package.json | 3 ++- metapackages/auto-instrumentations-node/package.json | 3 ++- metapackages/auto-instrumentations-web/package.json | 3 ++- package.json | 3 ++- packages/opentelemetry-host-metrics/package.json | 3 ++- packages/opentelemetry-id-generator-aws-xray/package.json | 3 ++- packages/opentelemetry-propagation-utils/package.json | 3 +++ packages/opentelemetry-redis-common/package.json | 3 +++ packages/opentelemetry-sampler-aws-xray/package.json | 3 ++- packages/opentelemetry-test-utils/package.json | 3 ++- plugins/node/instrumentation-amqplib/package.json | 3 ++- plugins/node/instrumentation-dataloader/package.json | 3 ++- plugins/node/instrumentation-fs/package.json | 3 ++- plugins/node/instrumentation-lru-memoizer/package.json | 3 ++- plugins/node/instrumentation-mongoose/package.json | 3 ++- plugins/node/instrumentation-socket.io/package.json | 3 ++- plugins/node/instrumentation-tedious/package.json | 3 ++- .../node/opentelemetry-instrumentation-aws-lambda/package.json | 3 ++- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-bunyan/package.json | 3 ++- .../node/opentelemetry-instrumentation-cassandra/package.json | 3 ++- .../node/opentelemetry-instrumentation-connect/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-dns/package.json | 3 ++- .../examples/package.json | 3 ++- .../node/opentelemetry-instrumentation-express/package.json | 3 ++- .../node/opentelemetry-instrumentation-fastify/package.json | 3 ++- .../opentelemetry-instrumentation-generic-pool/package.json | 3 ++- .../node/opentelemetry-instrumentation-graphql/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-hapi/package.json | 3 ++- .../node/opentelemetry-instrumentation-ioredis/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-knex/package.json | 3 ++- .../opentelemetry-instrumentation-koa/examples/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-koa/package.json | 3 ++- .../node/opentelemetry-instrumentation-memcached/package.json | 3 ++- .../examples/package.json | 3 ++- .../node/opentelemetry-instrumentation-mongodb/package.json | 3 ++- .../opentelemetry-instrumentation-mysql/examples/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-mysql/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-mysql2/package.json | 3 ++- .../opentelemetry-instrumentation-nestjs-core/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-net/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-pg/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-pino/package.json | 3 ++- .../node/opentelemetry-instrumentation-redis-4/package.json | 3 ++- .../opentelemetry-instrumentation-redis/examples/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-redis/package.json | 3 ++- .../node/opentelemetry-instrumentation-restify/package.json | 3 ++- plugins/node/opentelemetry-instrumentation-router/package.json | 3 ++- .../node/opentelemetry-instrumentation-winston/package.json | 3 ++- .../opentelemetry-instrumentation-document-load/package.json | 3 ++- .../web/opentelemetry-instrumentation-long-task/package.json | 3 ++- .../package.json | 3 ++- plugins/web/opentelemetry-plugin-react-load/package.json | 3 ++- propagators/opentelemetry-propagator-aws-xray/package.json | 3 ++- .../opentelemetry-propagator-grpc-census-binary/package.json | 3 +++ propagators/opentelemetry-propagator-instana/package.json | 3 +++ propagators/opentelemetry-propagator-ot-trace/package.json | 3 +++ tsconfig.base.json | 3 ++- 64 files changed, 133 insertions(+), 59 deletions(-) diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json index 1efd629ff..e6037e840 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ b/archive/opentelemetry-browser-extension-autoinjection/package.json @@ -80,7 +80,8 @@ "change-case": "4.1.2", "json5": "2.2.0", "react": "17.0.2", - "react-dom": "17.0.2" + "react-dom": "17.0.2", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index ff5acc6b0..66585dcf0 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -60,7 +60,8 @@ }, "dependencies": { "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index d4d833de9..dae53b7b6 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -60,7 +60,8 @@ "dependencies": { "@opentelemetry/core": "^1.0.0", "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 04e3b41a4..b5fc5e735 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -54,7 +54,8 @@ }, "dependencies": { "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index d18c69580..a0de2cef0 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -60,7 +60,8 @@ "@opentelemetry/core": "^1.0.0", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "gcp-metadata": "^5.0.0" + "gcp-metadata": "^5.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-gcp#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 9977b32bd..841c90fab 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -57,7 +57,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/resources": "^1.0.0" + "@opentelemetry/resources": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-github#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 3cc026045..4a0963bd7 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -54,7 +54,8 @@ }, "dependencies": { "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 0110a6e24..95bdd589d 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -91,6 +91,7 @@ "@opentelemetry/resource-detector-container": "^0.2.5", "@opentelemetry/resource-detector-gcp": "^0.28.3", "@opentelemetry/resources": "^1.12.0", - "@opentelemetry/sdk-node": "^0.40.0" + "@opentelemetry/sdk-node": "^0.40.0", + "tslib": "^2.3.1" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 8ef0d4046..5fd9c2964 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -63,6 +63,7 @@ "@opentelemetry/instrumentation-document-load": "^0.32.3", "@opentelemetry/instrumentation-fetch": "^0.40.0", "@opentelemetry/instrumentation-user-interaction": "^0.32.4", - "@opentelemetry/instrumentation-xml-http-request": "^0.40.0" + "@opentelemetry/instrumentation-xml-http-request": "^0.40.0", + "tslib": "^2.3.1" } } diff --git a/package.json b/package.json index 24049e1ff..4cb48e1ea 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ "lerna": "5.5.2", "lerna-changelog": "2.2.0", "prettier": "2.8.7", - "typescript": "4.4.4" + "typescript": "4.4.4", + "tslib": "^2.3.1" }, "changelog": { "labels": { diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 9f13f4b66..d5ba9f347 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -59,7 +59,8 @@ }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.8.0", - "systeminformation": "^5.0.0" + "systeminformation": "^5.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme" } diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index eb92b38a1..8f84ed2ca 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -76,7 +76,8 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/core": "^1.0.0" + "@opentelemetry/core": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-id-generator-aws-xray#readme" } diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 3fbc9b994..8a442fc0e 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -55,5 +55,8 @@ "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" + }, + "dependencies": { + "tslib": "^2.3.1" } } diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json index 62bde4fd0..51604ed21 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/opentelemetry-redis-common/package.json @@ -45,5 +45,8 @@ "nyc": "15.1.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" + }, + "dependencies": { + "tslib": "^2.3.1" } } diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index f28f1e333..0f1a62c51 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -47,7 +47,8 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "axios": "^1.3.5" + "axios": "^1.3.5", + "tslib": "^2.3.1" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 8df382fa2..78f1e3af1 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -52,6 +52,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" } } diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 3b41fd075..9c0cfa10b 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -48,7 +48,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 8d543e2af..e270e078b 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -61,7 +61,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0" + "@opentelemetry/instrumentation": "^0.40.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" } diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index a30c9732a..19422a709 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -60,7 +60,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme" } diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 893affaa3..6c569adef 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -57,7 +57,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0" + "@opentelemetry/instrumentation": "^0.40.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" } diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 21d64646f..9f7c59633 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -62,7 +62,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme" } diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index fca039149..17fc26680 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -59,7 +59,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme" } diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index dd3677ddc..cf51a7691 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -64,7 +64,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/tedious": "^4.0.6" + "@types/tedious": "^4.0.6", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-tedious#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index adfcd5393..55fd53b17 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -63,7 +63,8 @@ "@opentelemetry/propagator-aws-xray": "^1.2.1", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/aws-lambda": "8.10.81" + "@types/aws-lambda": "8.10.81", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 1696b7211..2ed8a50c6 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -49,7 +49,8 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.29.5" + "@opentelemetry/propagation-utils": "^0.29.5", + "tslib": "^2.3.1" }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.85.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index aea1d84ed..90a3705c3 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -65,7 +65,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@types/bunyan": "1.8.7" + "@types/bunyan": "1.8.7", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index ee19e6504..0de9dec3d 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -65,7 +65,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index af01931c1..34d640fe9 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -61,7 +61,8 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/connect": "3.4.35" + "@types/connect": "3.4.35", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index b608f7a4b..d0d5b1be0 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -64,7 +64,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "semver": "^7.3.2" + "semver": "^7.3.2", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 4e76fbb29..fd3b8679e 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -41,7 +41,8 @@ "@opentelemetry/semantic-conventions": "^1.0.0", "axios": "^0.21.1", "cross-env": "^7.0.3", - "express": "^4.17.1" + "express": "^4.17.1", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index d93ea321b..724fa4cb8 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -68,7 +68,8 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/express": "4.17.13" + "@types/express": "4.17.13", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index f7830fa14..6152d134a 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -64,7 +64,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 445b9009a..a98d5c1cb 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -63,7 +63,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/generic-pool": "^3.1.9" + "@types/generic-pool": "^3.1.9", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 48cf05a97..0e6c47c10 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -61,7 +61,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0" + "@opentelemetry/instrumentation": "^0.40.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index d43147d65..19eefe706 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -62,7 +62,8 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/hapi__hapi": "20.0.9" + "@types/hapi__hapi": "20.0.9", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 23ef158ee..a1507eaa4 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -72,7 +72,8 @@ "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/redis-common": "^0.35.1", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/ioredis4": "npm:@types/ioredis@^4.28.10" + "@types/ioredis4": "npm:@types/ioredis@^4.28.10", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-ioredis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 8321c7a5b..e5b1553a6 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -61,7 +61,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index 1b47f72fa..c46bf95f8 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -40,7 +40,8 @@ "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "axios": "^0.21.1", - "koa": "^2.13.0" + "koa": "^2.13.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 9ed0a2feb..18d52a52b 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -71,7 +71,8 @@ "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.6", - "@types/koa__router": "8.0.7" + "@types/koa__router": "8.0.7", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 352a62163..0d4a84bc5 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -65,7 +65,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/memcached": "^2.2.6" + "@types/memcached": "^2.2.6", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-memcached#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index 850e3edd1..62943a13f 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -38,7 +38,8 @@ "@opentelemetry/instrumentation-mongodb": "^0.32.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", - "mongodb": "^3.7.3" + "mongodb": "^3.7.3", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 11f2c32d4..ef186f31f 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -70,7 +70,8 @@ "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index 14a68faa8..881876d79 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -40,7 +40,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/exporter-metrics-otlp-grpc": "0.33.0", - "mysql": "^2.18.1" + "mysql": "^2.18.1", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 3c4e0b192..d15998bde 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -65,7 +65,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.19" + "@types/mysql": "2.15.19", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 0ca042b94..2e627296d 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -67,7 +67,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 13975b06d..8135edb60 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -74,7 +74,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 90f9fcbe7..df6bc5974 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -62,7 +62,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 94b881c9b..8f700a563 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -79,7 +79,8 @@ "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.39.0", "@types/pg": "8.6.1", - "@types/pg-pool": "2.0.3" + "@types/pg-pool": "2.0.3", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 7456bd100..de187ff65 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -66,7 +66,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0" + "@opentelemetry/instrumentation": "^0.40.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 67d177f38..8d84fc557 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -71,7 +71,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/redis-common": "^0.35.1", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis-4#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 5f6738d4c..95749d9ed 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -41,7 +41,8 @@ "@opentelemetry/sdk-trace-node": "^1.0.0", "axios": "^0.21.1", "express": "^4.17.1", - "redis": "^3.1.1" + "redis": "^3.1.1", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 3b0c7bd0e..3942689cb 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -72,7 +72,8 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/redis-common": "^0.35.1", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 687836fb4..db1e2b171 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -66,7 +66,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index a25b6bf1e..9f0ac7e26 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -60,7 +60,8 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-router#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 1820fb580..166ffc552 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -66,7 +66,8 @@ "winston2": "npm:winston@2.4.5" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0" + "@opentelemetry/instrumentation": "^0.40.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index d14698293..463dab251 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -80,7 +80,8 @@ "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.8.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 510d0c4f4..6604fafa3 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -79,7 +79,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/sdk-trace-web": "^1.8.0" + "@opentelemetry/sdk-trace-web": "^1.8.0", + "tslib": "^2.3.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index e081fec21..b4b590967 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -81,7 +81,8 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/sdk-trace-web": "^1.8.0" + "@opentelemetry/sdk-trace-web": "^1.8.0", + "tslib": "^2.3.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 9dc58e1b5..99be2797f 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -89,7 +89,8 @@ "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "shimmer": "^1.2.1" + "shimmer": "^1.2.1", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-react-load#readme" } diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index d08745075..237589324 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -68,7 +68,8 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/core": "^1.0.0" + "@opentelemetry/core": "^1.0.0", + "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-aws-xray#readme" } diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0a2f8e870..0eaabc96b 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -56,5 +56,8 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4" }, + "dependencies": { + "tslib": "^2.3.1" + }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-grpc-census-binary#readme" } diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index d97f70201..c6434a0b9 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -70,5 +70,8 @@ "webpack": "4.46.0", "webpack-cli": "4.9.2" }, + "dependencies": { + "tslib": "^2.3.1" + }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme" } diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 75dffaed4..9bb140fb3 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -67,5 +67,8 @@ "typescript": "4.4.4", "webpack": "4.46.0" }, + "dependencies": { + "tslib": "^2.3.1" + }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme" } diff --git a/tsconfig.base.json b/tsconfig.base.json index 83c35af07..1ee8ca34b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,7 +18,8 @@ "strictNullChecks": true, "target": "es2017", "incremental": true, - "newLine": "LF" + "newLine": "LF", + "importHelpers": true }, "exclude": [ "node_modules" From de17f77bd7f75fc2fc8a92d35dfcfbf749b50f71 Mon Sep 17 00:00:00 2001 From: David Weterings Date: Tue, 27 Jun 2023 14:16:57 +0200 Subject: [PATCH 13/94] feat(aws-ecs): add cloud resource attributes for fargate (#1543) chore: fix typo in test description Noticed ECS on Fargate is missing some cloud resource attributes. Comparing similar implementations like the Go ECS detector (https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/5fff1040a2844d4d435359b8108202317762593d/processor/resourcedetectionprocessor/internal/aws/ecs/ecs.go#L69); they determine these missing values based on the metadata. This implements them in a similar fashion. Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .../src/detectors/AwsEcsDetector.ts | 28 ++++++++++++++++--- .../test/detectors/AwsEcsDetector.test.ts | 9 ++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts index dc295f532..700d41057 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts +++ b/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts @@ -15,7 +15,11 @@ */ import { diag } from '@opentelemetry/api'; -import { Detector, Resource } from '@opentelemetry/resources'; +import { + Detector, + Resource, + ResourceAttributes, +} from '@opentelemetry/resources'; import { CloudProviderValues, CloudPlatformValues, @@ -128,14 +132,19 @@ export class AwsEcsDetector implements Detector { const baseArn: string = taskArn.substring(0, taskArn.lastIndexOf(':')); const cluster: string = taskMetadata['Cluster']; + const accountId: string = AwsEcsDetector._getAccountFromArn(taskArn); + const region: string = AwsEcsDetector._getRegionFromArn(taskArn); + const availabilityZone: string | undefined = + taskMetadata?.['AvailabilityZone']; + const clusterArn = cluster.startsWith('arn:') ? cluster : `${baseArn}:cluster/${cluster}`; const containerArn: string = containerMetadata['ContainerARN']; - // https://github.com/open-telemetry/opentelemetry-specification/blob/main/semantic_conventions/resource/cloud_provider/aws/ecs.yaml - return new Resource({ + // https://github.com/open-telemetry/semantic-conventions/blob/main/semantic_conventions/resource/cloud_provider/aws/ecs.yaml + const attributes: ResourceAttributes = { [SemanticResourceAttributes.AWS_ECS_CONTAINER_ARN]: containerArn, [SemanticResourceAttributes.AWS_ECS_CLUSTER_ARN]: clusterArn, [SemanticResourceAttributes.AWS_ECS_LAUNCHTYPE]: @@ -144,7 +153,18 @@ export class AwsEcsDetector implements Detector { [SemanticResourceAttributes.AWS_ECS_TASK_FAMILY]: taskMetadata['Family'], [SemanticResourceAttributes.AWS_ECS_TASK_REVISION]: taskMetadata['Revision'], - }); + + [SemanticResourceAttributes.CLOUD_ACCOUNT_ID]: accountId, + [SemanticResourceAttributes.CLOUD_REGION]: region, + }; + + // The availability zone is not available in all Fargate runtimes + if (availabilityZone) { + attributes[SemanticResourceAttributes.CLOUD_AVAILABILITY_ZONE] = + availabilityZone; + } + + return new Resource(attributes); } private static async _getLogResource( 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 b1f7b58a1..4a869a987 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 @@ -37,6 +37,9 @@ import * as os from 'os'; import { join } from 'path'; interface EcsResourceAttributes { + readonly accountId?: string; + readonly region?: string; + readonly zone?: string; readonly clusterArn?: string; readonly containerArn?: string; readonly launchType?: 'ec2' | 'fargate'; @@ -55,6 +58,9 @@ const assertEcsResource = ( ) => { assertCloudResource(resource, { provider: CloudProviderValues.AWS, + accountId: validations.accountId, + region: validations.region, + zone: validations.zone, }); assert.strictEqual( resource.attributes[SemanticResourceAttributes.CLOUD_PLATFORM], @@ -336,6 +342,9 @@ describe('AwsEcsResourceDetector', () => { describe('on Fargate', () => { describe('with AWS CloudWatch as log driver', () => { generateLaunchTypeTests({ + accountId: '111122223333', + region: 'us-west-2', + zone: 'us-west-2a', clusterArn: 'arn:aws:ecs:us-west-2:111122223333:cluster/default', containerArn: 'arn:aws:ecs:us-west-2:111122223333:container/05966557-f16c-49cb-9352-24b3a0dcd0e1', From f7c432495dc04b02f7279c543bb4565f4f111134 Mon Sep 17 00:00:00 2001 From: Carol Abadeer <60774943+carolabadeer@users.noreply.github.com> Date: Tue, 27 Jun 2023 06:33:08 -0700 Subject: [PATCH 14/94] feat(opentelemetry-instrumentation-aws-sdk): add missing spec-defined DynamoDB attributes (#1524) * feat(opentelemetry-instrumentation-aws-sdk): add missing spec-defined DynamoDB attributes * feat(opentelemetry-instrumentation-aws-sdk): add checks for input attributes and additional unit tests * feat(opentelemetry-instrumentation-aws-sdk): run lint on dynamoDB unit tests --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Co-authored-by: Marc Pichler --- .../src/services/dynamodb.ts | 168 +++++++- .../test/dynamodb.test.ts | 391 ++++++++++++++++++ 2 files changed, 558 insertions(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts index dd797b5af..424cab5fa 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts @@ -26,6 +26,10 @@ import { } from '../types'; export class DynamodbServiceExtension implements ServiceExtension { + toArray(values: T | T[]): T[] { + return Array.isArray(values) ? values : [values]; + } + requestPreSpanHook(normalizedRequest: NormalizedRequest): RequestMetadata { const spanKind: SpanKind = SpanKind.CLIENT; let spanName: string | undefined; @@ -41,12 +45,144 @@ export class DynamodbServiceExtension implements ServiceExtension { ), }; - if (operation === 'BatchGetItem') { + // normalizedRequest.commandInput.RequestItems) is undefined when no table names are returned + // keys in this object are the table names + if (normalizedRequest.commandInput?.TableName) { + // Necessary for commands with only 1 table name (example: CreateTable). Attribute is TableName not keys of RequestItems + // single table name returned for operations like CreateTable + spanAttributes[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = [ + normalizedRequest.commandInput.TableName, + ]; + } else if (normalizedRequest.commandInput?.RequestItems) { spanAttributes[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = Object.keys( normalizedRequest.commandInput.RequestItems ); } + if (operation === 'CreateTable' || operation === 'UpdateTable') { + // only check for ProvisionedThroughput since ReadCapacityUnits and WriteCapacity units are required attributes + if (normalizedRequest.commandInput?.ProvisionedThroughput) { + spanAttributes[ + SemanticAttributes.AWS_DYNAMODB_PROVISIONED_READ_CAPACITY + ] = + normalizedRequest.commandInput.ProvisionedThroughput.ReadCapacityUnits; + spanAttributes[ + SemanticAttributes.AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY + ] = + normalizedRequest.commandInput.ProvisionedThroughput.WriteCapacityUnits; + } + } + + if ( + operation === 'GetItem' || + operation === 'Scan' || + operation === 'Query' + ) { + if (normalizedRequest.commandInput?.ConsistentRead) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_CONSISTENT_READ] = + normalizedRequest.commandInput.ConsistentRead; + } + } + + if (operation === 'Query' || operation === 'Scan') { + if (normalizedRequest.commandInput?.ProjectionExpression) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_PROJECTION] = + normalizedRequest.commandInput.ProjectionExpression; + } + } + + if (operation === 'CreateTable') { + if (normalizedRequest.commandInput?.GlobalSecondaryIndexes) { + spanAttributes[ + SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES + ] = this.toArray( + normalizedRequest.commandInput.GlobalSecondaryIndexes + ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x)); + } + + if (normalizedRequest.commandInput?.LocalSecondaryIndexes) { + spanAttributes[ + SemanticAttributes.AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES + ] = this.toArray( + normalizedRequest.commandInput.LocalSecondaryIndexes + ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x)); + } + } + + if ( + operation === 'ListTables' || + operation === 'Query' || + operation === 'Scan' + ) { + if (normalizedRequest.commandInput?.Limit) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_LIMIT] = + normalizedRequest.commandInput.Limit; + } + } + + if (operation === 'ListTables') { + if (normalizedRequest.commandInput?.ExclusiveStartTableName) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_EXCLUSIVE_START_TABLE] = + normalizedRequest.commandInput.ExclusiveStartTableName; + } + } + + if (operation === 'Query') { + if (normalizedRequest.commandInput?.ScanIndexForward) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_SCAN_FORWARD] = + normalizedRequest.commandInput.ScanIndexForward; + } + + if (normalizedRequest.commandInput?.IndexName) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] = + normalizedRequest.commandInput.IndexName; + } + + if (normalizedRequest.commandInput?.Select) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_SELECT] = + normalizedRequest.commandInput.Select; + } + } + + if (operation === 'Scan') { + if (normalizedRequest.commandInput?.Segment) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_SEGMENT] = + normalizedRequest.commandInput?.Segment; + } + + if (normalizedRequest.commandInput?.TotalSegments) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_TOTAL_SEGMENTS] = + normalizedRequest.commandInput?.TotalSegments; + } + + if (normalizedRequest.commandInput?.IndexName) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] = + normalizedRequest.commandInput.IndexName; + } + + if (normalizedRequest.commandInput?.Select) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_SELECT] = + normalizedRequest.commandInput.Select; + } + } + + if (operation === 'UpdateTable') { + if (normalizedRequest.commandInput?.AttributeDefinitions) { + spanAttributes[SemanticAttributes.AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS] = + this.toArray(normalizedRequest.commandInput.AttributeDefinitions).map( + (x: { [DictionaryKey: string]: any }) => JSON.stringify(x) + ); + } + + if (normalizedRequest.commandInput?.GlobalSecondaryIndexUpdates) { + spanAttributes[ + SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES + ] = this.toArray( + normalizedRequest.commandInput.GlobalSecondaryIndexUpdates + ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x)); + } + } + return { isIncoming, spanAttributes, @@ -73,5 +209,35 @@ export class DynamodbServiceExtension implements ServiceExtension { ); } } + + if (response.data?.ItemCollectionMetrics) { + span.setAttribute( + SemanticAttributes.AWS_DYNAMODB_ITEM_COLLECTION_METRICS, + this.toArray(response.data.ItemCollectionMetrics).map( + (x: { [DictionaryKey: string]: any }) => JSON.stringify(x) + ) + ); + } + + if (response.data?.TableNames) { + span.setAttribute( + SemanticAttributes.AWS_DYNAMODB_TABLE_COUNT, + response.data?.TableNames.length + ); + } + + if (response.data?.Count) { + span.setAttribute( + SemanticAttributes.AWS_DYNAMODB_COUNT, + response.data?.Count + ); + } + + if (response.data?.ScannedCount) { + span.setAttribute( + SemanticAttributes.AWS_DYNAMODB_SCANNED_COUNT, + response.data?.ScannedCount + ); + } } } 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 5ff0c2b0a..b8504d401 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/dynamodb.test.ts @@ -69,7 +69,14 @@ describe('DynamoDB', () => { ExpressionAttributeValues: { ':v': 'val1', }, + ProjectionExpression: 'id', + ScanIndexForward: true, + ConsistentRead: true, + IndexName: 'name_to_group', + Limit: 10, + Select: 'ALL_ATTRIBUTES', }; + dynamodb.query( params, (err: AWSError, data: AWS.DynamoDB.DocumentClient.QueryOutput) => { @@ -81,6 +88,390 @@ describe('DynamoDB', () => { ); expect(attrs[SemanticAttributes.DB_NAME]).toStrictEqual('test-table'); expect(attrs[SemanticAttributes.DB_OPERATION]).toStrictEqual('Query'); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_SCAN_FORWARD] + ).toStrictEqual(true); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_CONSISTENT_READ] + ).toStrictEqual(true); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] + ).toStrictEqual('name_to_group'); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_SELECT]).toStrictEqual( + 'ALL_ATTRIBUTES' + ); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_LIMIT]).toStrictEqual( + 10 + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] + ).toStrictEqual(['test-table']); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_PROJECTION] + ).toStrictEqual('id'); + expect( + JSON.parse(attrs[SemanticAttributes.DB_STATEMENT] as string) + ).toEqual(params); + expect(err).toBeFalsy(); + done(); + } + ); + }); + }); + + describe('Scan', () => { + beforeEach(() => + mockV2AwsSend(responseMockSuccess, { + ConsumedCapacity: { + TableName: 'test-table', + CapacityUnits: 0.5, + Table: { CapacityUnits: 0.5 }, + }, + Count: 10, + ScannedCount: 50, + } as AWS.DynamoDB.Types.ScanOutput) + ); + + it('should populate specific Scan attributes', done => { + const dynamodb = new AWS.DynamoDB.DocumentClient(); + const params = { + TableName: 'test-table', + Item: { key1: 'val1' }, + ProjectionExpression: 'id', + ConsistentRead: true, + Segment: 10, + TotalSegments: 100, + IndexName: 'index_name', + Limit: 10, + Select: 'ALL_ATTRIBUTES', + }; + + dynamodb.scan( + params, + (err: AWSError, data: AWS.DynamoDB.DocumentClient.ScanOutput) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + expect(attrs[SemanticAttributes.DB_NAME]).toStrictEqual('test-table'); + expect(attrs[SemanticAttributes.DB_OPERATION]).toStrictEqual('Scan'); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_SEGMENT]).toStrictEqual( + 10 + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_TOTAL_SEGMENTS] + ).toStrictEqual(100); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] + ).toStrictEqual('index_name'); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_SELECT]).toStrictEqual( + 'ALL_ATTRIBUTES' + ); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_COUNT]).toStrictEqual( + 10 + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_SCANNED_COUNT] + ).toStrictEqual(50); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_LIMIT]).toStrictEqual( + 10 + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] + ).toStrictEqual(['test-table']); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_PROJECTION] + ).toStrictEqual('id'); + expect( + JSON.parse(attrs[SemanticAttributes.DB_STATEMENT] as string) + ).toEqual(params); + expect(err).toBeFalsy(); + done(); + } + ); + }); + }); + + describe('BatchWriteItem', () => { + beforeEach(() => + mockV2AwsSend(responseMockSuccess, { + UnprocessedItems: {}, + ItemCollectionMetrics: { + ItemCollectionKey: [], + SizeEstimateRangeGB: [0], + }, + ConsumedCapacity: undefined, + } as AWS.DynamoDB.Types.BatchWriteItemOutput) + ); + + it('should populate specific BatchWriteItem attributes', done => { + const dynamodb = new AWS.DynamoDB.DocumentClient(); + const params = { + RequestItems: {}, + ReturnConsumedCapacity: 'INDEXES', + ReturnItemCollectionMetrics: 'SIZE', + }; + + dynamodb.batchWrite( + params, + ( + err: AWSError, + data: AWS.DynamoDB.DocumentClient.BatchWriteItemOutput + ) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_ITEM_COLLECTION_METRICS] + ).toStrictEqual([ + JSON.stringify({ ItemCollectionKey: [], SizeEstimateRangeGB: [0] }), + ]); + + expect( + JSON.parse(attrs[SemanticAttributes.DB_STATEMENT] as string) + ).toEqual(params); + expect(err).toBeFalsy(); + done(); + } + ); + }); + }); + + describe('CreateTable', () => { + beforeEach(() => + mockV2AwsSend(responseMockSuccess, { + TableName: 'test_table', + ItemCollectionMetrics: { + ItemCollectionKey: [], + SizeEstimateRangeGB: [0], + }, + ConsumedCapacity: undefined, + } as AWS.DynamoDB.Types.CreateTableOutput) + ); + + it('should populate specific CreateTable attributes', done => { + const globalSecondaryIndexMockData = { + IndexName: 'test_index', + KeySchema: [ + { + AttributeName: 'attribute1', + KeyType: 'HASH', + }, + ], + Projection: { + ProjectionType: 'ALL', + NonKeyAttributes: ['non_key_attr'], + }, + ProvisionedThroughput: { + ReadCapacityUnits: 5, + WriteCapacityUnits: 10, + }, + }; + + const localSecondaryIndexMockData = { + IndexName: 'test_index', + KeySchema: [ + { + AttributeName: 'test_attribute', + KeyType: 'HASH', + }, + ], + Projection: { + ProjectionType: 'ALL', + NonKeyAttributes: ['STRING_VALUE'], + }, + }; + + const dynamodb = new AWS.DynamoDB(); + const params = { + AttributeDefinitions: [ + { + AttributeName: 'test_attribute', + AttributeType: 'S', + }, + ], + TableName: 'test_table', + KeySchema: [ + { + AttributeName: 'test_attribute', + KeyType: 'HASH', + }, + ], + LocalSecondaryIndexes: [localSecondaryIndexMockData], + GlobalSecondaryIndexes: [globalSecondaryIndexMockData], + BillingMode: 'PROVISIONED', + ProvisionedThroughput: { + ReadCapacityUnits: 20, + WriteCapacityUnits: 30, + }, + }; + + dynamodb.createTable( + params, + ( + err: AWSError, + data: AWS.DynamoDB.DocumentClient.CreateTableOutput + ) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_ITEM_COLLECTION_METRICS] + ).toStrictEqual([ + JSON.stringify({ ItemCollectionKey: [], SizeEstimateRangeGB: [0] }), + ]); + + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES] + ).toStrictEqual([JSON.stringify(globalSecondaryIndexMockData)]); + + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES] + ).toStrictEqual([JSON.stringify(localSecondaryIndexMockData)]); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_PROVISIONED_READ_CAPACITY] + ).toStrictEqual(20); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY] + ).toStrictEqual(30); + expect( + JSON.parse(attrs[SemanticAttributes.DB_STATEMENT] as string) + ).toEqual(params); + expect(err).toBeFalsy(); + done(); + } + ); + }); + }); + + describe('UpdateTable', () => { + beforeEach(() => + mockV2AwsSend(responseMockSuccess, { + TableName: 'test_table', + } as AWS.DynamoDB.Types.UpdateTableOutput) + ); + + it('should populate specific CreateTable attributes', done => { + const dynamodb = new AWS.DynamoDB(); + const params = { + AttributeDefinitions: [ + { + AttributeName: 'test_attr', + AttributeType: 'S', + }, + ], + TableName: 'test_table', + ProvisionedThroughput: { + ReadCapacityUnits: 10, + WriteCapacityUnits: 15, + }, + GlobalSecondaryIndexUpdates: [ + { + Update: { + IndexName: 'test_index', + ProvisionedThroughput: { + ReadCapacityUnits: 1, + WriteCapacityUnits: 5, + }, + }, + }, + ], + }; + + dynamodb.updateTable( + params, + ( + err: AWSError, + data: AWS.DynamoDB.DocumentClient.UpdateTableOutput + ) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + + expect( + attrs[ + SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES + ] + ).toStrictEqual([ + JSON.stringify({ + Update: { + IndexName: 'test_index', + ProvisionedThroughput: { + ReadCapacityUnits: 1, + WriteCapacityUnits: 5, + }, + }, + }), + ]); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS] + ).toStrictEqual([ + JSON.stringify({ + AttributeName: 'test_attr', + AttributeType: 'S', + }), + ]); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_PROVISIONED_READ_CAPACITY] + ).toStrictEqual(10); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY] + ).toStrictEqual(15); + expect( + JSON.parse(attrs[SemanticAttributes.DB_STATEMENT] as string) + ).toEqual(params); + expect(err).toBeFalsy(); + done(); + } + ); + }); + }); + + describe('ListTables', () => { + beforeEach(() => + mockV2AwsSend(responseMockSuccess, { + TableNames: ['test_table', 'test_table_2', 'start_table'], + } as AWS.DynamoDB.Types.ListTablesOutput) + ); + + it('should populate specific ListTables attributes', done => { + const dynamodb = new AWS.DynamoDB(); + const params = { + ExclusiveStartTableName: 'start_table', + Limit: 10, + }; + + dynamodb.listTables( + params, + (err: AWSError, data: AWS.DynamoDB.DocumentClient.ListTablesOutput) => { + const spans = getTestSpans(); + expect(spans.length).toStrictEqual(1); + const attrs = spans[0].attributes; + expect(attrs[SemanticAttributes.DB_SYSTEM]).toStrictEqual( + DbSystemValues.DYNAMODB + ); + + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_EXCLUSIVE_START_TABLE] + ).toStrictEqual('start_table'); + expect(attrs[SemanticAttributes.AWS_DYNAMODB_LIMIT]).toStrictEqual( + 10 + ); + expect( + attrs[SemanticAttributes.AWS_DYNAMODB_TABLE_COUNT] + ).toStrictEqual(3); + expect( JSON.parse(attrs[SemanticAttributes.DB_STATEMENT] as string) ).toEqual(params); From 8499b16b720db19b8982ad7745fc79b68c6555a3 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 28 Jun 2023 20:17:04 +0700 Subject: [PATCH 15/94] fix(connect): Skip update HTTP's span name and update RpcMetadata's route instead (#1534) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gerhard Stöbich --- .../src/instrumentation.ts | 9 ++---- .../test/instrumentation.test.ts | 32 +++++++++++++++++-- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts index 5e2d28584..a2fce4cd4 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts @@ -17,7 +17,7 @@ import { context, diag, Span, SpanOptions } from '@opentelemetry/api'; import { getRPCMetadata, RPCType } from '@opentelemetry/core'; import type { HandleFunction, NextFunction, Server } from 'connect'; -import type { IncomingMessage, ServerResponse } from 'http'; +import type { ServerResponse } from 'http'; import { AttributeNames, ConnectNames, @@ -120,16 +120,13 @@ export class ConnectInstrumentation extends InstrumentationBase { if (!instrumentation.isEnabled()) { return (middleWare as any).apply(this, arguments); } - const [reqArgIdx, resArgIdx, nextArgIdx] = isErrorMiddleware - ? [1, 2, 3] - : [0, 1, 2]; - const req = arguments[reqArgIdx] as IncomingMessage; + const [resArgIdx, nextArgIdx] = isErrorMiddleware ? [2, 3] : [1, 2]; const res = arguments[resArgIdx] as ServerResponse; const next = arguments[nextArgIdx] as NextFunction; const rpcMetadata = getRPCMetadata(context.active()); if (routeName && rpcMetadata?.type === RPCType.HTTP) { - rpcMetadata.span.updateName(`${req.method} ${routeName || '/'}`); + rpcMetadata.route = routeName; } let spanName = ''; if (routeName) { diff --git a/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts b/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts index c7ef32fb9..e871885e2 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts +++ b/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts @@ -16,7 +16,7 @@ import * as assert from 'assert'; import { context, trace } from '@opentelemetry/api'; -import { RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { RPCType, setRPCMetadata, RPCMetadata } from '@opentelemetry/core'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; @@ -186,7 +186,7 @@ describe('connect', () => { assert.strictEqual(span.name, 'request handler - /foo'); }); - it('should change name for parent http route', async () => { + it('should not change name for parent http route ', async () => { const rootSpan = tracer.startSpan('root span'); app.use((req, res, next) => { const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; @@ -206,11 +206,37 @@ describe('connect', () => { await httpRequest.get(`http://localhost:${PORT}/foo`); rootSpan.end(); + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 3); + const changedRootSpan = spans[2]; + assert.strictEqual(changedRootSpan.name, 'root span'); + }); + + it('should mutate route value of RpcMetadata', async () => { + const rootSpan = tracer.startSpan('root span'); + const rpcMetadata: RPCMetadata = { type: RPCType.HTTP, span: rootSpan }; + app.use((req, res, next) => { + return context.with( + setRPCMetadata( + trace.setSpan(context.active(), rootSpan), + rpcMetadata + ), + next + ); + }); + + app.use('/foo', (req, res, next) => { + next(); + }); + + await httpRequest.get(`http://localhost:${PORT}/foo`); + rootSpan.end(); + const spans = memoryExporter.getFinishedSpans(); assert.strictEqual(spans.length, 3); const changedRootSpan = spans[2]; const span = spans[0]; - assert.strictEqual(changedRootSpan.name, 'GET /foo'); + assert.strictEqual(rpcMetadata.route, '/foo'); assert.strictEqual(span.name, 'request handler - /foo'); assert.strictEqual( span.parentSpanId, From 7c7294ce0591a3c8d4c12b5f135f4fcd24b79762 Mon Sep 17 00:00:00 2001 From: Purvi Kanal Date: Wed, 28 Jun 2023 11:04:01 -0400 Subject: [PATCH 16/94] feat(opentelemetry-instrumentation-document-load): Add access to performance resource timing object for custom attributes (#1529) * feat(opentelemetry-instrumentation-document-load): Add access to performance resource timing object for custom attributes * update docs * fix lint * Apply suggestions from code review Co-authored-by: Marc Pichler --------- Co-authored-by: Marc Pichler --- .../README.md | 9 ++++-- .../src/instrumentation.ts | 29 ++++++++++++++++++- .../src/types.ts | 6 +++- .../test/documentLoad.test.ts | 14 ++++++++- 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/plugins/web/opentelemetry-instrumentation-document-load/README.md b/plugins/web/opentelemetry-instrumentation-document-load/README.md index ec6595c57..e0ec16ecd 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/README.md +++ b/plugins/web/opentelemetry-instrumentation-document-load/README.md @@ -82,7 +82,7 @@ Because the browser does not send a trace context header for the initial page na ``` -## Optional : Add custom attributes to document load span if needed +## Optional : Add custom attributes to spans if needed If it is needed to add custom attributes to the document load span,and/or document fetch span and/or resource fetch spans, respective functions to do so needs to be provided as a config to the DocumentLoad Instrumentation as shown below. The attributes will be added to the respective spans @@ -93,11 +93,16 @@ the rest of the process continues. const addCustomAttributesToSpan = (span: Span) => { span.setAttribute('',''); } +const addCustomAttributesToResourceFetchSpan = (span: Span, resource: PerformanceResourceTiming) => { + span.setAttribute('',''); + span.setAttribute('resource.tcp.duration_ms', resource.connectEnd - resource.connectStart); +} registerInstrumentations({ instrumentations: [ new DocumentLoadInstrumentation({ applyCustomAttributesOnSpan: { - documentLoad: addCustomAttributesToSpan + documentLoad: addCustomAttributesToSpan, + resourceFetch: addCustomAttributesToResourceFetchSpan } }) ] diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts b/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts index a13f3845b..78ab9162d 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts @@ -36,6 +36,7 @@ import { import { DocumentLoadCustomAttributeFunction, DocumentLoadInstrumentationConfig, + ResourceFetchCustomAttributeFunction, } from './types'; import { AttributeNames } from './enums/AttributeNames'; import { VERSION } from './version'; @@ -197,8 +198,9 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { if (span) { span.setAttribute(SemanticAttributes.HTTP_URL, resource.name); addSpanNetworkEvents(span, resource); - this._addCustomAttributesOnSpan( + this._addCustomAttributesOnResourceSpan( span, + resource, this._getConfig().applyCustomAttributesOnSpan?.resourceFetch ); this._endSpan(span, PTN.RESPONSE_END, resource); @@ -271,6 +273,31 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { } } + /** + * adds custom attributes to span if configured + */ + private _addCustomAttributesOnResourceSpan( + span: Span, + resource: PerformanceResourceTiming, + applyCustomAttributesOnSpan: + | ResourceFetchCustomAttributeFunction + | undefined + ) { + if (applyCustomAttributesOnSpan) { + safeExecuteInTheMiddle( + () => applyCustomAttributesOnSpan(span, resource), + error => { + if (!error) { + return; + } + + this._diag.error('addCustomAttributesOnResourceSpan', error); + }, + true + ); + } + } + /** * implements enable function */ diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts b/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts index 0d96d5339..a3188c470 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts @@ -20,6 +20,10 @@ export interface DocumentLoadCustomAttributeFunction { (span: Span): void; } +export interface ResourceFetchCustomAttributeFunction { + (span: Span, resource: PerformanceResourceTiming): void; +} + /** * DocumentLoadInstrumentationPlugin Config */ @@ -29,6 +33,6 @@ export interface DocumentLoadInstrumentationConfig applyCustomAttributesOnSpan?: { documentLoad?: DocumentLoadCustomAttributeFunction; documentFetch?: DocumentLoadCustomAttributeFunction; - resourceFetch?: DocumentLoadCustomAttributeFunction; + resourceFetch?: ResourceFetchCustomAttributeFunction; }; } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts b/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts index 2545ce3b0..3ba404c07 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts @@ -706,8 +706,12 @@ describe('DocumentLoad Instrumentation', () => { plugin = new DocumentLoadInstrumentation({ enabled: false, applyCustomAttributesOnSpan: { - resourceFetch: span => { + resourceFetch: (span, resource) => { span.setAttribute('custom-key', 'custom-val'); + span.setAttribute( + 'resource.tcp.duration_ms', + resource.connectEnd - resource.connectStart + ); }, }, }); @@ -723,6 +727,14 @@ describe('DocumentLoad Instrumentation', () => { resourceSpan2.attributes['custom-key'], 'custom-val' ); + assert.strictEqual( + resourceSpan1.attributes['resource.tcp.duration_ms'], + 0 + ); + assert.strictEqual( + resourceSpan2.attributes['resource.tcp.duration_ms'], + 0 + ); assert.strictEqual(exporter.getFinishedSpans().length, 4); done(); }); From 8777cbd3178bb970686488c7e8383d5fa0aaa187 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 28 Jun 2023 16:57:58 -0400 Subject: [PATCH 17/94] feat(lambda): add OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION environment variable (#1227) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(lambda): add OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION environment option * Lint * feat: copy object to prevent modification * test: add coverage * chore: lint * Fix build --------- Co-authored-by: Gerhard Stöbich --- .../README.md | 2 +- .../src/instrumentation.ts | 12 +++ .../test/integrations/lambda-handler.test.ts | 86 +++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md index 22a609592..d4e090b46 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md @@ -50,7 +50,7 @@ In your Lambda function configuration, add or update the `NODE_OPTIONS` environm | --- | --- | --- | | `requestHook` | `RequestHook` (function) | Hook for adding custom attributes before lambda starts handling the request. Receives params: `span, { event, context }` | | `responseHook` | `ResponseHook` (function) | Hook for adding custom attributes before lambda returns the response. Receives params: `span, { err?, res? }` | -| `disableAwsContextPropagation` | `boolean` | By default, this instrumentation will try to read the context from the `_X_AMZN_TRACE_ID` environment variable set by Lambda, set this to `true` to disable this behavior | +| `disableAwsContextPropagation` | `boolean` | By default, this instrumentation will try to read the context from the `_X_AMZN_TRACE_ID` environment variable set by Lambda, set this to `true` or set the environment variable `OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION=true` to disable this behavior | | `eventContextExtractor` | `EventContextExtractor` (function) | Function for providing custom context extractor in order to support different event types that are handled by AWS Lambda (e.g., SQS, CloudWatch, Kinesis, API Gateway). Applied only when `disableAwsContextPropagation` is set to `true`. Receives params: `event, context` | ### Hooks Usage Example diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts index 20d4717a0..75adb7e33 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts @@ -57,6 +57,7 @@ import { import { AwsLambdaInstrumentationConfig, EventContextExtractor } from './types'; import { VERSION } from './version'; +import { env } from 'process'; import { LambdaModule } from './internal-types'; const awsPropagator = new AWSXRayPropagator(); @@ -77,6 +78,17 @@ export class AwsLambdaInstrumentation extends InstrumentationBase { constructor(protected override _config: AwsLambdaInstrumentationConfig = {}) { super('@opentelemetry/instrumentation-aws-lambda', VERSION, _config); + if (this._config.disableAwsContextPropagation == null) { + if ( + typeof env['OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'] === + 'string' && + env[ + 'OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION' + ].toLocaleLowerCase() === 'true' + ) { + this._config.disableAwsContextPropagation = true; + } + } } override setConfig(config: AwsLambdaInstrumentationConfig = {}) { diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts index 681922fbe..573cab814 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts @@ -544,6 +544,92 @@ describe('lambda handler', () => { assert.strictEqual(spans.length, 0); }); + it('ignores sampled lambda context if env OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION is set to "true"', async () => { + process.env['OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'] = 'true'; + process.env[traceContextEnvironmentKey] = sampledAwsHeader; + initializeHandler('lambda-test/async.handler', {}); + + const result = await lambdaRequire('lambda-test/async').handler( + 'arg', + ctx + ); + assert.strictEqual(result, 'ok'); + const spans = memoryExporter.getFinishedSpans(); + const [span] = spans; + assert.strictEqual(spans.length, 1); + assertSpanSuccess(span); + assert.notDeepStrictEqual( + span.spanContext().traceId, + sampledAwsSpanContext.traceId + ); + assert.strictEqual(span.parentSpanId, undefined); + }); + + it('ignores sampled lambda context if env OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION is set to "TRUE"', async () => { + process.env['OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'] = 'TRUE'; + process.env[traceContextEnvironmentKey] = sampledAwsHeader; + initializeHandler('lambda-test/async.handler', {}); + + const result = await lambdaRequire('lambda-test/async').handler( + 'arg', + ctx + ); + assert.strictEqual(result, 'ok'); + const spans = memoryExporter.getFinishedSpans(); + const [span] = spans; + assert.strictEqual(spans.length, 1); + assertSpanSuccess(span); + assert.notDeepStrictEqual( + span.spanContext().traceId, + sampledAwsSpanContext.traceId + ); + assert.strictEqual(span.parentSpanId, undefined); + }); + + it('ignores sampled lambda context if env OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION is set to "True"', async () => { + process.env['OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'] = 'True'; + process.env[traceContextEnvironmentKey] = sampledAwsHeader; + initializeHandler('lambda-test/async.handler', {}); + + const result = await lambdaRequire('lambda-test/async').handler( + 'arg', + ctx + ); + assert.strictEqual(result, 'ok'); + const spans = memoryExporter.getFinishedSpans(); + const [span] = spans; + assert.strictEqual(spans.length, 1); + assertSpanSuccess(span); + assert.notDeepStrictEqual( + span.spanContext().traceId, + sampledAwsSpanContext.traceId + ); + assert.strictEqual(span.parentSpanId, undefined); + }); + + it('ignores OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION if `config.disableAwsContextPropagation` is set', async () => { + process.env['OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION'] = 'true'; + process.env[traceContextEnvironmentKey] = sampledAwsHeader; + initializeHandler('lambda-test/async.handler', { + disableAwsContextPropagation: false, + }); + + const result = await lambdaRequire('lambda-test/async').handler( + 'arg', + ctx + ); + assert.strictEqual(result, 'ok'); + const spans = memoryExporter.getFinishedSpans(); + const [span] = spans; + assert.strictEqual(spans.length, 1); + assertSpanSuccess(span); + assert.strictEqual( + span.spanContext().traceId, + sampledAwsSpanContext.traceId + ); + assert.strictEqual(span.parentSpanId, sampledAwsSpanContext.spanId); + }); + it('ignores sampled lambda context if "disableAwsContextPropagation" config option is true', async () => { process.env[traceContextEnvironmentKey] = sampledAwsHeader; initializeHandler('lambda-test/async.handler', { From e2e291c5837a10fa6e15b6274a3022680a4cdfd7 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Thu, 29 Jun 2023 02:31:08 -0400 Subject: [PATCH 18/94] fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms (#3934) Co-authored-by: Marc Pichler --- CHANGELOG.md | 1 + .../src/aggregator/ExponentialHistogram.ts | 33 +++---- .../aggregator/ExponentialHistogram.test.ts | 9 ++ .../cumulative-exponential-histogram.test.ts | 90 +++++++++++++++++++ 4 files changed, 117 insertions(+), 16 deletions(-) create mode 100644 packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 819fab897..a162eae0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) * fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001 +* fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass ### :books: (Refine Doc) diff --git a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts index 5a70a478a..51c71ee21 100644 --- a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts +++ b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts @@ -213,32 +213,33 @@ export class ExponentialHistogramAccumulation implements Accumulation { } /** - * merge combines data from other into self - * @param {ExponentialHistogramAccumulation} other + * merge combines data from previous value into self + * @param {ExponentialHistogramAccumulation} previous */ - merge(other: ExponentialHistogramAccumulation) { + merge(previous: ExponentialHistogramAccumulation) { if (this._count === 0) { - this._min = other.min; - this._max = other.max; - } else if (other.count !== 0) { - if (other.min < this.min) { - this._min = other.min; + this._min = previous.min; + this._max = previous.max; + } else if (previous.count !== 0) { + if (previous.min < this.min) { + this._min = previous.min; } - if (other.max > this.max) { - this._max = other.max; + if (previous.max > this.max) { + this._max = previous.max; } } - this._sum += other.sum; - this._count += other.count; - this._zeroCount += other.zeroCount; + this.startTime = previous.startTime; + this._sum += previous.sum; + this._count += previous.count; + this._zeroCount += previous.zeroCount; - const minScale = this._minScale(other); + const minScale = this._minScale(previous); this._downscale(this.scale - minScale); - this._mergeBuckets(this.positive, other, other.positive, minScale); - this._mergeBuckets(this.negative, other, other.negative, minScale); + this._mergeBuckets(this.positive, previous, previous.positive, minScale); + this._mergeBuckets(this.negative, previous, previous.negative, minScale); } /** diff --git a/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts b/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts index 150eb13e9..2bcbc4330 100644 --- a/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts +++ b/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts @@ -574,6 +574,15 @@ describe('ExponentialHistogramAggregation', () => { assert.deepStrictEqual(acc0.toPointValue(), acc0Snapshot); assert.deepStrictEqual(acc1.toPointValue(), acc1Snapshot); }); + + it("keeps the previous point's startTime", () => { + const agg = new ExponentialHistogramAggregator(4, true); + const acc0 = agg.createAccumulation([0, 0]); + const acc1 = agg.createAccumulation([3, 0]); + + const result = agg.merge(acc0, acc1); + assert.strictEqual(result.startTime, acc0.startTime); + }); }); describe('diff', () => { diff --git a/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts b/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts new file mode 100644 index 000000000..79dcfc434 --- /dev/null +++ b/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts @@ -0,0 +1,90 @@ +/* + * 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 * as assert from 'assert'; +import * as sinon from 'sinon'; +import { + Aggregation, + AggregationTemporality, + InstrumentType, + MeterProvider, + MetricReader, +} from '../../src'; +import { TestMetricReader } from '../export/TestMetricReader'; + +describe('cumulative-exponential-histogram', () => { + let clock: sinon.SinonFakeTimers; + + beforeEach(() => { + clock = sinon.useFakeTimers(); + }); + afterEach(() => { + sinon.restore(); + }); + + it('Cumulative Histogram should have the same startTime every collection', async () => { + // Works fine and passes + await doTest(Aggregation.Histogram()); + }); + + it('Cumulative ExponentialHistogram should have the same startTime every collection', async () => { + // Fails + await doTest(Aggregation.ExponentialHistogram()); + }); + + const doTest = async (histogramAggregation: Aggregation) => { + const meterProvider = new MeterProvider(); + const reader = new TestMetricReader({ + aggregationTemporalitySelector() { + return AggregationTemporality.CUMULATIVE; + }, + aggregationSelector(type) { + return type === InstrumentType.HISTOGRAM + ? histogramAggregation + : Aggregation.Default(); + }, + }); + + meterProvider.addMetricReader(reader); + const meter = meterProvider.getMeter('my-meter'); + const hist = meter.createHistogram('testhist'); + + hist.record(1); + + const resourceMetrics1 = await collectNoErrors(reader); + const dataPoint1 = + resourceMetrics1.scopeMetrics[0].metrics[0].dataPoints[0]; + + clock.tick(1000); + hist.record(2); + + const resourceMetrics2 = await collectNoErrors(reader); + const dataPoint2 = + resourceMetrics2.scopeMetrics[0].metrics[0].dataPoints[0]; + + assert.deepStrictEqual( + dataPoint1.startTime, + dataPoint2.startTime, + 'The start time should be the same across cumulative collections' + ); + }; + + const collectNoErrors = async (reader: MetricReader) => { + const { resourceMetrics, errors } = await reader.collect(); + assert.strictEqual(errors.length, 0); + return resourceMetrics; + }; +}); From b3d57bb295c853fac2a0659dafd5594406e35712 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 29 Jun 2023 08:49:38 +0200 Subject: [PATCH 19/94] chore(deps): update lerna monorepo to v7.1.1 (#3956) --- api/package.json | 2 +- experimental/packages/api-events/package.json | 2 +- experimental/packages/api-logs/package.json | 2 +- experimental/packages/exporter-logs-otlp-grpc/package.json | 2 +- experimental/packages/exporter-logs-otlp-http/package.json | 2 +- experimental/packages/exporter-logs-otlp-proto/package.json | 2 +- experimental/packages/exporter-trace-otlp-grpc/package.json | 2 +- experimental/packages/exporter-trace-otlp-http/package.json | 2 +- experimental/packages/exporter-trace-otlp-proto/package.json | 2 +- .../packages/opentelemetry-browser-detector/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-grpc/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-http/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-proto/package.json | 2 +- .../packages/opentelemetry-exporter-prometheus/package.json | 2 +- .../packages/opentelemetry-instrumentation-fetch/package.json | 2 +- .../packages/opentelemetry-instrumentation-grpc/package.json | 2 +- .../packages/opentelemetry-instrumentation-http/package.json | 2 +- .../package.json | 2 +- .../packages/opentelemetry-instrumentation/package.json | 2 +- experimental/packages/opentelemetry-sdk-node/package.json | 2 +- experimental/packages/otlp-exporter-base/package.json | 2 +- experimental/packages/otlp-grpc-exporter-base/package.json | 2 +- experimental/packages/otlp-proto-exporter-base/package.json | 2 +- experimental/packages/otlp-transformer/package.json | 2 +- experimental/packages/sdk-logs/package.json | 2 +- experimental/packages/shim-opencensus/package.json | 2 +- package.json | 4 ++-- packages/opentelemetry-context-async-hooks/package.json | 2 +- packages/opentelemetry-context-zone-peer-dep/package.json | 2 +- packages/opentelemetry-context-zone/package.json | 2 +- packages/opentelemetry-core/package.json | 2 +- packages/opentelemetry-exporter-jaeger/package.json | 2 +- packages/opentelemetry-exporter-zipkin/package.json | 2 +- packages/opentelemetry-propagator-b3/package.json | 2 +- packages/opentelemetry-propagator-jaeger/package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- packages/opentelemetry-sdk-trace-base/package.json | 2 +- packages/opentelemetry-sdk-trace-node/package.json | 2 +- packages/opentelemetry-sdk-trace-web/package.json | 2 +- packages/opentelemetry-semantic-conventions/package.json | 2 +- packages/opentelemetry-shim-opentracing/package.json | 2 +- packages/sdk-metrics/package.json | 2 +- packages/template/package.json | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) diff --git a/api/package.json b/api/package.json index 119fcece0..888e602e5 100644 --- a/api/package.json +++ b/api/package.json @@ -76,7 +76,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "memfs": "3.5.3", "mocha": "10.2.0", "nyc": "15.1.0", diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index bf4ecca09..ec768c618 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -77,7 +77,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 2b0e37305..7be2db96e 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -77,7 +77,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 77e2285f7..43dc22d22 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -60,7 +60,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 41b72085b..a1ff95725 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -89,7 +89,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 87c6c6f0e..204414966 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -71,7 +71,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 2ff7f9172..fce71adbd 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -57,7 +57,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 767df8623..9e55231aa 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -80,7 +80,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index b5a87081d..5f0deff40 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -70,7 +70,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 233187c2c..788fb3dd9 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -60,7 +60,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 4697eacdb..cebe38c3c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -56,7 +56,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 5256a337b..e26bbcd17 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -80,7 +80,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 08a8fb053..f10cf504c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -55,7 +55,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index 6a501c55d..8ae497886 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -50,7 +50,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 01cc35fe4..c8f1bfcb3 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -73,7 +73,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 85e49c1c2..2dc97dddd 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -58,7 +58,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "node-pre-gyp": "0.17.0", "nyc": "15.1.0", diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 91d0b99a4..c39d34ace 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -59,7 +59,7 @@ "axios": "1.4.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 82f28f158..4eb469da0 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -73,7 +73,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 9d0819703..dd8ac1eb8 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -101,7 +101,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index d62cc04d5..5db8e3ced 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -71,7 +71,7 @@ "codecov": "3.8.3", "cross-var": "1.1.0", "istanbul-instrumenter-loader": "3.0.1", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "semver": "7.5.3", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 8e3705b2c..de1a70199 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -72,7 +72,7 @@ "codecov": "3.8.3", "cross-var": "1.1.0", "istanbul-instrumenter-loader": "3.0.1", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 7955aac4f..4956fbee1 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -59,7 +59,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "protobufjs-cli": "1.1.1", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 7430c153c..0587dc9de 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -66,7 +66,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "protobufjs-cli": "1.1.1", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index ad12b3e16..4e2a83138 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -69,7 +69,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 70abad035..be245fbe1 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -85,7 +85,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 6f870cfc6..636efed87 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -57,7 +57,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/package.json b/package.json index b2b015c26..c0b6c172e 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "4.2.1", "gh-pages": "5.0.0", - "lerna": "7.0.2", - "@lerna/legacy-package-management": "7.0.2", + "lerna": "7.1.1", + "@lerna/legacy-package-management": "7.1.1", "linkinator": "5.0.1", "markdownlint-cli": "0.35.0", "prettier": "2.8.8", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 62a77cf7e..64366b205 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -52,7 +52,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index fa4b54742..9904e9da8 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -70,7 +70,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 43c775f41..84a937ce9 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -63,7 +63,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 3bd4796e7..23e11a9e5 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -78,7 +78,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index a45636c9a..3b4164d3f 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -51,7 +51,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index cf3b1ddff..bbe473b65 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -76,7 +76,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 97303e507..89dcef29b 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -64,7 +64,7 @@ "codecov": "3.8.3", "cross-var": "1.1.0", "istanbul-instrumenter-loader": "3.0.1", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index d15ebcfea..de2e90601 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -68,7 +68,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 340875b9f..17de24f22 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -76,7 +76,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 10ffe262e..6cceaa64d 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -80,7 +80,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 51e5d59e5..bd4fb782f 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -54,7 +54,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 84555c91b..b3bfc1558 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -77,7 +77,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index d1f733190..c7585e68f 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -54,7 +54,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index f4745b1f7..9b05c66d6 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -50,7 +50,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 3ec2a1fe4..2e327b6ac 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -67,7 +67,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.0.2", + "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/template/package.json b/packages/template/package.json index 5f0dd1cb5..00876cf2c 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -80,7 +80,7 @@ "devDependencies": { "@types/node": "18.6.5", "cross-var": "1.1.0", - "lerna": "7.0.2", + "lerna": "7.1.1", "typescript": "4.4.4" }, "dependencies": { From bb8a4f7ab71494a59b42daf6958a6f10d1ce6870 Mon Sep 17 00:00:00 2001 From: Andreas Odysseos Date: Thu, 29 Jun 2023 15:59:09 +0300 Subject: [PATCH 20/94] fix(http-intrumentation): prevent request socket null from throwing uncaught error (#3858) Co-authored-by: Marc Pichler --- experimental/CHANGELOG.md | 1 + .../src/utils.ts | 34 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index dca209e1a..af2ea3a26 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -18,6 +18,7 @@ All notable changes to experimental packages in this project will be documented * fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412 fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc * fix(example-opencensus-shim): avoid OpenCensus auto instrumentations [#3951](https://github.com/open-telemetry/opentelemetry-js/pull/3951) @llc1123 +* fix(http-intrumentation): prevent request socket null from throwing uncaught error [#3858](https://github.com/open-telemetry/opentelemetry-js/pull/3858) @aodysseos ### :books: (Refine Doc) diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts index a563e2947..a70dd3de8 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts @@ -403,11 +403,12 @@ export const getOutgoingRequestAttributesOnResponse = ( response: IncomingMessage ): SpanAttributes => { const { statusCode, statusMessage, httpVersion, socket } = response; - const { remoteAddress, remotePort } = socket; - const attributes: SpanAttributes = { - [SemanticAttributes.NET_PEER_IP]: remoteAddress, - [SemanticAttributes.NET_PEER_PORT]: remotePort, - }; + const attributes: SpanAttributes = {}; + if (socket) { + const { remoteAddress, remotePort } = socket; + attributes[SemanticAttributes.NET_PEER_IP] = remoteAddress; + attributes[SemanticAttributes.NET_PEER_PORT] = remotePort; + } setResponseContentLengthAttribute(response, attributes); if (statusCode) { @@ -529,17 +530,20 @@ export const getIncomingRequestAttributesOnResponse = ( // since it may be detached from the response object in keep-alive mode const { socket } = request; const { statusCode, statusMessage } = response; - const { localAddress, localPort, remoteAddress, remotePort } = socket; - const rpcMetadata = getRPCMetadata(context.active()); - const attributes: SpanAttributes = { - [SemanticAttributes.NET_HOST_IP]: localAddress, - [SemanticAttributes.NET_HOST_PORT]: localPort, - [SemanticAttributes.NET_PEER_IP]: remoteAddress, - [SemanticAttributes.NET_PEER_PORT]: remotePort, - [SemanticAttributes.HTTP_STATUS_CODE]: statusCode, - [AttributeNames.HTTP_STATUS_TEXT]: (statusMessage || '').toUpperCase(), - }; + const rpcMetadata = getRPCMetadata(context.active()); + const attributes: SpanAttributes = {}; + if (socket) { + const { localAddress, localPort, remoteAddress, remotePort } = socket; + attributes[SemanticAttributes.NET_HOST_IP] = localAddress; + attributes[SemanticAttributes.NET_HOST_PORT] = localPort; + attributes[SemanticAttributes.NET_PEER_IP] = remoteAddress; + attributes[SemanticAttributes.NET_PEER_PORT] = remotePort; + } + attributes[SemanticAttributes.HTTP_STATUS_CODE] = statusCode; + attributes[AttributeNames.HTTP_STATUS_TEXT] = ( + statusMessage || '' + ).toUpperCase(); if (rpcMetadata?.type === RPCType.HTTP && rpcMetadata.route !== undefined) { attributes[SemanticAttributes.HTTP_ROUTE] = rpcMetadata.route; From 070b6852a546104f73499973a09475afcded9b97 Mon Sep 17 00:00:00 2001 From: Martin Kuba Date: Fri, 30 Jun 2023 11:13:03 -0700 Subject: [PATCH 21/94] LowMemory metrics temporality preference (#3915) Co-authored-by: Marc Pichler --- CHANGELOG.md | 5 + .../README.md | 2 +- .../test/OTLPMetricExporter.test.ts | 16 +-- .../README.md | 2 +- .../src/OTLPMetricExporterBase.ts | 35 ++++- .../src/OTLPMetricExporterOptions.ts | 12 +- .../browser/CollectorMetricExporter.test.ts | 20 +-- .../test/node/CollectorMetricExporter.test.ts | 134 +++++++++++++++++- .../README.md | 2 +- .../test/OTLPMetricExporter.test.ts | 10 +- 10 files changed, 202 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a162eae0a..865601c10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) +* feat(exporter-metrics-otlp-*)!: add LowMemory metrics temporality preference [#3915](https://github.com/open-telemetry/opentelemetry-js/pull/3915) + * Breaking: From now on `AggregationTemporalityPreference` has to be used instead of `AggregationTemporality` when configuring the exporter. + * Adds support for [LowMemory temporality preference](https://github.com/open-telemetry/opentelemetry-specification/blob/f09624bb97e9be3be259733b93be507df18927bd/specification/metrics/sdk_exporters/otlp.md#additional-configuration) + * Adds support for `lowmemory` in `OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE` + ### :bug: (Bug Fix) * fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001 diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md index 5445862af..05f6b4803 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md @@ -71,7 +71,7 @@ In addition to settings passed to the constructor, the exporter also supports co | OTEL_EXPORTER_OTLP_CLIENT_KEY | The path to the file containing private client key to use when verifying an OTLP trace, metric or log client's TLS credentials. Must provide a client certificate/chain when providing a private client key. By default no client key file is used. | | OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE | The path to the file containing trusted client certificate/chain for clients private key to use when verifying an OTLP metric server's TLS credentials. Must provide a private client key when providing a certificate/chain. By default no chain file is used. | | OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE | The path to the file containing trusted client certificate/chain for clients private key to use when verifying an OTLP trace, metric and log server's TLS credentials. Must provide a private client key when providing a certificate/chain. By default no chain file is used. | -| OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE | The exporters aggregation temporality preference. Valid values are `cumulative`, and `delta`. `cumulative` selects cumulative temporality for all instrument kinds. `delta` selects delta aggregation temporality for Counter, Asynchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter and Asynchronous UpDownCounter instrument kinds. By default `cumulative` is used. | +| OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE | The exporters aggregation temporality preference. Valid values are `cumulative`, `delta`, and `lowmemory`. `cumulative` selects cumulative temporality for all instrument kinds. `delta` selects delta aggregation temporality for Counter, Asynchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter and Asynchronous UpDownCounter instrument kinds. `lowmemory` select delta aggregation temporality for Synchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for Synchronous UpDownCounter, Asynchronous Counter and Asynchronous UpDownCounter instrument kinds. By default `cumulative` is used. | > Settings configured programmatically take precedence over environment variables. Per-signal environment variables take precedence over non-per-signal environment variables. diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts index 6749c6010..a85d2f342 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/OTLPMetricExporter.test.ts @@ -35,15 +35,13 @@ import { setUp, shutdown, } from './metricsHelper'; -import { - AggregationTemporality, - ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; +import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { IExportMetricsServiceRequest, IResourceMetrics, } from '@opentelemetry/otlp-transformer'; import { VERSION } from '../src/version'; +import { AggregationTemporalityPreference } from '@opentelemetry/exporter-metrics-otlp-http'; const metricsServiceProtoPath = 'opentelemetry/proto/collector/metrics/v1/metrics_service.proto'; @@ -144,7 +142,7 @@ const testOTLPMetricExporter = (params: TestParams) => { url: address, credentials, metadata: metadata, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); setUp(); @@ -199,7 +197,7 @@ const testOTLPMetricExporter = (params: TestParams) => { headers: { foo: 'bar', }, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); const args = warnStub.args[0]; assert.strictEqual(args[0], 'Headers cannot be set when using grpc'); @@ -211,7 +209,7 @@ const testOTLPMetricExporter = (params: TestParams) => { } collectorExporter = new OTLPMetricExporter({ url: `${address}/v1/metrics`, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); const args = warnStub.args[0]; assert.strictEqual( @@ -294,7 +292,7 @@ describe('OTLPMetricExporter - node (getDefaultUrl)', () => { const url = 'http://foo.bar.com'; const collectorExporter = new OTLPMetricExporter({ url, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); setTimeout(() => { assert.strictEqual(collectorExporter._otlpExporter.url, 'foo.bar.com'); @@ -343,7 +341,7 @@ describe('when configuring via environment', () => { envSource.OTEL_EXPORTER_OTLP_METRICS_HEADERS = 'foo=boo'; const collectorExporter = new OTLPMetricExporter({ metadata, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); assert.deepStrictEqual( collectorExporter._otlpExporter.metadata?.get('foo'), diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md index 0645aa121..b475d0283 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md @@ -81,7 +81,7 @@ In addition to settings passed to the constructor, the exporter also supports co |---------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | OTEL_EXPORTER_OTLP_ENDPOINT | The endpoint to send metrics to. This will also be used for the traces exporter if `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT` is not configured. By default `http://localhost:4318` will be used. `/v1/metrics` will be automatically appended to configured values. | | OTEL_EXPORTER_OTLP_METRICS_ENDPOINT | The endpoint to send metrics to. By default `https://localhost:4318/v1/metrics` will be used. `v1/metrics` will not be appended automatically and has to be added explicitly. | -| OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE | The exporters aggregation temporality preference. Valid values are `cumulative`, and `delta`. `cumulative` selects cumulative temporality for all instrument kinds. `delta` selects delta aggregation temporality for Counter, Asynchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter and Asynchronous UpDownCounter instrument kinds. By default `cumulative` is used. | +| OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE | The exporters aggregation temporality preference. Valid values are `cumulative`, `delta`, and `lowmemory`. `cumulative` selects cumulative temporality for all instrument kinds. `delta` selects delta aggregation temporality for Counter, Asynchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter and Asynchronous UpDownCounter instrument kinds. `lowmemory` selects delta aggregation temporality for Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter, Asynchronous Counter and Asynchronous UpDownCounter instrument kinds. By default `cumulative` is used. | > Settings configured programmatically take precedence over environment variables. Per-signal environment variables take > precedence over non-per-signal environment variables. diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts index bbebe6cd1..21177777f 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts @@ -22,7 +22,10 @@ import { PushMetricExporter, ResourceMetrics, } from '@opentelemetry/sdk-metrics'; -import { OTLPMetricExporterOptions } from './OTLPMetricExporterOptions'; +import { + AggregationTemporalityPreference, + OTLPMetricExporterOptions, +} from './OTLPMetricExporterOptions'; import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; import { diag } from '@opentelemetry/api'; @@ -45,6 +48,21 @@ export const DeltaTemporalitySelector: AggregationTemporalitySelector = ( } }; +export const LowMemoryTemporalitySelector: AggregationTemporalitySelector = ( + instrumentType: InstrumentType +) => { + switch (instrumentType) { + case InstrumentType.COUNTER: + case InstrumentType.HISTOGRAM: + return AggregationTemporality.DELTA; + case InstrumentType.UP_DOWN_COUNTER: + case InstrumentType.OBSERVABLE_UP_DOWN_COUNTER: + case InstrumentType.OBSERVABLE_COUNTER: + case InstrumentType.OBSERVABLE_GAUGE: + return AggregationTemporality.CUMULATIVE; + } +}; + function chooseTemporalitySelectorFromEnvironment() { const env = getEnv(); const configuredTemporality = @@ -56,6 +74,9 @@ function chooseTemporalitySelectorFromEnvironment() { if (configuredTemporality === 'delta') { return DeltaTemporalitySelector; } + if (configuredTemporality === 'lowmemory') { + return LowMemoryTemporalitySelector; + } diag.warn( `OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE is set to '${env.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE}', but only 'cumulative' and 'delta' are allowed. Using default ('cumulative') instead.` @@ -64,12 +85,18 @@ function chooseTemporalitySelectorFromEnvironment() { } function chooseTemporalitySelector( - temporalityPreference?: AggregationTemporality + temporalityPreference?: + | AggregationTemporalityPreference + | AggregationTemporality ): AggregationTemporalitySelector { // Directly passed preference has priority. if (temporalityPreference != null) { - if (temporalityPreference === AggregationTemporality.DELTA) { + if (temporalityPreference === AggregationTemporalityPreference.DELTA) { return DeltaTemporalitySelector; + } else if ( + temporalityPreference === AggregationTemporalityPreference.LOWMEMORY + ) { + return LowMemoryTemporalitySelector; } return CumulativeTemporalitySelector; } @@ -86,7 +113,7 @@ export class OTLPMetricExporterBase< > implements PushMetricExporter { public _otlpExporter: T; - protected _aggregationTemporalitySelector: AggregationTemporalitySelector; + private _aggregationTemporalitySelector: AggregationTemporalitySelector; constructor(exporter: T, config?: OTLPMetricExporterOptions) { this._otlpExporter = exporter; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts index 32529efee..e03bde4e7 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts @@ -14,9 +14,17 @@ * limitations under the License. */ -import { AggregationTemporality } from '@opentelemetry/sdk-metrics'; import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; +import { AggregationTemporality } from '@opentelemetry/sdk-metrics'; export interface OTLPMetricExporterOptions extends OTLPExporterConfigBase { - temporalityPreference?: AggregationTemporality; + temporalityPreference?: + | AggregationTemporalityPreference + | AggregationTemporality; +} + +export enum AggregationTemporalityPreference { + DELTA, + CUMULATIVE, + LOWMEMORY, } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts index 7dbc7cc88..053376b03 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts @@ -22,10 +22,7 @@ import { Histogram, } from '@opentelemetry/api'; import { ExportResultCode, hrTimeToNanoseconds } from '@opentelemetry/core'; -import { - AggregationTemporality, - ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; +import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { OTLPMetricExporter } from '../../src/platform/browser'; @@ -44,7 +41,10 @@ import { setUp, shutdown, } from '../metricsHelper'; -import { OTLPMetricExporterOptions } from '../../src'; +import { + AggregationTemporalityPreference, + OTLPMetricExporterOptions, +} from '../../src'; import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; @@ -102,7 +102,7 @@ describe('OTLPMetricExporter - web', () => { beforeEach(() => { collectorExporter = new OTLPMetricExporter({ url: 'http://foo.bar.com', - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); }); @@ -230,7 +230,7 @@ describe('OTLPMetricExporter - web', () => { (window.navigator as any).sendBeacon = false; collectorExporter = new OTLPMetricExporter({ url: 'http://foo.bar.com', - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); // Overwrites the start time to make tests consistent Object.defineProperty(collectorExporter, '_startTime', { @@ -386,7 +386,7 @@ describe('OTLPMetricExporter - web', () => { beforeEach(() => { collectorExporterConfig = { headers: customHeaders, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }; server = sinon.fakeServer.create(); }); @@ -518,7 +518,7 @@ describe('when configuring via environment', () => { envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar'; const collectorExporter = new OTLPMetricExporter({ headers: {}, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); assert.strictEqual( collectorExporter['_otlpExporter']['_headers'].foo, @@ -531,7 +531,7 @@ describe('when configuring via environment', () => { envSource.OTEL_EXPORTER_OTLP_METRICS_HEADERS = 'foo=boo'; const collectorExporter = new OTLPMetricExporter({ headers: {}, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); assert.strictEqual( collectorExporter['_otlpExporter']['_headers'].foo, diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts index 042e5ebb4..0844e5a9f 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts @@ -20,8 +20,10 @@ import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; import { + AggregationTemporalityPreference, CumulativeTemporalitySelector, DeltaTemporalitySelector, + LowMemoryTemporalitySelector, OTLPMetricExporterOptions, } from '../../src'; @@ -42,6 +44,7 @@ import { import { MockedResponse } from './nodeHelpers'; import { AggregationTemporality, + InstrumentType, ResourceMetrics, } from '@opentelemetry/sdk-metrics'; import { PassThrough, Stream } from 'stream'; @@ -105,6 +108,116 @@ describe('OTLPMetricExporter - node with json over http', () => { }); }); + describe('temporality', () => { + it('should use the right temporality when Cumulative preference is selected', () => { + const exporter = new OTLPMetricExporter({ + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, + }); + + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.COUNTER), + AggregationTemporality.CUMULATIVE, + 'Counter' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), + AggregationTemporality.CUMULATIVE, + 'Histogram' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), + AggregationTemporality.CUMULATIVE, + 'UpDownCounter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous Counter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_UP_DOWN_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous UpDownCounter' + ); + }); + + it('should use the right temporality when Delta preference is selected', () => { + const exporter = new OTLPMetricExporter({ + temporalityPreference: AggregationTemporalityPreference.DELTA, + }); + + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.COUNTER), + AggregationTemporality.DELTA, + 'Counter' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), + AggregationTemporality.DELTA, + 'Histogram' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), + AggregationTemporality.CUMULATIVE, + 'UpDownCounter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_COUNTER + ), + AggregationTemporality.DELTA, + 'Asynchronous Counter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_UP_DOWN_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous UpDownCounter' + ); + }); + + it('should use the right temporality when LowMemory preference is selected', () => { + const exporter = new OTLPMetricExporter({ + temporalityPreference: AggregationTemporalityPreference.LOWMEMORY, + }); + + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.COUNTER), + AggregationTemporality.DELTA, + 'Counter' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.HISTOGRAM), + AggregationTemporality.DELTA, + 'Histogram' + ); + assert.equal( + exporter.selectAggregationTemporality(InstrumentType.UP_DOWN_COUNTER), + AggregationTemporality.CUMULATIVE, + 'UpDownCounter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous Counter' + ); + assert.equal( + exporter.selectAggregationTemporality( + InstrumentType.OBSERVABLE_UP_DOWN_COUNTER + ), + AggregationTemporality.CUMULATIVE, + 'Asynchronous UpDownCounter' + ); + }); + }); + describe('when configuring via environment', () => { const envSource = process.env; it('should use url defined in env that ends with root path and append version and signal path', () => { @@ -230,6 +343,21 @@ describe('OTLPMetricExporter - node with json over http', () => { ); } }); + it('should use low memory temporality defined via env', () => { + for (const envValue of [ + 'lowmemory', + 'LOWMEMORY', + 'LoWMeMOrY', + 'lowmemory ', + ]) { + envSource.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE = envValue; + const exporter = new OTLPMetricExporter(); + assert.strictEqual( + exporter['_aggregationTemporalitySelector'], + LowMemoryTemporalitySelector + ); + } + }); it('should configure cumulative temporality with invalid value in env', () => { for (const envValue of ['invalid', ' ']) { envSource.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE = envValue; @@ -244,7 +372,7 @@ describe('OTLPMetricExporter - node with json over http', () => { envSource.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE = 'cumulative'; const exporter = new OTLPMetricExporter({ - temporalityPreference: AggregationTemporality.DELTA, + temporalityPreference: AggregationTemporalityPreference.DELTA, }); assert.strictEqual( exporter['_aggregationTemporalitySelector'], @@ -264,7 +392,7 @@ describe('OTLPMetricExporter - node with json over http', () => { url: 'http://foo.bar.com', keepAlive: true, httpAgentOptions: { keepAliveMsecs: 2000 }, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }; collectorExporter = new OTLPMetricExporter(collectorExporterConfig); @@ -485,7 +613,7 @@ describe('OTLPMetricExporter - node with json over http', () => { const url = 'http://foo.bar.com'; const collectorExporter = new OTLPMetricExporter({ url, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }); setTimeout(() => { assert.strictEqual(collectorExporter._otlpExporter.url, url); diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md index 6a2e160ba..5f89cc17b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md @@ -51,7 +51,7 @@ In addition to settings passed to the constructor, the exporter also supports co |---------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | OTEL_EXPORTER_OTLP_ENDPOINT | The endpoint to send metrics to. This will also be used for the traces exporter if `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT` is not configured. By default `http://localhost:4318` will be used. `/v1/metrics` will be automatically appended to configured values. | | OTEL_EXPORTER_OTLP_METRICS_ENDPOINT | The endpoint to send metrics to. By default `https://localhost:4318/v1/metrics` will be used. `v1/metrics` will not be appended automatically and has to be added explicitly. | -| OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE | The exporters aggregation temporality preference. Valid values are `cumulative`, and `delta`. `cumulative` selects cumulative temporality for all instrument kinds. `delta` selects delta aggregation temporality for Counter, Asynchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter and Asynchronous UpDownCounter instrument kinds. By default `cumulative` is used. | +| OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE | The exporters aggregation temporality preference. Valid values are `cumulative`, `delta` and `lowmemory`. `cumulative` selects cumulative temporality for all instrument kinds. `delta` selects delta aggregation temporality for Counter, Asynchronous Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter and Asynchronous UpDownCounter instrument kinds. `lowmemory` selects delta aggregation temporality for Counter and Histogram instrument kinds, and selects cumulative aggregation for UpDownCounter, Asynchronous Counter and Asynchronous UpDownCounter instrument kinds. By default `cumulative` is used. | > Settings configured programmatically take precedence over environment variables. Per-signal environment variables take > precedence over non-per-signal environment variables. diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts index d3270b6a9..4d4856481 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/OTLPMetricExporter.test.ts @@ -38,11 +38,11 @@ import { setUp, shutdown, } from './metricsHelper'; +import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; import { - AggregationTemporality, - ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; -import { OTLPMetricExporterOptions } from '@opentelemetry/exporter-metrics-otlp-http'; + AggregationTemporalityPreference, + OTLPMetricExporterOptions, +} from '@opentelemetry/exporter-metrics-otlp-http'; import { Stream, PassThrough } from 'stream'; import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; @@ -176,7 +176,7 @@ describe('OTLPMetricExporter - node with proto over http', () => { url: 'http://foo.bar.com', keepAlive: true, httpAgentOptions: { keepAliveMsecs: 2000 }, - temporalityPreference: AggregationTemporality.CUMULATIVE, + temporalityPreference: AggregationTemporalityPreference.CUMULATIVE, }; collectorExporter = new OTLPMetricExporter(collectorExporterConfig); setUp(); From 1ce8a899cf2af1790787e48dad36769fe3af7b0d Mon Sep 17 00:00:00 2001 From: Jackson Weber <47067795+JacksonWeber@users.noreply.github.com> Date: Mon, 3 Jul 2023 04:34:35 -0700 Subject: [PATCH 22/94] Update the Prometheus Exporter to by Default not Append Timestamp (#3961) --- CHANGELOG.md | 1 + .../src/PrometheusExporter.ts | 2 +- .../src/PrometheusSerializer.ts | 2 +- .../test/PrometheusExporter.test.ts | 68 ++++----- .../test/PrometheusSerializer.test.ts | 141 +++++++++--------- 5 files changed, 106 insertions(+), 108 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 865601c10..7de3dc1f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) +* fix(opentelemetry-exporter-prometheus): Update default PrometheusExporter to not append a timestamp to match the text based exposition format [#3961](https://github.com/open-telemetry/opentelemetry-js/pull/3961) @JacksonWeber * fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001 * fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts index 2a7cb5fb4..8f84c5134 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts @@ -33,7 +33,7 @@ export class PrometheusExporter extends MetricReader { port: 9464, endpoint: '/metrics', prefix: '', - appendTimestamp: true, + appendTimestamp: false, }; private readonly _host?: string; diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts index 75b29bb61..7dc424a2b 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts @@ -176,7 +176,7 @@ export class PrometheusSerializer { private _prefix: string | undefined; private _appendTimestamp: boolean; - constructor(prefix?: string, appendTimestamp = true) { + constructor(prefix?: string, appendTimestamp = false) { if (prefix) { this._prefix = prefix + '_'; } diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts index 292ad3db1..b4c6f0ade 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts @@ -21,12 +21,12 @@ import * as sinon from 'sinon'; import * as http from 'http'; import { PrometheusExporter } from '../src'; import { - mockedHrTimeMs, mockHrTime, sdkLanguage, sdkName, sdkVersion, serviceName, + mockedHrTimeMs, } from './util'; import { SinonStubbedInstance } from 'sinon'; @@ -290,7 +290,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_total a test description', '# TYPE counter_total counter', - `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + 'counter_total{key1="attributeValue1"} 10', '', ]); }); @@ -320,7 +320,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP metric_observable_gauge a test description', '# TYPE metric_observable_gauge gauge', - `metric_observable_gauge{pid="123",core="1"} 0.999 ${mockedHrTimeMs}`, + 'metric_observable_gauge{pid="123",core="1"} 0.999', '', ]); }); @@ -340,8 +340,8 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_total a test description', '# TYPE counter_total counter', - `counter_total{counterKey1="attributeValue1"} 10 ${mockedHrTimeMs}`, - `counter_total{counterKey1="attributeValue2"} 20 ${mockedHrTimeMs}`, + 'counter_total{counterKey1="attributeValue1"} 10', + 'counter_total{counterKey1="attributeValue2"} 20', '', ]); }); @@ -389,7 +389,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_total description missing', '# TYPE counter_total counter', - `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + 'counter_total{key1="attributeValue1"} 10', '', ]); }); @@ -406,7 +406,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_bad_name_total description missing', '# TYPE counter_bad_name_total counter', - `counter_bad_name_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + 'counter_bad_name_total{key1="attributeValue1"} 10', '', ]); }); @@ -424,7 +424,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter a test description', '# TYPE counter gauge', - `counter{key1="attributeValue1"} 20 ${mockedHrTimeMs}`, + 'counter{key1="attributeValue1"} 20', '', ]); }); @@ -453,7 +453,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP metric_observable_counter a test description', '# TYPE metric_observable_counter counter', - `metric_observable_counter{key1="attributeValue1"} 20 ${mockedHrTimeMs}`, + 'metric_observable_counter{key1="attributeValue1"} 20', '', ]); }); @@ -484,7 +484,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP metric_observable_up_down_counter a test description', '# TYPE metric_observable_up_down_counter gauge', - `metric_observable_up_down_counter{key1="attributeValue1"} 20 ${mockedHrTimeMs}`, + 'metric_observable_up_down_counter{key1="attributeValue1"} 20', '', ]); }); @@ -503,24 +503,24 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP test_histogram a test description', '# TYPE test_histogram histogram', - `test_histogram_count{key1="attributeValue1"} 1 ${mockedHrTimeMs}`, - `test_histogram_sum{key1="attributeValue1"} 20 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="0"} 0 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="5"} 0 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="10"} 0 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="25"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="50"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="75"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="100"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="250"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="500"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="750"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="1000"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="2500"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="5000"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="7500"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="10000"} 1 ${mockedHrTimeMs}`, - `test_histogram_bucket{key1="attributeValue1",le="+Inf"} 1 ${mockedHrTimeMs}`, + 'test_histogram_count{key1="attributeValue1"} 1', + 'test_histogram_sum{key1="attributeValue1"} 20', + 'test_histogram_bucket{key1="attributeValue1",le="0"} 0', + 'test_histogram_bucket{key1="attributeValue1",le="5"} 0', + 'test_histogram_bucket{key1="attributeValue1",le="10"} 0', + 'test_histogram_bucket{key1="attributeValue1",le="25"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="50"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="75"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="100"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="250"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="500"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="750"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="1000"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="2500"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="5000"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="7500"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="10000"} 1', + 'test_histogram_bucket{key1="attributeValue1",le="+Inf"} 1', '', ]); }); @@ -562,7 +562,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP test_prefix_counter_total description missing', '# TYPE test_prefix_counter_total counter', - `test_prefix_counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + 'test_prefix_counter_total{key1="attributeValue1"} 10', '', ]); @@ -591,7 +591,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_total description missing', '# TYPE counter_total counter', - `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + 'counter_total{key1="attributeValue1"} 10', '', ]); @@ -620,7 +620,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_total description missing', '# TYPE counter_total counter', - `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, + 'counter_total{key1="attributeValue1"} 10', '', ]); @@ -632,10 +632,10 @@ describe('PrometheusExporter', () => { ); }); - it('should export a metric without timestamp', done => { + it('should export a metric with timestamp', done => { exporter = new PrometheusExporter( { - appendTimestamp: false, + appendTimestamp: true, }, async () => { setup(exporter); @@ -649,7 +649,7 @@ describe('PrometheusExporter', () => { ...serializedDefaultResourceLines, '# HELP counter_total description missing', '# TYPE counter_total counter', - 'counter_total{key1="attributeValue1"} 10', + `counter_total{key1="attributeValue1"} 10 ${mockedHrTimeMs}`, '', ]); diff --git a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts index 5495ca0a8..1a39aae00 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts @@ -118,17 +118,17 @@ describe('PrometheusSerializer', () => { it('should serialize metrics with singular data type', async () => { const serializer = new PrometheusSerializer(); const result = await testSerializer(serializer); + assert.strictEqual(result, 'test_total{foo1="bar1",foo2="bar2"} 1\n'); + }); + + it('should serialize metrics with singular data type with timestamp', async () => { + const serializer = new PrometheusSerializer(undefined, true); + const result = await testSerializer(serializer); assert.strictEqual( result, `test_total{foo1="bar1",foo2="bar2"} 1 ${mockedHrTimeMs}\n` ); }); - - it('should serialize metrics with singular data type without timestamp', async () => { - const serializer = new PrometheusSerializer(undefined, false); - const result = await testSerializer(serializer); - assert.strictEqual(result, 'test_total{foo1="bar1",foo2="bar2"} 1\n'); - }); }); describe('Histogram', () => { @@ -168,20 +168,6 @@ describe('PrometheusSerializer', () => { it('should serialize metrics with histogram data type', async () => { const serializer = new PrometheusSerializer(); const result = await testSerializer(serializer); - assert.strictEqual( - result, - `test_count{foo1="bar1",foo2="bar2"} 1 ${mockedHrTimeMs}\n` + - `test_sum{foo1="bar1",foo2="bar2"} 5 ${mockedHrTimeMs}\n` + - `test_bucket{foo1="bar1",foo2="bar2",le="1"} 0 ${mockedHrTimeMs}\n` + - `test_bucket{foo1="bar1",foo2="bar2",le="10"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{foo1="bar1",foo2="bar2",le="100"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{foo1="bar1",foo2="bar2",le="+Inf"} 1 ${mockedHrTimeMs}\n` - ); - }); - - it('serialize metric record with sum aggregator without timestamp', async () => { - const serializer = new PrometheusSerializer(undefined, false); - const result = await testSerializer(serializer); assert.strictEqual( result, 'test_count{foo1="bar1",foo2="bar2"} 1\n' + @@ -192,6 +178,20 @@ describe('PrometheusSerializer', () => { 'test_bucket{foo1="bar1",foo2="bar2",le="+Inf"} 1\n' ); }); + + it('serialize metric record with sum aggregator with timestamp', async () => { + const serializer = new PrometheusSerializer(undefined, true); + const result = await testSerializer(serializer); + assert.strictEqual( + result, + `test_count{foo1="bar1",foo2="bar2"} 1 ${mockedHrTimeMs}\n` + + `test_sum{foo1="bar1",foo2="bar2"} 5 ${mockedHrTimeMs}\n` + + `test_bucket{foo1="bar1",foo2="bar2",le="1"} 0 ${mockedHrTimeMs}\n` + + `test_bucket{foo1="bar1",foo2="bar2",le="10"} 1 ${mockedHrTimeMs}\n` + + `test_bucket{foo1="bar1",foo2="bar2",le="100"} 1 ${mockedHrTimeMs}\n` + + `test_bucket{foo1="bar1",foo2="bar2",le="+Inf"} 1 ${mockedHrTimeMs}\n` + ); + }); }); }); @@ -233,20 +233,20 @@ describe('PrometheusSerializer', () => { result, '# HELP test_total foobar\n' + '# TYPE test_total counter\n' + - `test_total{val="1"} 1 ${mockedHrTimeMs}\n` + - `test_total{val="2"} 1 ${mockedHrTimeMs}\n` + 'test_total{val="1"} 1\n' + + 'test_total{val="2"} 1\n' ); }); - it('should serialize metric record without timestamp', async () => { - const serializer = new PrometheusSerializer(undefined, false); + it('should serialize metric record with timestamp', async () => { + const serializer = new PrometheusSerializer(undefined, true); const result = await testSerializer(serializer); assert.strictEqual( result, '# HELP test_total foobar\n' + '# TYPE test_total counter\n' + - 'test_total{val="1"} 1\n' + - 'test_total{val="2"} 1\n' + `test_total{val="1"} 1 ${mockedHrTimeMs}\n` + + `test_total{val="2"} 1 ${mockedHrTimeMs}\n` ); }); }); @@ -287,20 +287,20 @@ describe('PrometheusSerializer', () => { result, '# HELP test_total foobar\n' + '# TYPE test_total gauge\n' + - `test_total{val="1"} 1 ${mockedHrTimeMs}\n` + - `test_total{val="2"} 1 ${mockedHrTimeMs}\n` + 'test_total{val="1"} 1\n' + + 'test_total{val="2"} 1\n' ); }); - it('serialize metric record without timestamp', async () => { - const serializer = new PrometheusSerializer(undefined, false); + it('serialize metric record with timestamp', async () => { + const serializer = new PrometheusSerializer(undefined, true); const result = await testSerializer(serializer); assert.strictEqual( result, '# HELP test_total foobar\n' + '# TYPE test_total gauge\n' + - 'test_total{val="1"} 1\n' + - 'test_total{val="2"} 1\n' + `test_total{val="1"} 1 ${mockedHrTimeMs}\n` + + `test_total{val="2"} 1 ${mockedHrTimeMs}\n` ); }); }); @@ -341,20 +341,20 @@ describe('PrometheusSerializer', () => { result, '# HELP test_total foobar\n' + '# TYPE test_total gauge\n' + - `test_total{val="1"} 1 ${mockedHrTimeMs}\n` + - `test_total{val="2"} 1 ${mockedHrTimeMs}\n` + 'test_total{val="1"} 1\n' + + 'test_total{val="2"} 1\n' ); }); - it('serialize metric record without timestamp', async () => { - const serializer = new PrometheusSerializer(undefined, false); + it('serialize metric record with timestamp', async () => { + const serializer = new PrometheusSerializer(undefined, true); const result = await testSerializer(serializer); assert.strictEqual( result, '# HELP test_total foobar\n' + '# TYPE test_total gauge\n' + - 'test_total{val="1"} 1\n' + - 'test_total{val="2"} 1\n' + `test_total{val="1"} 1 ${mockedHrTimeMs}\n` + + `test_total{val="2"} 1 ${mockedHrTimeMs}\n` ); }); }); @@ -399,18 +399,18 @@ describe('PrometheusSerializer', () => { result, '# HELP test foobar\n' + '# TYPE test histogram\n' + - `test_count{val="1"} 3 ${mockedHrTimeMs}\n` + - `test_sum{val="1"} 175 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="1"} 0 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="10"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="100"} 2 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="+Inf"} 3 ${mockedHrTimeMs}\n` + - `test_count{val="2"} 1 ${mockedHrTimeMs}\n` + - `test_sum{val="2"} 5 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="1"} 0 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="10"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="100"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="+Inf"} 1 ${mockedHrTimeMs}\n` + 'test_count{val="1"} 3\n' + + 'test_sum{val="1"} 175\n' + + 'test_bucket{val="1",le="1"} 0\n' + + 'test_bucket{val="1",le="10"} 1\n' + + 'test_bucket{val="1",le="100"} 2\n' + + 'test_bucket{val="1",le="+Inf"} 3\n' + + 'test_count{val="2"} 1\n' + + 'test_sum{val="2"} 5\n' + + 'test_bucket{val="2",le="1"} 0\n' + + 'test_bucket{val="2",le="10"} 1\n' + + 'test_bucket{val="2",le="100"} 1\n' + + 'test_bucket{val="2",le="+Inf"} 1\n' ); }); @@ -448,16 +448,16 @@ describe('PrometheusSerializer', () => { result, '# HELP test foobar\n' + '# TYPE test histogram\n' + - `test_count{val="1"} 3 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="1"} 0 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="10"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="100"} 2 ${mockedHrTimeMs}\n` + - `test_bucket{val="1",le="+Inf"} 3 ${mockedHrTimeMs}\n` + - `test_count{val="2"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="1"} 0 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="10"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="100"} 1 ${mockedHrTimeMs}\n` + - `test_bucket{val="2",le="+Inf"} 1 ${mockedHrTimeMs}\n` + 'test_count{val="1"} 3\n' + + 'test_bucket{val="1",le="1"} 0\n' + + 'test_bucket{val="1",le="10"} 1\n' + + 'test_bucket{val="1",le="100"} 2\n' + + 'test_bucket{val="1",le="+Inf"} 3\n' + + 'test_count{val="2"} 1\n' + + 'test_bucket{val="2",le="1"} 0\n' + + 'test_bucket{val="2",le="10"} 1\n' + + 'test_bucket{val="2",le="100"} 1\n' + + 'test_bucket{val="2",le="+Inf"} 1\n' ); }); }); @@ -518,7 +518,7 @@ describe('PrometheusSerializer', () => { '# HELP test_total description missing\n' + `# UNIT test_total ${unitOfMetric}\n` + '# TYPE test_total counter\n' + - `test_total 1 ${mockedHrTimeMs}\n` + 'test_total 1\n' ); }); @@ -533,7 +533,7 @@ describe('PrometheusSerializer', () => { serializedDefaultResource + '# HELP test_total description missing\n' + '# TYPE test_total counter\n' + - `test_total 1 ${mockedHrTimeMs}\n` + 'test_total 1\n' ); }); @@ -541,14 +541,14 @@ describe('PrometheusSerializer', () => { const serializer = new PrometheusSerializer(); const result = await getCounterResult('test', serializer); - assert.strictEqual(result, `test_total 1 ${mockedHrTimeMs}\n`); + assert.strictEqual(result, 'test_total 1\n'); }); it('should not rename metric of type counter when name contains _total suffix', async () => { const serializer = new PrometheusSerializer(); const result = await getCounterResult('test_total', serializer); - assert.strictEqual(result, `test_total 1 ${mockedHrTimeMs}\n`); + assert.strictEqual(result, 'test_total 1\n'); }); }); @@ -594,7 +594,7 @@ describe('PrometheusSerializer', () => { counter.add(1); }); - assert.strictEqual(result, `test_total 1 ${mockedHrTimeMs}\n`); + assert.strictEqual(result, 'test_total 1\n'); }); it('should serialize non-string attribute values in JSON representations', async () => { @@ -615,7 +615,7 @@ describe('PrometheusSerializer', () => { assert.strictEqual( result, - `test_total{true="true",false="false",array="[1,null,null,2]",object="{}",Infinity="null",NaN="null",null="null",undefined=""} 1 ${mockedHrTimeMs}\n` + 'test_total{true="true",false="false",array="[1,null,null,2]",object="{}",Infinity="null",NaN="null",null="null",undefined=""} 1\n' ); }); @@ -634,7 +634,7 @@ describe('PrometheusSerializer', () => { assert.strictEqual( result, - `test{foo1="bar1",foo2="bar2"} ${esac[1]} ${mockedHrTimeMs}\n` + `test{foo1="bar1",foo2="bar2"} ${esac[1]}\n` ); } }); @@ -662,7 +662,7 @@ describe('PrometheusSerializer', () => { 'backslashN="\u005c\u005c\u006e",' + 'backslashDoubleQuote="\u005c\u005c\u005c\u0022",' + 'backslashLineFeed="\u005c\u005c\u005c\u006e"' + - `} 1 ${mockedHrTimeMs}\n` + '} 1\n' ); }); @@ -678,10 +678,7 @@ describe('PrometheusSerializer', () => { } as unknown as MetricAttributes); }); - assert.strictEqual( - result, - `test_total{account_id="123456"} 1 ${mockedHrTimeMs}\n` - ); + assert.strictEqual(result, 'test_total{account_id="123456"} 1\n'); }); }); From de5cd0f40908c48bcc5b472f7372ea2bbd5bc7d7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 3 Jul 2023 14:25:58 +0200 Subject: [PATCH 23/94] fix(deps): update dependency import-in-the-middle to v1.4.1 (#3962) --- .../packages/opentelemetry-instrumentation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index dd8ac1eb8..944258ad8 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.3.5", + "import-in-the-middle": "1.4.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1", "shimmer": "^1.2.1", From c51c9eb95421cc0e04b04d59be8ed521cd78f312 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 4 Jul 2023 15:23:08 +0200 Subject: [PATCH 24/94] docs(otlp-exporters): update docs to reflect OTLP 0.20.0 is used (#3938) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gerhard Stöbich --- experimental/packages/exporter-logs-otlp-grpc/README.md | 2 +- experimental/packages/exporter-logs-otlp-http/README.md | 2 +- experimental/packages/exporter-logs-otlp-proto/README.md | 2 +- experimental/packages/exporter-trace-otlp-grpc/README.md | 3 +-- experimental/packages/exporter-trace-otlp-http/README.md | 3 +-- experimental/packages/exporter-trace-otlp-proto/README.md | 3 +-- .../opentelemetry-exporter-metrics-otlp-grpc/README.md | 3 +-- .../opentelemetry-exporter-metrics-otlp-http/README.md | 3 +-- .../opentelemetry-exporter-metrics-otlp-proto/README.md | 3 +-- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-grpc/README.md b/experimental/packages/exporter-logs-otlp-grpc/README.md index d683d0beb..b2ba24bf9 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/README.md +++ b/experimental/packages/exporter-logs-otlp-grpc/README.md @@ -5,7 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides an exporter for OTLP gRPC logs using protocol version `v0.18`. +This module provides a logs-exporter for OTLP (gRPC) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/exporter-logs-otlp-http/README.md b/experimental/packages/exporter-logs-otlp-http/README.md index 256e1d88d..24f0d7f4a 100644 --- a/experimental/packages/exporter-logs-otlp-http/README.md +++ b/experimental/packages/exporter-logs-otlp-http/README.md @@ -5,7 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides an exporter for OTLP (http/json) logs using protocol version `v0.18`. +This module provides a logs-exporter for OTLP (http/json) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/exporter-logs-otlp-proto/README.md b/experimental/packages/exporter-logs-otlp-proto/README.md index 3019f50d3..3a00476c3 100644 --- a/experimental/packages/exporter-logs-otlp-proto/README.md +++ b/experimental/packages/exporter-logs-otlp-proto/README.md @@ -5,7 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides an exporter for OTLP (http/protobuf) logs using protocol version `v0.18`. +This module provides a logs-exporter for OTLP (http/protobuf) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/exporter-trace-otlp-grpc/README.md b/experimental/packages/exporter-trace-otlp-grpc/README.md index 933e12077..32d423187 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/README.md +++ b/experimental/packages/exporter-trace-otlp-grpc/README.md @@ -5,8 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides exporter for node to be used with OTLP (`grpc`) compatible receivers. -Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.16 <=0.50`. +This module provides a trace-exporter for OTLP (gRPC) traces using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/exporter-trace-otlp-http/README.md b/experimental/packages/exporter-trace-otlp-http/README.md index f5944a047..141a4a276 100644 --- a/experimental/packages/exporter-trace-otlp-http/README.md +++ b/experimental/packages/exporter-trace-otlp-http/README.md @@ -5,8 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides exporter for web and node to be used with OTLP (`http/json`) compatible receivers. -Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.48 <=0.50`. +This module provides a trace-exporter for OTLP (http/json) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/exporter-trace-otlp-proto/README.md b/experimental/packages/exporter-trace-otlp-proto/README.md index efd22d2ab..0be283beb 100644 --- a/experimental/packages/exporter-trace-otlp-proto/README.md +++ b/experimental/packages/exporter-trace-otlp-proto/README.md @@ -5,8 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides exporter for node to be used with OTLP (`http/protobuf`) compatible receivers. -Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.32 <=0.50`. +This module provides a trace-exporter for OTLP (http/protobuf) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md index 05f6b4803..7a257ba1b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md @@ -5,8 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides exporter for node to be used with OTLP (`grpc`) compatible receivers. -Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.16 <=0.53`. +This module provides a metrics-exporter for OTLP (gRPC) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md index b475d0283..ba449280b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md @@ -5,8 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides exporter for web and node to be used with OTLP (`http/json`) compatible receivers. -Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.52 <=0.53`. +This module provides a metrics-exporter for OTLP (http/json) using protocol version `v0.20.0`. ## Installation diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md index 5f89cc17b..0056d2f3c 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md @@ -5,8 +5,7 @@ **Note: This is an experimental package under active development. New releases may include breaking changes.** -This module provides exporter for node to be used with OTLP (`http/protobuf`) compatible receivers. -Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.32 <=0.53`. +This module provides a metrics-exporter for OTLP (http/protobuf) using protocol version `v0.20.0`. ## Installation From 05c4e9ee3e740b3bfba609b3e8a4c02ca7119a1c Mon Sep 17 00:00:00 2001 From: Guillaume Date: Tue, 4 Jul 2023 22:23:10 +0900 Subject: [PATCH 25/94] feat(mongodb): support v5 (#1451) * feat(mongodb): add support for v5 * refactor(mongodb): avoid duplicating code for v4 & v5 * fix: lint * refactor(mongodb): use range for mongodb version check * chore(mongodb): make test commands consistent * refactor(mongodb): adapt code based on main's changes * chore: revert mongodb bump in devDependencies * refactor: adapt code based on comments * chore: re-use old order for tests suites * refactor: simply metrics tests * test: fix DB name in v5 tests * chore: revert MongoDB to 3.6.11 in package.json * test: fix compilation issue due to different signatures (v3 vs v5) * fix: lint --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Co-authored-by: Marc Pichler --- .../.tav.yml | 6 +- .../package.json | 10 +- .../src/instrumentation.ts | 8 +- .../test/mongodb-v3.test.ts | 2 +- ....test.ts => mongodb-v4-v5.metrics.test.ts} | 67 +- .../test/mongodb-v4.test.ts | 52 +- .../test/mongodb-v5.test.ts | 594 ++++++++++++++++++ 7 files changed, 672 insertions(+), 67 deletions(-) rename plugins/node/opentelemetry-instrumentation-mongodb/test/{mongodb-v4.metrics.test.ts => mongodb-v4-v5.metrics.test.ts} (76%) create mode 100644 plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml b/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml index c369d133f..86a2bf927 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml @@ -1,9 +1,11 @@ mongodb: jobs: - versions: ">=3.3 <4" - commands: npm run test + commands: npm run test-v3 - versions: ">=4 <5" - commands: npm run test-new-versions + commands: npm run test-v4 + - versions: ">=5 <6" + commands: npm run test-v5 # Fix missing `contrib-test-utils` package pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index ef186f31f..e2a54723b 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -7,8 +7,10 @@ "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", - "test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", - "test-new-versions": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4**.test.ts'", + "test": "npm run test-v3", + "test-v3": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", + "test-v4": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v4.test.ts'", + "test-v5": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v5.test.ts'", "test-all-versions": "tav", "tdd": "npm run test -- --watch-extensions ts --watch", "clean": "rimraf build/*", @@ -55,12 +57,12 @@ "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", + "@types/bson": "4.0.5", "@types/mocha": "7.0.2", + "@types/mongodb": "3.6.20", "@types/node": "18.11.7", "mocha": "7.2.0", "mongodb": "3.6.11", - "@types/mongodb": "3.6.20", - "@types/bson": "4.0.5", "nyc": "15.1.0", "rimraf": "5.0.0", "test-all-versions": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts index f1f66f8f4..587c0fe18 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts @@ -95,25 +95,25 @@ export class MongoDBInstrumentation extends InstrumentationBase { ), new InstrumentationNodeModuleDefinition( 'mongodb', - ['4.*'], + ['4.*', '5.*'], undefined, undefined, [ new InstrumentationNodeModuleFile( 'mongodb/lib/cmap/connection.js', - ['4.*'], + ['4.*', '5.*'], v4PatchConnection, v4UnpatchConnection ), new InstrumentationNodeModuleFile( 'mongodb/lib/cmap/connect.js', - ['4.*'], + ['4.*', '5.*'], v4PatchConnect, v4UnpatchConnect ), new InstrumentationNodeModuleFile( 'mongodb/lib/sessions.js', - ['4.*'], + ['4.*', '5.*'], v4PatchSessions, v4UnpatchSessions ), diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v3.test.ts b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v3.test.ts index f3368d75f..a8f044483 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v3.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v3.test.ts @@ -35,7 +35,7 @@ import * as mongodb from 'mongodb'; import { assertSpans, accessCollection, DEFAULT_MONGO_HOST } from './utils'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -describe('MongoDBInstrumentation', () => { +describe('MongoDBInstrumentation-Tracing-v3', () => { function create(config: MongoDBInstrumentationConfig = {}) { instrumentation.setConfig(config); } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5.metrics.test.ts similarity index 76% rename from plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts rename to plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5.metrics.test.ts index b6fb8c36d..189ff458d 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5.metrics.test.ts @@ -28,8 +28,6 @@ import { ResourceMetrics, } from '@opentelemetry/sdk-metrics'; -import * as mongodb from 'mongodb'; - const otelTestingMeterProvider = new MeterProvider(); const inMemoryMetricsExporter = new InMemoryMetricExporter( AggregationTemporality.CUMULATIVE @@ -40,17 +38,13 @@ const metricReader = new PeriodicExportingMetricReader({ exportTimeoutMillis: 100, }); -otelTestingMeterProvider.addMetricReader(metricReader); - import { registerInstrumentationTesting } from '@opentelemetry/contrib-test-utils'; const instrumentation = registerInstrumentationTesting( new MongoDBInstrumentation() ); -instrumentation.setMeterProvider(otelTestingMeterProvider); - import { accessCollection, DEFAULT_MONGO_HOST } from './utils'; - +import * as mongodb from 'mongodb'; import * as assert from 'assert'; async function waitForNumberOfExports( @@ -86,9 +80,13 @@ describe('MongoDBInstrumentation-Metrics', () => { const DB_NAME = process.env.MONGODB_DB || 'opentelemetry-tests-metrics'; const COLLECTION_NAME = 'test-metrics'; const URL = `mongodb://${HOST}:${PORT}/${DB_NAME}`; - let client: mongodb.MongoClient; - let collection: mongodb.Collection; + + before(() => { + otelTestingMeterProvider.addMetricReader(metricReader); + instrumentation?.setMeterProvider(otelTestingMeterProvider); + }); + beforeEach(function mongoBeforeEach(done) { // Skipping all tests in beforeEach() is a workaround. Mocha does not work // properly when skipping tests in before() on nested describe() calls. @@ -96,6 +94,7 @@ describe('MongoDBInstrumentation-Metrics', () => { if (!shouldTest) { this.skip(); } + inMemoryMetricsExporter.reset(); done(); }); @@ -103,17 +102,17 @@ describe('MongoDBInstrumentation-Metrics', () => { it('Should add connection usage metrics', async () => { const result = await accessCollection(URL, DB_NAME, COLLECTION_NAME); client = result.client; - collection = result.collection; + const collection = result.collection; const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; await collection.insertMany(insertData); await collection.deleteMany({}); - let exportedMetrics = await waitForNumberOfExports( + const exportedMetrics = await waitForNumberOfExports( inMemoryMetricsExporter, 1 ); assert.strictEqual(exportedMetrics.length, 1); - let metrics = exportedMetrics[0].scopeMetrics[0].metrics; + const metrics = exportedMetrics[0].scopeMetrics[0].metrics; assert.strictEqual(metrics.length, 1); assert.strictEqual(metrics[0].dataPointType, DataPointType.SUM); @@ -126,25 +125,34 @@ describe('MongoDBInstrumentation-Metrics', () => { metrics[0].descriptor.name, 'db.client.connections.usage' ); - assert.strictEqual(metrics[0].dataPoints.length, 2); - assert.strictEqual(metrics[0].dataPoints[0].value, 0); - assert.strictEqual(metrics[0].dataPoints[0].attributes['state'], 'used'); + + // Checking dataPoints + const dataPoints = metrics[0].dataPoints; + assert.strictEqual(dataPoints.length, 2); + assert.strictEqual(dataPoints[0].value, 0); + assert.strictEqual(dataPoints[0].attributes['state'], 'used'); assert.strictEqual( - metrics[0].dataPoints[0].attributes['pool.name'], + dataPoints[0].attributes['pool.name'], `mongodb://${HOST}:${PORT}/${DB_NAME}` ); - assert.strictEqual(metrics[0].dataPoints[1].value, 1); - assert.strictEqual(metrics[0].dataPoints[1].attributes['state'], 'idle'); + assert.strictEqual(dataPoints[1].value, 1); + assert.strictEqual(dataPoints[1].attributes['state'], 'idle'); assert.strictEqual( - metrics[0].dataPoints[1].attributes['pool.name'], + dataPoints[1].attributes['pool.name'], `mongodb://${HOST}:${PORT}/${DB_NAME}` ); + }); + + it('Should add disconnection usage metrics', async () => { await client.close(); - exportedMetrics = await waitForNumberOfExports(inMemoryMetricsExporter, 2); + const exportedMetrics = await waitForNumberOfExports( + inMemoryMetricsExporter, + 2 + ); assert.strictEqual(exportedMetrics.length, 2); - metrics = exportedMetrics[1].scopeMetrics[0].metrics; + const metrics = exportedMetrics[1].scopeMetrics[0].metrics; assert.strictEqual(metrics.length, 1); assert.strictEqual(metrics[0].dataPointType, DataPointType.SUM); @@ -152,17 +160,20 @@ describe('MongoDBInstrumentation-Metrics', () => { metrics[0].descriptor.description, 'The number of connections that are currently in state described by the state attribute.' ); - assert.strictEqual(metrics[0].dataPoints.length, 2); - assert.strictEqual(metrics[0].dataPoints[0].value, 0); - assert.strictEqual(metrics[0].dataPoints[0].attributes['state'], 'used'); + + // Checking dataPoints + const dataPoints = metrics[0].dataPoints; + assert.strictEqual(dataPoints.length, 2); + assert.strictEqual(dataPoints[0].value, 0); + assert.strictEqual(dataPoints[0].attributes['state'], 'used'); assert.strictEqual( - metrics[0].dataPoints[0].attributes['pool.name'], + dataPoints[0].attributes['pool.name'], `mongodb://${HOST}:${PORT}/${DB_NAME}` ); - assert.strictEqual(metrics[0].dataPoints[1].value, 0); - assert.strictEqual(metrics[0].dataPoints[1].attributes['state'], 'idle'); + assert.strictEqual(dataPoints[1].value, 0); + assert.strictEqual(dataPoints[1].attributes['state'], 'idle'); assert.strictEqual( - metrics[0].dataPoints[1].attributes['pool.name'], + dataPoints[1].attributes['pool.name'], `mongodb://${HOST}:${PORT}/${DB_NAME}` ); }); diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.test.ts b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.test.ts index 10025b8a7..18ba6bc9e 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.test.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.test.ts @@ -18,8 +18,11 @@ import { context, trace, SpanKind, Span } from '@opentelemetry/api'; import * as assert from 'assert'; -import { MongoDBInstrumentation, MongoDBInstrumentationConfig } from '../src'; -import { MongoResponseHookInformation } from '../src'; +import { + MongoDBInstrumentation, + MongoDBInstrumentationConfig, + MongoResponseHookInformation, +} from '../src'; import { registerInstrumentationTesting, getTestSpans, @@ -34,7 +37,7 @@ import * as mongodb from 'mongodb'; import { assertSpans, accessCollection, DEFAULT_MONGO_HOST } from './utils'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -describe('MongoDBInstrumentation-Tracing', () => { +describe('MongoDBInstrumentation-Tracing-v4', () => { function create(config: MongoDBInstrumentationConfig = {}) { instrumentation.setConfig(config); } @@ -47,12 +50,11 @@ describe('MongoDBInstrumentation-Tracing', () => { shouldTest = false; } - const URL = `mongodb://${process.env.MONGODB_HOST || DEFAULT_MONGO_HOST}:${ - process.env.MONGODB_PORT || '27017' - }`; + const HOST = process.env.MONGODB_HOST || DEFAULT_MONGO_HOST; + const PORT = process.env.MONGODB_PORT || '27017'; const DB_NAME = process.env.MONGODB_DB || 'opentelemetry-tests-traces'; const COLLECTION_NAME = 'test-traces'; - const conn_string = `${URL}/${DB_NAME}`; + const URL = `mongodb://${HOST}:${PORT}/${DB_NAME}`; let client: mongodb.MongoClient; let collection: mongodb.Collection; @@ -95,9 +97,9 @@ describe('MongoDBInstrumentation-Tracing', () => { done(); }); - after(() => { + after(async () => { if (client) { - client.close(); + await client.close(); } }); @@ -116,7 +118,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.insert', SpanKind.CLIENT, 'insert', - conn_string + URL ); done(); }) @@ -138,7 +140,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.update', SpanKind.CLIENT, 'update', - conn_string + URL ); done(); }) @@ -160,7 +162,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.delete', SpanKind.CLIENT, 'delete', - conn_string + URL ); done(); }) @@ -186,7 +188,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.find', SpanKind.CLIENT, 'find', - conn_string + URL ); done(); }) @@ -215,7 +217,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.find', SpanKind.CLIENT, 'find', - conn_string + URL ); // assert that we correctly got the first as a find assertSpans( @@ -225,7 +227,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.getMore', SpanKind.CLIENT, 'getMore', - conn_string + URL ); done(); }) @@ -251,7 +253,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.createIndexes', SpanKind.CLIENT, 'createIndexes', - conn_string + URL ); done(); }) @@ -287,7 +289,7 @@ describe('MongoDBInstrumentation-Tracing', () => { operationName, SpanKind.CLIENT, 'insert', - conn_string, + URL, false, false ); @@ -333,7 +335,7 @@ describe('MongoDBInstrumentation-Tracing', () => { operationName, SpanKind.CLIENT, 'insert', - conn_string, + URL, false, true ); @@ -374,7 +376,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.insert', SpanKind.CLIENT, 'insert', - conn_string + URL ); done(); }) @@ -469,13 +471,7 @@ describe('MongoDBInstrumentation-Tracing', () => { .then(() => { span.end(); const spans = getTestSpans(); - assertSpans( - spans, - 'mongodb.find', - SpanKind.CLIENT, - 'find', - conn_string - ); + assertSpans(spans, 'mongodb.find', SpanKind.CLIENT, 'find', URL); done(); }) .catch(err => { @@ -502,7 +498,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.insert', SpanKind.CLIENT, 'insert', - conn_string + URL ); resetMemoryExporter(); @@ -517,7 +513,7 @@ describe('MongoDBInstrumentation-Tracing', () => { 'mongodb.find', SpanKind.CLIENT, 'find', - conn_string + URL ); assert.strictEqual( mainSpan.spanContext().spanId, diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts new file mode 100644 index 000000000..bd8271cb8 --- /dev/null +++ b/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5.test.ts @@ -0,0 +1,594 @@ +/* + * 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. + */ + +// for testing locally "npm run docker:start" + +import { context, trace, SpanKind, Span } from '@opentelemetry/api'; +import * as assert from 'assert'; +import { + MongoDBInstrumentation, + MongoDBInstrumentationConfig, + MongoResponseHookInformation, +} from '../src'; +import { + getInstrumentation, + registerInstrumentationTesting, + getTestSpans, + resetMemoryExporter, +} from '@opentelemetry/contrib-test-utils'; + +// Get instrumentation (singleton) +let instrumentation: MongoDBInstrumentation; +{ + const instance: MongoDBInstrumentation | undefined = getInstrumentation(); + if (!instance) { + instrumentation = new MongoDBInstrumentation(); + registerInstrumentationTesting(instrumentation); + } else { + instrumentation = instance; + } +} + +import * as mongodb from 'mongodb'; +import { assertSpans, accessCollection, DEFAULT_MONGO_HOST } from './utils'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; + +describe('MongoDBInstrumentation-Tracing-v5', () => { + function create(config: MongoDBInstrumentationConfig = {}) { + instrumentation.setConfig(config); + } + // For these tests, mongo must be running. Add RUN_MONGODB_TESTS to run + // these tests. + const RUN_MONGODB_TESTS = process.env.RUN_MONGODB_TESTS as string; + let shouldTest = true; + if (!RUN_MONGODB_TESTS) { + console.log('Skipping test-mongodb. Run MongoDB to test'); + shouldTest = false; + } + + const HOST = process.env.MONGODB_HOST || DEFAULT_MONGO_HOST; + const PORT = process.env.MONGODB_PORT || '27017'; + const DB_NAME = process.env.MONGODB_DB || 'opentelemetry-tests-traces'; + const COLLECTION_NAME = 'test-traces'; + const URL = `mongodb://${HOST}:${PORT}/${DB_NAME}`; + + let client: mongodb.MongoClient; + let collection: mongodb.Collection; + + before(done => { + accessCollection(URL, DB_NAME, COLLECTION_NAME) + .then(result => { + client = result.client; + collection = result.collection; + done(); + }) + .catch((err: Error) => { + console.log( + 'Skipping test-mongodb. Could not connect. Run MongoDB to test' + ); + shouldTest = false; + done(); + }); + }); + + beforeEach(async function mongoBeforeEach() { + // Skipping all tests in beforeEach() is a workaround. Mocha does not work + // properly when skipping tests in before() on nested describe() calls. + // https://github.com/mochajs/mocha/issues/2819 + if (!shouldTest) { + this.skip(); + } + // Non traced insertion of basic data to perform tests + const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; + await collection.insertMany(insertData); + resetMemoryExporter(); + }); + + afterEach(async () => { + if (shouldTest) { + await collection.deleteMany({}); + } + }); + + after(async () => { + if (client) { + await client.close(); + } + }); + + /** Should intercept query */ + describe('Instrumenting query operations', () => { + it('should create a child span for insert', done => { + const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; + const span = trace.getTracer('default').startSpan('insertRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .insertMany(insertData) + .then(() => { + span.end(); + assertSpans( + getTestSpans(), + 'mongodb.insert', + SpanKind.CLIENT, + 'insert', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + + it('should create a child span for update', done => { + const span = trace.getTracer('default').startSpan('updateRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .updateOne({ a: 2 }, { $set: { b: 1 } }) + .then(() => { + span.end(); + assertSpans( + getTestSpans(), + 'mongodb.update', + SpanKind.CLIENT, + 'update', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + + it('should create a child span for remove', done => { + const span = trace.getTracer('default').startSpan('removeRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .deleteOne({ a: 3 }) + .then(() => { + span.end(); + assertSpans( + getTestSpans(), + 'mongodb.delete', + SpanKind.CLIENT, + 'delete', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + + /** Should intercept cursor */ + describe('Instrumenting cursor operations', () => { + it('should create a child span for find', done => { + const span = trace.getTracer('default').startSpan('findRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .find({ a: 1 }) + .toArray() + .then(() => { + span.end(); + assertSpans( + getTestSpans(), + 'mongodb.find', + SpanKind.CLIENT, + 'find', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + + it('should create a child span for cursor operations', done => { + const span = trace.getTracer('default').startSpan('findRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + const cursor = collection.find().batchSize(1); + cursor.next().then(firstElement => { + assert(firstElement !== null); + cursor + .next() + .then(secondElement => { + span.end(); + assert(secondElement !== null); + // assert that we correctly got the first as a find + assertSpans( + getTestSpans().filter( + span => !span.name.includes('mongodb.getMore') + ), + 'mongodb.find', + SpanKind.CLIENT, + 'find', + URL + ); + // assert that we correctly got the first as a find + assertSpans( + getTestSpans().filter( + span => !span.name.includes('mongodb.find') + ), + 'mongodb.getMore', + SpanKind.CLIENT, + 'getMore', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + }); + + /** Should intercept command */ + describe('Instrumenting command operations', () => { + it('should create a child span for create index', done => { + const span = trace.getTracer('default').startSpan('indexRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .createIndex({ a: 1 }) + .then(() => { + span.end(); + assertSpans( + getTestSpans(), + 'mongodb.createIndexes', + SpanKind.CLIENT, + 'createIndexes', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + + describe('when using enhanced database reporting without db statementSerializer', () => { + const key = 'key'; + const value = 'value'; + const object = { [key]: value }; + + beforeEach(() => { + create({ + enhancedDatabaseReporting: false, + }); + }); + + it('should properly collect db statement (hide attribute values)', done => { + const span = trace.getTracer('default').startSpan('insertRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .insertOne(object) + .then(() => { + span.end(); + const spans = getTestSpans(); + const operationName = 'mongodb.insert'; + assertSpans( + spans, + operationName, + SpanKind.CLIENT, + 'insert', + URL, + false, + false + ); + const mongoSpan = spans.find(s => s.name === operationName); + const dbStatement = JSON.parse( + mongoSpan!.attributes[SemanticAttributes.DB_STATEMENT] as string + ); + assert.strictEqual(dbStatement[key], '?'); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + + describe('when specifying a dbStatementSerializer configuration', () => { + const key = 'key'; + const value = 'value'; + const object = { [key]: value }; + + describe('with a valid function', () => { + beforeEach(() => { + create({ + dbStatementSerializer: (commandObj: Record) => { + return JSON.stringify(commandObj); + }, + }); + }); + + it('should properly collect db statement', done => { + const span = trace.getTracer('default').startSpan('insertRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .insertOne(object) + .then(() => { + span.end(); + const spans = getTestSpans(); + const operationName = 'mongodb.insert'; + assertSpans( + spans, + operationName, + SpanKind.CLIENT, + 'insert', + URL, + false, + true + ); + const mongoSpan = spans.find(s => s.name === operationName); + const dbStatement = JSON.parse( + mongoSpan!.attributes[SemanticAttributes.DB_STATEMENT] as string + ); + assert.strictEqual(dbStatement[key], value); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + + describe('with an invalid function', () => { + beforeEach(() => { + create({ + enhancedDatabaseReporting: true, + dbStatementSerializer: (_commandObj: Record) => { + throw new Error('something went wrong!'); + }, + }); + }); + + it('should not do any harm when throwing an exception', done => { + const span = trace.getTracer('default').startSpan('insertRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .insertOne(object) + .then(() => { + span.end(); + const spans = getTestSpans(); + assertSpans( + spans, + 'mongodb.insert', + SpanKind.CLIENT, + 'insert', + URL + ); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + }); + + describe('when specifying a responseHook configuration', () => { + const dataAttributeName = 'mongodb_data'; + describe('with a valid function', () => { + beforeEach(() => { + create({ + responseHook: (span: Span, result: MongoResponseHookInformation) => { + span.setAttribute(dataAttributeName, JSON.stringify(result.data)); + }, + }); + }); + + it('should attach response hook data to the resulting span for insert function', done => { + const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; + const span = trace.getTracer('default').startSpan('insertRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .insertMany(insertData) + .then(results => { + span.end(); + const spans = getTestSpans(); + const insertSpan = spans[0]; + assert.deepStrictEqual( + JSON.parse(insertSpan.attributes[dataAttributeName] as string) + .n, + results?.insertedCount + ); + + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + + it('should attach response hook data to the resulting span for find function', done => { + const span = trace.getTracer('default').startSpan('findRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .find({ a: 1 }) + .toArray() + .then(results => { + span.end(); + const spans = getTestSpans(); + const findSpan = spans[0]; + const hookAttributeValue = JSON.parse( + findSpan.attributes[dataAttributeName] as string + ); + + if (results) { + assert.strictEqual( + hookAttributeValue?.cursor?.firstBatch[0]._id, + results[0]._id.toString() + ); + } else { + throw new Error('Got an unexpected Results: ' + results); + } + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + + describe('with an invalid function', () => { + beforeEach(() => { + create({ + responseHook: (span: Span, result: MongoResponseHookInformation) => { + throw 'some error'; + }, + }); + }); + it('should not do any harm when throwing an exception', done => { + const span = trace.getTracer('default').startSpan('findRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .find({ a: 1 }) + .toArray() + .then(() => { + span.end(); + const spans = getTestSpans(); + assertSpans(spans, 'mongodb.find', SpanKind.CLIENT, 'find', URL); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + }); + + describe('Mixed operations with callback', () => { + it('should create a span for find after callback insert', done => { + const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; + const span = trace.getTracer('default').startSpan('insertRootSpan'); + context.with(trace.setSpan(context.active(), span), () => { + collection + .insertMany(insertData) + .then(() => { + span.end(); + const spans = getTestSpans(); + const mainSpan = spans[spans.length - 1]; + assertSpans( + spans, + 'mongodb.insert', + SpanKind.CLIENT, + 'insert', + URL + ); + resetMemoryExporter(); + + collection + .find({ a: 1 }) + .toArray() + .then(() => { + const spans2 = getTestSpans(); + spans2.push(mainSpan); + assertSpans( + spans2, + 'mongodb.find', + SpanKind.CLIENT, + 'find', + URL + ); + assert.strictEqual( + mainSpan.spanContext().spanId, + spans2[0].parentSpanId + ); + done(); + }) + .catch(err => { + done(err); + }); + }) + .catch(err => { + done(err); + }); + }); + }); + }); + + /** Should intercept command */ + describe('Removing Instrumentation', () => { + it('should unpatch plugin', () => { + assert.doesNotThrow(() => { + instrumentation.disable(); + }); + }); + + it('should not create a child span for query', done => { + const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; + const span = trace.getTracer('default').startSpan('insertRootSpan'); + collection + .insertMany(insertData) + .then(() => { + span.end(); + assert.strictEqual(getTestSpans().length, 1); + done(); + }) + .catch(err => { + done(err); + }); + }); + + it('should not create a child span for cursor', done => { + const span = trace.getTracer('default').startSpan('findRootSpan'); + collection + .find({}) + .toArray() + .then(() => { + span.end(); + assert.strictEqual(getTestSpans().length, 1); + done(); + }) + .catch(err => { + assert.ifError(err); + done(err); + }); + }); + + it('should not create a child span for command', done => { + const span = trace.getTracer('default').startSpan('indexRootSpan'); + collection + .createIndex({ a: 1 }) + .then(() => { + span.end(); + assert.strictEqual(getTestSpans().length, 1); + done(); + }) + .catch(err => { + done(err); + }); + }); + }); +}); From dccd90603bf52ba3b52eced9e8a6489bbdc78388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B2=92=E7=B2=92=E6=A9=99?= Date: Tue, 4 Jul 2023 23:25:43 +0800 Subject: [PATCH 26/94] chore(instrumentation-grpc): cleanup remnants of grpc-native support (#3886) --- experimental/CHANGELOG.md | 2 + .../package.json | 1 - .../src/grpc-js/clientUtils.ts | 55 ++++--- .../src/grpc-js/index.ts | 89 +++++------ .../src/grpc-js/serverUtils.ts | 39 +++-- .../src/grpc-js/types.ts | 28 ++-- .../src/index.ts | 2 +- .../src/instrumentation.ts | 9 +- .../src/internal-types.ts | 24 +-- .../src/utils.ts | 11 +- .../test/grpc-js.test.ts | 4 +- .../test/helper.ts | 144 +++++++++--------- .../test/utils/assertionUtils.ts | 6 +- 13 files changed, 209 insertions(+), 205 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index af2ea3a26..2ad8923f8 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -24,6 +24,8 @@ All notable changes to experimental packages in this project will be documented ### :house: (Internal) +* chore(instrumentation-grpc): Cleanup remnants of grpc-native support. [#3886](https://github.com/open-telemetry/opentelemetry-js/pull/3886) @llc1123 + ## 0.40.0 ### :boom: Breaking Change diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 2dc97dddd..f8b247ffa 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -60,7 +60,6 @@ "cross-var": "1.1.0", "lerna": "7.1.1", "mocha": "10.2.0", - "node-pre-gyp": "0.17.0", "nyc": "15.1.0", "semver": "7.5.3", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts index 1ffaab39b..c61edf771 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts @@ -14,27 +14,24 @@ * limitations under the License. */ -import { GrpcJsInstrumentation } from './'; -import type { GrpcClientFunc, SendUnaryDataCallback } from './types'; -import { - Span, - SpanStatusCode, - SpanStatus, - propagation, - context, -} from '@opentelemetry/api'; +import type { EventEmitter } from 'events'; +import type { Span, SpanStatus } from '@opentelemetry/api'; +import type { Client, Metadata, ServiceError } from '@grpc/grpc-js'; import type * as grpcJs from '@grpc/grpc-js'; +import type { GrpcJsInstrumentation } from './'; +import type { GrpcClientFunc, SendUnaryDataCallback } from './types'; +import type { metadataCaptureType } from '../internal-types'; + +import { SpanStatusCode, propagation, context } from '@opentelemetry/api'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { CALL_SPAN_ENDED } from './serverUtils'; +import { AttributeNames } from '../enums/AttributeNames'; +import { GRPC_STATUS_CODE_OK } from '../status-code'; import { _grpcStatusCodeToSpanStatus, _grpcStatusCodeToOpenTelemetryStatusCode, _methodIsIgnored, } from '../utils'; -import { CALL_SPAN_ENDED } from './serverUtils'; -import { EventEmitter } from 'events'; -import { AttributeNames } from '../enums/AttributeNames'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import { metadataCaptureType } from '../internal-types'; -import { GRPC_STATUS_CODE_OK } from '../status-code'; /** * Parse a package method list and return a list of methods to patch @@ -42,7 +39,7 @@ import { GRPC_STATUS_CODE_OK } from '../status-code'; */ export function getMethodsToWrap( this: GrpcJsInstrumentation, - client: typeof grpcJs.Client, + client: typeof Client, methods: { [key: string]: { originalName?: string } } ): string[] { const methodList: string[] = []; @@ -74,8 +71,8 @@ export function makeGrpcClientRemoteCall( metadataCapture: metadataCaptureType, original: GrpcClientFunc, args: unknown[], - metadata: grpcJs.Metadata, - self: grpcJs.Client + metadata: Metadata, + self: Client ): (span: Span) => EventEmitter { /** * Patches a callback so that the current span for this trace is also ended @@ -86,7 +83,7 @@ export function makeGrpcClientRemoteCall( callback: SendUnaryDataCallback ) { const wrappedFn: SendUnaryDataCallback = ( - err: grpcJs.ServiceError | null, + err: ServiceError | null, res?: ResponseType ) => { if (err) { @@ -145,7 +142,7 @@ export function makeGrpcClientRemoteCall( } }; context.bind(context.active(), call); - call.on('error', (err: grpcJs.ServiceError) => { + call.on('error', (err: ServiceError) => { if (call[CALL_SPAN_ENDED]) { return; } @@ -185,22 +182,22 @@ export function makeGrpcClientRemoteCall( */ export function getMetadata( this: GrpcJsInstrumentation, - grpcClient: typeof grpcJs, original: GrpcClientFunc, - args: Array -): grpcJs.Metadata { - let metadata: grpcJs.Metadata; + grpcClient: typeof grpcJs, + args: Array +): Metadata { + let metadata: Metadata; // This finds an instance of Metadata among the arguments. // A possible issue that could occur is if the 'options' parameter from // the user contains an '_internal_repr' as well as a 'getMap' function, // but this is an extremely rare case. - let metadataIndex = args.findIndex((arg: unknown | grpcJs.Metadata) => { + let metadataIndex = args.findIndex((arg: unknown | Metadata) => { return ( arg && typeof arg === 'object' && - (arg as grpcJs.Metadata)['internalRepr'] && // changed from _internal_repr in grpc --> @grpc/grpc-js https://github.com/grpc/grpc-node/blob/95289edcaf36979cccf12797cc27335da8d01f03/packages/grpc-js/src/metadata.ts#L88 - typeof (arg as grpcJs.Metadata).getMap === 'function' + (arg as Metadata)['internalRepr'] && // changed from _internal_repr in grpc --> @grpc/grpc-js https://github.com/grpc/grpc-node/blob/95289edcaf36979cccf12797cc27335da8d01f03/packages/grpc-js/src/metadata.ts#L88 + typeof (arg as Metadata).getMap === 'function' ); }); if (metadataIndex === -1) { @@ -214,7 +211,7 @@ export function getMetadata( } args.splice(metadataIndex, 0, metadata); } else { - metadata = args[metadataIndex] as grpcJs.Metadata; + metadata = args[metadataIndex] as Metadata; } return metadata; } @@ -224,7 +221,7 @@ export function getMetadata( * grpc receiver * @param metadata */ -export function setSpanContext(metadata: grpcJs.Metadata): void { +export function setSpanContext(metadata: Metadata): void { propagation.inject(context.active(), metadata, { set: (meta, k, v) => meta.set(k, v), }); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts index eaae47c8e..72ad45e3b 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts @@ -14,15 +14,21 @@ * limitations under the License. */ +import type { EventEmitter } from 'events'; + +import type { + Server, + serialize as Serialize, + deserialize as Deserialize, + Metadata, + Client, + ServiceDefinition, + loadPackageDefinition, + GrpcObject, +} from '@grpc/grpc-js'; import type * as grpcJs from '@grpc/grpc-js'; -import { - InstrumentationNodeModuleDefinition, - isWrapped, -} from '@opentelemetry/instrumentation'; -import { InstrumentationBase } from '@opentelemetry/instrumentation'; -import { GrpcInstrumentationConfig } from '../types'; -import { metadataCaptureType } from '../internal-types'; -import { + +import type { ServerCallWithMeta, SendUnaryDataCallback, ServerRegisterFunction, @@ -31,6 +37,9 @@ import { PackageDefinition, GrpcClientFunc, } from './types'; +import type { GrpcInstrumentationConfig } from '../types'; +import type { metadataCaptureType } from '../internal-types'; + import { context, propagation, @@ -39,6 +48,13 @@ import { SpanKind, trace, } from '@opentelemetry/api'; +import { + InstrumentationNodeModuleDefinition, + isWrapped, + InstrumentationBase, +} from '@opentelemetry/instrumentation'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; + import { shouldNotTraceServerCall, handleServerFunction, @@ -49,10 +65,8 @@ import { makeGrpcClientRemoteCall, getMetadata, } from './clientUtils'; -import { EventEmitter } from 'events'; import { _extractMethodAndService, metadataCapture, URI_REGEX } from '../utils'; import { AttributeValues } from '../enums/AttributeValues'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; export class GrpcJsInstrumentation extends InstrumentationBase { private _metadataCapture: metadataCaptureType; @@ -143,11 +157,11 @@ export class GrpcJsInstrumentation extends InstrumentationBase { const config = this.getConfig(); instrumentation._diag.debug('patched gRPC server'); return function register( - this: grpcJs.Server, + this: Server, name: string, handler: HandleCall, - serialize: grpcJs.serialize, - deserialize: grpcJs.deserialize, + serialize: Serialize, + deserialize: Deserialize, type: string ): boolean { const originalRegisterResult = originalRegister.call( @@ -171,13 +185,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { ) { const self = this; - if ( - shouldNotTraceServerCall( - call.metadata, - name, - config.ignoreGrpcMethods - ) - ) { + if (shouldNotTraceServerCall(name, config.ignoreGrpcMethods)) { return handleUntracedServerFunction( type, originalFunc, @@ -220,14 +228,13 @@ export class GrpcJsInstrumentation extends InstrumentationBase { instrumentation._wrap( call, 'sendMetadata', - originalSendMetadata => - (responseMetadata: grpcJs.Metadata) => { - instrumentation._metadataCapture.server.captureResponseMetadata( - span, - responseMetadata - ); - originalSendMetadata.call(call, responseMetadata); - } + originalSendMetadata => (responseMetadata: Metadata) => { + instrumentation._metadataCapture.server.captureResponseMetadata( + span, + responseMetadata + ); + originalSendMetadata.call(call, responseMetadata); + } ); context.with(trace.setSpan(context.active(), span), () => { @@ -246,7 +253,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { } ); return originalRegisterResult; - } as typeof grpcJs.Server.prototype.register; + } as typeof Server.prototype.register; }; } @@ -263,8 +270,8 @@ export class GrpcJsInstrumentation extends InstrumentationBase { return (original: MakeClientConstructorFunction) => { instrumentation._diag.debug('patching client'); return function makeClientConstructor( - this: typeof grpcJs.Client, - methods: grpcJs.ServiceDefinition, + this: typeof Client, + methods: ServiceDefinition, serviceName: string, options?: object ) { @@ -286,18 +293,18 @@ export class GrpcJsInstrumentation extends InstrumentationBase { private _patchLoadPackageDefinition(grpcClient: typeof grpcJs) { const instrumentation = this; instrumentation._diag.debug('patching loadPackageDefinition'); - return (original: typeof grpcJs.loadPackageDefinition) => { + return (original: typeof loadPackageDefinition) => { return function patchedLoadPackageDefinition( this: null, packageDef: PackageDefinition ) { - const result: grpcJs.GrpcObject = original.call( + const result: GrpcObject = original.call( this, packageDef - ) as grpcJs.GrpcObject; + ) as GrpcObject; instrumentation._patchLoadedPackage(grpcClient, result); return result; - } as typeof grpcJs.loadPackageDefinition; + } as typeof loadPackageDefinition; }; } @@ -310,13 +317,13 @@ export class GrpcJsInstrumentation extends InstrumentationBase { const instrumentation = this; return (original: GrpcClientFunc) => { instrumentation._diag.debug('patch all client methods'); - function clientMethodTrace(this: grpcJs.Client) { + function clientMethodTrace(this: Client) { const name = `grpc.${original.path.replace('/', '')}`; const args = [...arguments]; const metadata = getMetadata.call( instrumentation, - grpcClient, original, + grpcClient, args ); const { service, method } = _extractMethodAndService(original.path); @@ -369,7 +376,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { */ private _patchLoadedPackage( grpcClient: typeof grpcJs, - result: grpcJs.GrpcObject + result: GrpcObject ): void { Object.values(result).forEach(service => { if (typeof service === 'function') { @@ -380,11 +387,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { ); } else if (typeof service.format !== 'string') { // GrpcObject - this._patchLoadedPackage.call( - this, - grpcClient, - service as grpcJs.GrpcObject - ); + this._patchLoadedPackage.call(this, grpcClient, service as GrpcObject); } }); } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts index ecfbc3d95..ad07828e6 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts @@ -20,21 +20,31 @@ * error event should be processed. */ -import { context, Span, SpanStatusCode } from '@opentelemetry/api'; -import type * as grpcJs from '@grpc/grpc-js'; +import type { + ClientReadableStream, + handleBidiStreamingCall, + handleServerStreamingCall, + handleUnaryCall, + ServiceError, +} from '@grpc/grpc-js'; +import type { Span } from '@opentelemetry/api'; + import type { ServerCallWithMeta, SendUnaryDataCallback, GrpcEmitter, HandleCall, } from './types'; +import type { IgnoreMatcher } from '../types'; + +import { context, SpanStatusCode } from '@opentelemetry/api'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; + import { _grpcStatusCodeToOpenTelemetryStatusCode, _methodIsIgnored, } from '../utils'; -import { IgnoreMatcher } from '../types'; import { AttributeNames } from '../enums/AttributeNames'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import { GRPC_STATUS_CODE_OK } from '../status-code'; export const CALL_SPAN_ENDED = Symbol('opentelemetry call span ended'); @@ -46,8 +56,8 @@ function serverStreamAndBidiHandler( span: Span, call: GrpcEmitter, original: - | grpcJs.handleBidiStreamingCall - | grpcJs.handleServerStreamingCall + | handleBidiStreamingCall + | handleServerStreamingCall ): void { let spanEnded = false; const endSpan = () => { @@ -79,7 +89,7 @@ function serverStreamAndBidiHandler( endSpan(); }); - call.on('error', (err: grpcJs.ServiceError) => { + call.on('error', (err: ServiceError) => { if (call[CALL_SPAN_ENDED]) { return; } @@ -111,11 +121,11 @@ function clientStreamAndUnaryHandler( call: ServerCallWithMeta, callback: SendUnaryDataCallback, original: - | grpcJs.handleUnaryCall - | grpcJs.ClientReadableStream + | handleUnaryCall + | ClientReadableStream ): void { const patchedCallback: SendUnaryDataCallback = ( - err: grpcJs.ServiceError | null, + err: ServiceError | null, value?: ResponseType ) => { if (err) { @@ -166,8 +176,8 @@ export function handleServerFunction( call, callback, originalFunc as - | grpcJs.handleUnaryCall - | grpcJs.ClientReadableStream + | handleUnaryCall + | ClientReadableStream ); case 'serverStream': case 'server_stream': @@ -176,8 +186,8 @@ export function handleServerFunction( span, call, originalFunc as - | grpcJs.handleBidiStreamingCall - | grpcJs.handleServerStreamingCall + | handleBidiStreamingCall + | handleServerStreamingCall ); default: break; @@ -212,7 +222,6 @@ export function handleUntracedServerFunction( * Returns true if the server call should not be traced. */ export function shouldNotTraceServerCall( - metadata: grpcJs.Metadata, methodName: string, ignoreGrpcMethods?: IgnoreMatcher[] ): boolean { diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts index e0ae1545d..e9f15b45a 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts @@ -14,29 +14,38 @@ * limitations under the License. */ -import type * as grpcJs from '@grpc/grpc-js'; import type { EventEmitter } from 'events'; import type { CALL_SPAN_ENDED } from './serverUtils'; +import type { + requestCallback, + ServerUnaryCall, + ServerReadableStream, + ServerWritableStream, + ServerDuplexStream, + Metadata, + Server, + makeGenericClientConstructor, +} from '@grpc/grpc-js'; /** * Server Unary callback type */ -export type SendUnaryDataCallback = grpcJs.requestCallback; +export type SendUnaryDataCallback = requestCallback; /** * Intersection type of all grpc server call types */ export type ServerCall = - | grpcJs.ServerUnaryCall - | grpcJs.ServerReadableStream - | grpcJs.ServerWritableStream - | grpcJs.ServerDuplexStream; + | ServerUnaryCall + | ServerReadableStream + | ServerWritableStream + | ServerDuplexStream; /** * {@link ServerCall} ServerCall extended with misc. missing utility types */ export type ServerCallWithMeta = ServerCall & { - metadata: grpcJs.Metadata; + metadata: Metadata; }; /** @@ -53,10 +62,9 @@ export type GrpcClientFunc = ((...args: unknown[]) => GrpcEmitter) & { responseStream: boolean; }; -export type ServerRegisterFunction = typeof grpcJs.Server.prototype.register; +export type ServerRegisterFunction = typeof Server.prototype.register; -export type MakeClientConstructorFunction = - typeof grpcJs.makeGenericClientConstructor; +export type MakeClientConstructorFunction = typeof makeGenericClientConstructor; export type { HandleCall } from '@grpc/grpc-js/build/src/server-call'; export type { PackageDefinition } from '@grpc/grpc-js/build/src/make-client'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts index 26ea0efdb..5e1bb947d 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts @@ -15,4 +15,4 @@ */ export * from './instrumentation'; -export { GrpcInstrumentationConfig } from './types'; +export type { GrpcInstrumentationConfig } from './types'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts index d597beaae..bb6e095cf 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts @@ -14,10 +14,11 @@ * limitations under the License. */ -import { GrpcInstrumentationConfig } from './types'; +import type { GrpcInstrumentationConfig } from './types'; +import type { MeterProvider, TracerProvider } from '@opentelemetry/api'; + import { VERSION } from './version'; import { GrpcJsInstrumentation } from './grpc-js'; -import * as api from '@opentelemetry/api'; /** The metadata key under which span context is stored as a binary value. */ export const GRPC_TRACE_KEY = 'grpc-trace-bin'; @@ -68,7 +69,7 @@ export class GrpcInstrumentation { * Sets MeterProvider to this plugin * @param meterProvider */ - public setMeterProvider(meterProvider: api.MeterProvider) { + public setMeterProvider(meterProvider: MeterProvider) { this._grpcJsInstrumentation.setMeterProvider(meterProvider); } @@ -76,7 +77,7 @@ export class GrpcInstrumentation { * Sets TraceProvider to this plugin * @param tracerProvider */ - public setTracerProvider(tracerProvider: api.TracerProvider) { + public setTracerProvider(tracerProvider: TracerProvider) { this._grpcJsInstrumentation.setTracerProvider(tracerProvider); } } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts index 594ad7ce0..50d337b63 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/internal-types.ts @@ -14,28 +14,16 @@ * limitations under the License. */ -import { Span } from '@opentelemetry/api'; -import type * as grpcJsTypes from '@grpc/grpc-js'; +import type { Span } from '@opentelemetry/api'; +import type { Metadata } from '@grpc/grpc-js'; export type metadataCaptureType = { client: { - captureRequestMetadata: ( - span: Span, - metadata: grpcJsTypes.Metadata - ) => void; - captureResponseMetadata: ( - span: Span, - metadata: grpcJsTypes.Metadata - ) => void; + captureRequestMetadata: (span: Span, metadata: Metadata) => void; + captureResponseMetadata: (span: Span, metadata: Metadata) => void; }; server: { - captureRequestMetadata: ( - span: Span, - metadata: grpcJsTypes.Metadata - ) => void; - captureResponseMetadata: ( - span: Span, - metadata: grpcJsTypes.Metadata - ) => void; + captureRequestMetadata: (span: Span, metadata: Metadata) => void; + captureResponseMetadata: (span: Span, metadata: Metadata) => void; }; }; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts index d9e542f50..3cfbfc1f5 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts @@ -14,9 +14,10 @@ * limitations under the License. */ -import { SpanStatusCode, SpanStatus, Span } from '@opentelemetry/api'; -import type * as grpcJsTypes from '@grpc/grpc-js'; -import { IgnoreMatcher } from './types'; +import { SpanStatusCode } from '@opentelemetry/api'; +import type { SpanStatus, Span } from '@opentelemetry/api'; +import type { status as GrpcStatus, Metadata } from '@grpc/grpc-js'; +import type { IgnoreMatcher } from './types'; // e.g., "dns:otel-productcatalogservice:8080" or "otel-productcatalogservice:8080" or "127.0.0.1:8080" export const URI_REGEX = @@ -42,7 +43,7 @@ export const findIndex: (args: T[], fn: (arg: T) => boolean) => number = ( * @param status */ export const _grpcStatusCodeToOpenTelemetryStatusCode = ( - status?: grpcJsTypes.status + status?: GrpcStatus ): SpanStatusCode => { if (status !== undefined && status === 0) { return SpanStatusCode.UNSET; @@ -127,7 +128,7 @@ export function metadataCapture( ]) ); - return (span: Span, metadata: grpcJsTypes.Metadata) => { + return (span: Span, metadata: Metadata) => { for (const [ capturedMetadata, normalizedMetadata, diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts index 624d267a2..b7e221029 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts @@ -21,8 +21,8 @@ const instrumentation = new GrpcInstrumentation(); instrumentation.enable(); instrumentation.disable(); -import * as grpcJs from '@grpc/grpc-js'; +import '@grpc/grpc-js'; describe('#grpc-js', () => { - runTests(instrumentation, 'grpc', grpcJs, 12346); + runTests(instrumentation, 'grpc', 12346); }); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index 7cdc85d26..693cdeab4 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -32,7 +32,21 @@ import { } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; import * as protoLoader from '@grpc/proto-loader'; -import type * as grpcJs from '@grpc/grpc-js'; +import { + status as GrpcStatus, + requestCallback, + ServerUnaryCall, + ServerReadableStream, + ServerWritableStream, + ServerDuplexStream, + Client, + Metadata, + ServiceError, + Server, + ServerCredentials, + credentials, + loadPackageDefinition, +} from '@grpc/grpc-js'; import { assertPropagation, assertSpan } from './utils/assertionUtils'; import { promisify } from 'util'; import type { GrpcInstrumentation } from '../src'; @@ -53,17 +67,7 @@ interface TestRequestResponse { num: number; } -type ServiceError = grpcJs.ServiceError; -type Client = grpcJs.Client; -type Server = grpcJs.Server; -type ServerUnaryCall = grpcJs.ServerUnaryCall; -type RequestCallback = grpcJs.requestCallback; -type ServerReadableStream = grpcJs.ServerReadableStream; -type ServerWriteableStream = grpcJs.ServerWritableStream; -type ServerDuplexStream = grpcJs.ServerDuplexStream; -type Metadata = grpcJs.Metadata; - -type TestGrpcClient = (typeof grpcJs)['Client'] & { +type TestGrpcClient = Client & { unaryMethodWithMetadata: any; unaryMethod: any; UnaryMethod: any; @@ -108,10 +112,9 @@ const checkEqual = export const runTests = ( plugin: GrpcInstrumentation, moduleName: string, - grpc: typeof grpcJs, grpcPort: number ) => { - const MAX_ERROR_STATUS = grpc.status.UNAUTHENTICATED; + const MAX_ERROR_STATUS = GrpcStatus.UNAUTHENTICATED; const grpcClient = { unaryMethodWithMetadata: ( @@ -137,7 +140,7 @@ export const runTests = ( unaryMethod: ( client: TestGrpcClient, request: TestRequestResponse, - metadata: Metadata = new grpc.Metadata() + metadata = new Metadata() ): Promise => { return new Promise((resolve, reject) => { return client.unaryMethod( @@ -157,7 +160,7 @@ export const runTests = ( UnaryMethod: ( client: TestGrpcClient, request: TestRequestResponse, - metadata: Metadata = new grpc.Metadata() + metadata = new Metadata() ): Promise => { return new Promise((resolve, reject) => { return client.UnaryMethod( @@ -177,7 +180,7 @@ export const runTests = ( camelCaseMethod: ( client: TestGrpcClient, request: TestRequestResponse, - metadata: Metadata = new grpc.Metadata() + metadata = new Metadata() ): Promise => { return new Promise((resolve, reject) => { return client.camelCaseMethod( @@ -197,7 +200,7 @@ export const runTests = ( clientStreamMethod: ( client: TestGrpcClient, request: TestRequestResponse[], - metadata: Metadata = new grpc.Metadata() + metadata = new Metadata() ): Promise => { return new Promise((resolve, reject) => { const writeStream = client.clientStreamMethod( @@ -221,7 +224,7 @@ export const runTests = ( serverStreamMethod: ( client: TestGrpcClient, request: TestRequestResponse, - metadata: Metadata = new grpc.Metadata() + metadata = new Metadata() ): Promise => { return new Promise((resolve, reject) => { const result: TestRequestResponse[] = []; @@ -242,7 +245,7 @@ export const runTests = ( bidiStreamMethod: ( client: TestGrpcClient, request: TestRequestResponse[], - metadata: Metadata = new grpc.Metadata() + metadata = new Metadata() ): Promise => { return new Promise((resolve, reject) => { const result: TestRequestResponse[] = []; @@ -280,8 +283,8 @@ export const runTests = ( return result; }; - async function startServer(grpc: typeof grpcJs, proto: any) { - const server = new grpc.Server(); + async function startServer(proto: any) { + const server = new Server(); function getError(msg: string, code: number): ServiceError | null { const err: ServiceError = { @@ -290,7 +293,7 @@ export const runTests = ( message: msg, code, details: msg, - metadata: new grpc.Metadata(), + metadata: new Metadata(), }; return err; } @@ -302,56 +305,49 @@ export const runTests = ( // This method returns the request unaryMethodWithMetadata( - call: ServerUnaryCall, - callback: RequestCallback + call: ServerUnaryCall, + callback: requestCallback ) { - const serverMetadata: any = new grpc.Metadata(); + const serverMetadata = new Metadata(); serverMetadata.add('server_metadata_key', 'server_metadata_value'); call.sendMetadata(serverMetadata); call.request.num <= MAX_ERROR_STATUS ? callback( - getError( - 'Unary Method with Metadata Error', - call.request.num - ) as grpcJs.ServiceError + getError('Unary Method with Metadata Error', call.request.num) ) : callback(null, { num: call.request.num }); }, // This method returns the request - unaryMethod(call: ServerUnaryCall, callback: RequestCallback) { + unaryMethod( + call: ServerUnaryCall, + callback: requestCallback + ) { call.request.num <= MAX_ERROR_STATUS - ? callback( - getError( - 'Unary Method Error', - call.request.num - ) as grpcJs.ServiceError - ) + ? callback(getError('Unary Method Error', call.request.num)) : callback(null, { num: call.request.num }); }, // This method returns the request - camelCaseMethod(call: ServerUnaryCall, callback: RequestCallback) { + camelCaseMethod( + call: ServerUnaryCall, + callback: requestCallback + ) { call.request.num <= MAX_ERROR_STATUS - ? callback( - getError( - 'Unary Method Error', - call.request.num - ) as grpcJs.ServiceError - ) + ? callback(getError('Unary Method Error', call.request.num)) : callback(null, { num: call.request.num }); }, // This method sums the requests clientStreamMethod( - call: ServerReadableStream, - callback: RequestCallback + call: ServerReadableStream, + callback: requestCallback ) { let sum = 0; let hasError = false; - let code = grpc.status.OK; + let code = GrpcStatus.OK; call.on('data', (data: TestRequestResponse) => { sum += data.num; if (data.num <= MAX_ERROR_STATUS) { @@ -368,7 +364,7 @@ export const runTests = ( // This method returns an array that replicates the request, request.num of // times - serverStreamMethod: (call: ServerWriteableStream) => { + serverStreamMethod: (call: ServerWritableStream) => { const result = replicate(call.request); if (call.request.num <= MAX_ERROR_STATUS) { @@ -385,7 +381,7 @@ export const runTests = ( }, // This method returns the request - bidiStreamMethod: (call: ServerDuplexStream) => { + bidiStreamMethod: (call: ServerDuplexStream) => { call.on('data', (data: TestRequestResponse) => { if (data.num <= MAX_ERROR_STATUS) { call.emit( @@ -405,16 +401,16 @@ export const runTests = ( await bindAwait.call( server, 'localhost:' + grpcPort, - grpc.ServerCredentials.createInsecure() as grpcJs.ServerCredentials + ServerCredentials.createInsecure() ); server.start(); return server; } - function createClient(grpc: typeof grpcJs, proto: any) { + function createClient(proto: any) { return new proto.GrpcTester( 'localhost:' + grpcPort, - grpc.credentials.createInsecure() + credentials.createInsecure() ); } @@ -503,7 +499,7 @@ export const runTests = ( ) => { const validations = { name: `grpc.pkg_test.GrpcTester/${methodName}`, - status: grpc.status.OK, + status: GrpcStatus.OK, netPeerName: 'localhost', netPeerPort: grpcPort, }; @@ -770,10 +766,10 @@ export const runTests = ( plugin.enable(); const packageDefinition = await protoLoader.load(PROTO_PATH, options); - const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(grpc, proto); - client = createClient(grpc, proto); + server = await startServer(proto); + client = createClient(proto); }); after(done => { @@ -792,9 +788,9 @@ export const runTests = ( methodList.forEach(method => { describe(`Test error raising for grpc remote ${method.description}`, () => { - Object.keys(grpc.status).forEach((statusKey: string) => { - const errorCode = Number(grpc.status[statusKey as any]); - if (errorCode > grpc.status.OK) { + Object.keys(GrpcStatus).forEach((statusKey: string) => { + const errorCode = Number(GrpcStatus[statusKey as any]); + if (errorCode > GrpcStatus.OK) { runErrorTest(method, statusKey, errorCode, provider); } }); @@ -813,10 +809,10 @@ export const runTests = ( plugin.disable(); const packageDefinition = await protoLoader.load(PROTO_PATH, options); - const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(grpc, proto); - client = createClient(grpc, proto); + server = await startServer(proto); + client = createClient(proto); }); after(done => { @@ -847,10 +843,10 @@ export const runTests = ( plugin.enable(); const packageDefinition = await protoLoader.load(PROTO_PATH, options); - const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(grpc, proto); - client = createClient(grpc, proto); + server = await startServer(proto); + client = createClient(proto); }); after(done => { @@ -891,10 +887,10 @@ export const runTests = ( plugin.enable(); const packageDefinition = await protoLoader.load(PROTO_PATH, options); - const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(grpc, proto); - client = createClient(grpc, proto); + server = await startServer(proto); + client = createClient(proto); }); after(done => { @@ -921,9 +917,9 @@ export const runTests = ( plugin.enable(); const packageDefinition = await protoLoader.load(PROTO_PATH, options); - const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + const proto = loadPackageDefinition(packageDefinition).pkg_test; - client = createClient(grpc, proto); + client = createClient(proto); }); after(done => { @@ -943,7 +939,7 @@ export const runTests = ( const provider = new NodeTracerProvider(); provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter)); - const clientMetadata: Metadata = new grpc.Metadata(); + const clientMetadata = new Metadata(); clientMetadata.add('client_metadata_key', 'client_metadata_value'); const customMetadataMethod: TestGrpcCall = { @@ -978,10 +974,10 @@ export const runTests = ( plugin.enable(); const packageDefinition = await protoLoader.load(PROTO_PATH, options); - const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(grpc, proto); - client = createClient(grpc, proto); + server = await startServer(proto); + client = createClient(proto); }); after(done => { diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts index fcdd546b3..1b7966639 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts @@ -16,7 +16,7 @@ import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; import * as assert from 'assert'; -import type * as grpcJs from '@grpc/grpc-js'; +import type { status as GrpcStatus } from '@grpc/grpc-js'; import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; import { hrTimeToMilliseconds, @@ -25,7 +25,7 @@ import { import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; export const grpcStatusCodeToOpenTelemetryStatusCode = ( - status: grpcJs.status + status: GrpcStatus ): SpanStatusCode => { if (status !== undefined && status === 0) { return SpanStatusCode.UNSET; @@ -39,7 +39,7 @@ export const assertSpan = ( kind: SpanKind, validations: { name: string; - status: grpcJs.status; + status: GrpcStatus; netPeerName?: string; netPeerPort?: number; } From ea160d9c5c13fb32b39129397c43913d63c8b29f Mon Sep 17 00:00:00 2001 From: Abinet18 <35442169+Abinet18@users.noreply.github.com> Date: Wed, 5 Jul 2023 01:29:28 -0700 Subject: [PATCH 27/94] fix: add secureConnectionStart to https only (#3879) Co-authored-by: t2t2 Co-authored-by: Marc Pichler --- CHANGELOG.md | 1 + .../test/fetch.test.ts | 188 ++++++------- .../test/xhr.test.ts | 260 ++++++------------ .../opentelemetry-sdk-trace-web/src/utils.ts | 7 +- .../test/utils.test.ts | 11 +- 5 files changed, 188 insertions(+), 279 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7de3dc1f1..42ca36c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) +* fix(sdk-trace-web): add secureConnectionStart to https only [#3879](https://github.com/open-telemetry/opentelemetry-js/pull/3879) @Abinet18 * fix(http-instrumentation): stop listening to `request`'s `close` event once it has emitted `response` [#3625](https://github.com/open-telemetry/opentelemetry-js/pull/3625) @SimenB * fix(sdk-node): fix initialization in bundled environments by not loading @opentelemetry/exporter-jaeger [#3739](https://github.com/open-telemetry/opentelemetry-js/pull/3739) @pichlermarc diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts index 318e0f98c..14dcec997 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts @@ -139,6 +139,19 @@ function createFakePerformanceObs(url: string) { return FakePerfObs; } +function testForCorrectEvents( + events: tracing.TimedEvent[], + eventNames: string[] +) { + for (let i = 0; i < events.length; i++) { + assert.strictEqual( + events[i].name, + eventNames[i], + `event ${eventNames[i]} is not defined` + ); + } +} + describe('fetch', () => { let contextManager: ZoneContextManager; let lastResponse: any | undefined; @@ -152,6 +165,7 @@ describe('fetch', () => { let fetchInstrumentation: FetchInstrumentation; const url = 'http://localhost:8090/get'; + const secureUrl = 'https://localhost:8090/get'; const badUrl = 'http://foo.bar.com/get'; const clearData = () => { @@ -399,53 +413,17 @@ describe('fetch', () => { it('span should have correct events', () => { const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; const events = span.events; - assert.strictEqual(events.length, 9, 'number of events is wrong'); - - assert.strictEqual( - events[0].name, + assert.strictEqual(events.length, 8, 'number of events is wrong'); + testForCorrectEvents(events, [ PTN.FETCH_START, - `event ${PTN.FETCH_START} is not defined` - ); - assert.strictEqual( - events[1].name, PTN.DOMAIN_LOOKUP_START, - `event ${PTN.DOMAIN_LOOKUP_START} is not defined` - ); - assert.strictEqual( - events[2].name, PTN.DOMAIN_LOOKUP_END, - `event ${PTN.DOMAIN_LOOKUP_END} is not defined` - ); - assert.strictEqual( - events[3].name, PTN.CONNECT_START, - `event ${PTN.CONNECT_START} is not defined` - ); - assert.strictEqual( - events[4].name, - PTN.SECURE_CONNECTION_START, - `event ${PTN.SECURE_CONNECTION_START} is not defined` - ); - assert.strictEqual( - events[5].name, PTN.CONNECT_END, - `event ${PTN.CONNECT_END} is not defined` - ); - assert.strictEqual( - events[6].name, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); - assert.strictEqual( - events[7].name, PTN.RESPONSE_START, - `event ${PTN.RESPONSE_START} is not defined` - ); - assert.strictEqual( - events[8].name, PTN.RESPONSE_END, - `event ${PTN.RESPONSE_END} is not defined` - ); + ]); }); it('should create a span for preflight request', () => { @@ -479,53 +457,17 @@ describe('fetch', () => { it('preflight request span should have correct events', () => { const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; const events = span.events; - assert.strictEqual(events.length, 9, 'number of events is wrong'); - - assert.strictEqual( - events[0].name, + assert.strictEqual(events.length, 8, 'number of events is wrong'); + testForCorrectEvents(events, [ PTN.FETCH_START, - `event ${PTN.FETCH_START} is not defined` - ); - assert.strictEqual( - events[1].name, PTN.DOMAIN_LOOKUP_START, - `event ${PTN.DOMAIN_LOOKUP_START} is not defined` - ); - assert.strictEqual( - events[2].name, PTN.DOMAIN_LOOKUP_END, - `event ${PTN.DOMAIN_LOOKUP_END} is not defined` - ); - assert.strictEqual( - events[3].name, PTN.CONNECT_START, - `event ${PTN.CONNECT_START} is not defined` - ); - assert.strictEqual( - events[4].name, - PTN.SECURE_CONNECTION_START, - `event ${PTN.SECURE_CONNECTION_START} is not defined` - ); - assert.strictEqual( - events[5].name, PTN.CONNECT_END, - `event ${PTN.CONNECT_END} is not defined` - ); - assert.strictEqual( - events[6].name, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); - assert.strictEqual( - events[7].name, PTN.RESPONSE_START, - `event ${PTN.RESPONSE_START} is not defined` - ); - assert.strictEqual( - events[8].name, PTN.RESPONSE_END, - `event ${PTN.RESPONSE_END} is not defined` - ); + ]); }); it('should set trace headers', () => { @@ -639,6 +581,51 @@ describe('fetch', () => { }); }); + describe('when request is secure and successful', () => { + beforeEach(async () => { + const propagateTraceHeaderCorsUrls = [secureUrl]; + await prepareData(secureUrl, { propagateTraceHeaderCorsUrls }); + }); + + afterEach(() => { + clearData(); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const events = span.events; + assert.strictEqual(events.length, 9, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); + }); + + it('preflight request span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + assert.strictEqual(events.length, 9, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); + }); + }); + describe('applyCustomAttributesOnSpan option', () => { const prepare = async ( url: string, @@ -815,13 +802,18 @@ describe('fetch', () => { `Wrong number of spans: ${exportSpy.args.length}` ); - assert.strictEqual(events.length, 9, 'number of events is wrong'); + assert.strictEqual(events.length, 8, 'number of events is wrong'); - assert.strictEqual( - events[6].name, + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.CONNECT_END, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); }); }); @@ -844,12 +836,17 @@ describe('fetch', () => { `Wrong number of spans: ${exportSpy.args.length}` ); - assert.strictEqual(events.length, 9, 'number of events is wrong'); - assert.strictEqual( - events[6].name, + assert.strictEqual(events.length, 8, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.CONNECT_END, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); }); it('should have an absolute http.url attribute', () => { @@ -882,12 +879,17 @@ describe('fetch', () => { 2, `Wrong number of spans: ${exportSpy.args.length}` ); - assert.strictEqual(events.length, 9, 'number of events is wrong'); - assert.strictEqual( - events[6].name, + assert.strictEqual(events.length, 8, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.CONNECT_END, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); }); }); diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts index b304bb9c0..c3614a42e 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts @@ -162,6 +162,19 @@ function createFakePerformanceObs(url: string) { return FakePerfObs; } +function testForCorrectEvents( + events: tracing.TimedEvent[], + eventNames: string[] +) { + for (let i = 0; i < events.length; i++) { + assert.strictEqual( + events[i].name, + eventNames[i], + `event ${eventNames[i]} is not defined` + ); + } +} + describe('xhr', () => { const asyncTests = [{ async: true }, { async: false }]; asyncTests.forEach(test => { @@ -200,6 +213,7 @@ describe('xhr', () => { let rootSpan: api.Span; let spyEntries: any; const url = 'http://localhost:8090/xml-http-request.js'; + const secureUrl = 'https://localhost:8090/xml-http-request.js'; let fakeNow = 0; let xmlHttpRequestInstrumentation: XMLHttpRequestInstrumentation; @@ -383,69 +397,20 @@ describe('xhr', () => { it('span should have correct events', () => { const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; const events = span.events; - - assert.strictEqual( - events[0].name, + testForCorrectEvents(events, [ EventNames.METHOD_OPEN, - `event ${EventNames.METHOD_OPEN} is not defined` - ); - assert.strictEqual( - events[1].name, EventNames.METHOD_SEND, - `event ${EventNames.METHOD_SEND} is not defined` - ); - assert.strictEqual( - events[2].name, PTN.FETCH_START, - `event ${PTN.FETCH_START} is not defined` - ); - assert.strictEqual( - events[3].name, PTN.DOMAIN_LOOKUP_START, - `event ${PTN.DOMAIN_LOOKUP_START} is not defined` - ); - assert.strictEqual( - events[4].name, PTN.DOMAIN_LOOKUP_END, - `event ${PTN.DOMAIN_LOOKUP_END} is not defined` - ); - assert.strictEqual( - events[5].name, PTN.CONNECT_START, - `event ${PTN.CONNECT_START} is not defined` - ); - assert.strictEqual( - events[6].name, - PTN.SECURE_CONNECTION_START, - `event ${PTN.SECURE_CONNECTION_START} is not defined` - ); - assert.strictEqual( - events[7].name, PTN.CONNECT_END, - `event ${PTN.CONNECT_END} is not defined` - ); - assert.strictEqual( - events[8].name, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); - assert.strictEqual( - events[9].name, PTN.RESPONSE_START, - `event ${PTN.RESPONSE_START} is not defined` - ); - assert.strictEqual( - events[10].name, PTN.RESPONSE_END, - `event ${PTN.RESPONSE_END} is not defined` - ); - assert.strictEqual( - events[11].name, EventNames.EVENT_LOAD, - `event ${EventNames.EVENT_LOAD} is not defined` - ); - - assert.strictEqual(events.length, 12, 'number of events is wrong'); + ]); + assert.strictEqual(events.length, 11, 'number of events is wrong'); }); it('should create a span for preflight request', () => { @@ -479,53 +444,17 @@ describe('xhr', () => { it('preflight request span should have correct events', () => { const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; const events = span.events; - assert.strictEqual(events.length, 9, 'number of events is wrong'); - - assert.strictEqual( - events[0].name, + assert.strictEqual(events.length, 8, 'number of events is wrong'); + testForCorrectEvents(events, [ PTN.FETCH_START, - `event ${PTN.FETCH_START} is not defined` - ); - assert.strictEqual( - events[1].name, PTN.DOMAIN_LOOKUP_START, - `event ${PTN.DOMAIN_LOOKUP_START} is not defined` - ); - assert.strictEqual( - events[2].name, PTN.DOMAIN_LOOKUP_END, - `event ${PTN.DOMAIN_LOOKUP_END} is not defined` - ); - assert.strictEqual( - events[3].name, PTN.CONNECT_START, - `event ${PTN.CONNECT_START} is not defined` - ); - assert.strictEqual( - events[4].name, - PTN.SECURE_CONNECTION_START, - `event ${PTN.SECURE_CONNECTION_START} is not defined` - ); - assert.strictEqual( - events[5].name, PTN.CONNECT_END, - `event ${PTN.CONNECT_END} is not defined` - ); - assert.strictEqual( - events[6].name, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); - assert.strictEqual( - events[7].name, PTN.RESPONSE_START, - `event ${PTN.RESPONSE_START} is not defined` - ); - assert.strictEqual( - events[8].name, PTN.RESPONSE_END, - `event ${PTN.RESPONSE_END} is not defined` - ); + ]); }); it('should NOT clear the resources', () => { @@ -534,6 +463,53 @@ describe('xhr', () => { 'resources have been cleared' ); }); + describe('When making https requests', () => { + beforeEach(done => { + clearData(); + // this won't generate a preflight span + const propagateTraceHeaderCorsUrls = [secureUrl]; + prepareData(done, secureUrl, { + propagateTraceHeaderCorsUrls, + }); + }); + + it('span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[1][0][0]; + const events = span.events; + testForCorrectEvents(events, [ + EventNames.METHOD_OPEN, + EventNames.METHOD_SEND, + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + EventNames.EVENT_LOAD, + ]); + assert.strictEqual(events.length, 12, 'number of events is wrong'); + }); + + it('preflight request span should have correct events', () => { + const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; + const events = span.events; + assert.strictEqual(events.length, 9, 'number of events is wrong'); + testForCorrectEvents(events, [ + PTN.FETCH_START, + PTN.DOMAIN_LOOKUP_START, + PTN.DOMAIN_LOOKUP_END, + PTN.CONNECT_START, + PTN.SECURE_CONNECTION_START, + PTN.CONNECT_END, + PTN.REQUEST_START, + PTN.RESPONSE_START, + PTN.RESPONSE_END, + ]); + }); + }); describe('AND origin match with window.location', () => { beforeEach(done => { @@ -786,11 +762,11 @@ describe('xhr', () => { assert.strictEqual( events.length, - 12, + 11, `number of events is wrong: ${events.length}` ); assert.strictEqual( - events[8].name, + events[7].name, PTN.REQUEST_START, `event ${PTN.REQUEST_START} is not defined` ); @@ -1008,67 +984,20 @@ describe('xhr', () => { const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; const events = span.events; - assert.strictEqual( - events[0].name, + testForCorrectEvents(events, [ EventNames.METHOD_OPEN, - `event ${EventNames.METHOD_OPEN} is not defined` - ); - assert.strictEqual( - events[1].name, EventNames.METHOD_SEND, - `event ${EventNames.METHOD_SEND} is not defined` - ); - assert.strictEqual( - events[2].name, PTN.FETCH_START, - `event ${PTN.FETCH_START} is not defined` - ); - assert.strictEqual( - events[3].name, PTN.DOMAIN_LOOKUP_START, - `event ${PTN.DOMAIN_LOOKUP_START} is not defined` - ); - assert.strictEqual( - events[4].name, PTN.DOMAIN_LOOKUP_END, - `event ${PTN.DOMAIN_LOOKUP_END} is not defined` - ); - assert.strictEqual( - events[5].name, PTN.CONNECT_START, - `event ${PTN.CONNECT_START} is not defined` - ); - assert.strictEqual( - events[6].name, PTN.SECURE_CONNECTION_START, - `event ${PTN.SECURE_CONNECTION_START} is not defined` - ); - assert.strictEqual( - events[7].name, PTN.CONNECT_END, - `event ${PTN.CONNECT_END} is not defined` - ); - assert.strictEqual( - events[8].name, PTN.REQUEST_START, - `event ${PTN.REQUEST_START} is not defined` - ); - assert.strictEqual( - events[9].name, PTN.RESPONSE_START, - `event ${PTN.RESPONSE_START} is not defined` - ); - assert.strictEqual( - events[10].name, PTN.RESPONSE_END, - `event ${PTN.RESPONSE_END} is not defined` - ); - assert.strictEqual( - events[11].name, EventNames.EVENT_ERROR, - `event ${EventNames.EVENT_ERROR} is not defined` - ); - + ]); assert.strictEqual(events.length, 12, 'number of events is wrong'); }); }); @@ -1123,23 +1052,11 @@ describe('xhr', () => { it('span should have correct events', () => { const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; const events = span.events; - - assert.strictEqual( - events[0].name, + testForCorrectEvents(events, [ EventNames.METHOD_OPEN, - `event ${EventNames.METHOD_OPEN} is not defined` - ); - assert.strictEqual( - events[1].name, EventNames.METHOD_SEND, - `event ${EventNames.METHOD_SEND} is not defined` - ); - assert.strictEqual( - events[2].name, EventNames.EVENT_ERROR, - `event ${EventNames.EVENT_ERROR} is not defined` - ); - + ]); assert.strictEqual(events.length, 3, 'number of events is wrong'); }); }); @@ -1201,23 +1118,11 @@ describe('xhr', () => { it('span should have correct events', () => { const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; const events = span.events; - - assert.strictEqual( - events[0].name, + testForCorrectEvents(events, [ EventNames.METHOD_OPEN, - `event ${EventNames.METHOD_OPEN} is not defined` - ); - assert.strictEqual( - events[1].name, EventNames.METHOD_SEND, - `event ${EventNames.METHOD_SEND} is not defined` - ); - assert.strictEqual( - events[2].name, EventNames.EVENT_ABORT, - `event ${EventNames.EVENT_ABORT} is not defined` - ); - + ]); assert.strictEqual(events.length, 3, 'number of events is wrong'); }); }); @@ -1280,22 +1185,11 @@ describe('xhr', () => { const span: tracing.ReadableSpan = exportSpy.args[0][0][0]; const events = span.events; - assert.strictEqual( - events[0].name, + testForCorrectEvents(events, [ EventNames.METHOD_OPEN, - `event ${EventNames.METHOD_OPEN} is not defined` - ); - assert.strictEqual( - events[1].name, EventNames.METHOD_SEND, - `event ${EventNames.METHOD_SEND} is not defined` - ); - assert.strictEqual( - events[2].name, EventNames.EVENT_TIMEOUT, - `event ${EventNames.EVENT_TIMEOUT} is not defined` - ); - + ]); assert.strictEqual(events.length, 3, 'number of events is wrong'); }); }); diff --git a/packages/opentelemetry-sdk-trace-web/src/utils.ts b/packages/opentelemetry-sdk-trace-web/src/utils.ts index 2027abc42..b3f583676 100644 --- a/packages/opentelemetry-sdk-trace-web/src/utils.ts +++ b/packages/opentelemetry-sdk-trace-web/src/utils.ts @@ -85,7 +85,12 @@ export function addSpanNetworkEvents( addSpanNetworkEvent(span, PTN.DOMAIN_LOOKUP_START, resource); addSpanNetworkEvent(span, PTN.DOMAIN_LOOKUP_END, resource); addSpanNetworkEvent(span, PTN.CONNECT_START, resource); - addSpanNetworkEvent(span, PTN.SECURE_CONNECTION_START, resource); + if ( + hasKey(resource as PerformanceResourceTiming, 'name') && + (resource as PerformanceResourceTiming)['name'].startsWith('https:') + ) { + addSpanNetworkEvent(span, PTN.SECURE_CONNECTION_START, resource); + } addSpanNetworkEvent(span, PTN.CONNECT_END, resource); addSpanNetworkEvent(span, PTN.REQUEST_START, resource); addSpanNetworkEvent(span, PTN.RESPONSE_START, resource); diff --git a/packages/opentelemetry-sdk-trace-web/test/utils.test.ts b/packages/opentelemetry-sdk-trace-web/test/utils.test.ts index 06e550c1f..dd00e6b06 100644 --- a/packages/opentelemetry-sdk-trace-web/test/utils.test.ts +++ b/packages/opentelemetry-sdk-trace-web/test/utils.test.ts @@ -116,9 +116,16 @@ describe('utils', () => { assert.strictEqual(addEventSpy.callCount, 0); addSpanNetworkEvents(span, entries); - - assert.strictEqual(addEventSpy.callCount, 9); assert.strictEqual(setAttributeSpy.callCount, 2); + //secure connect start should not be added to non-https resource + assert.strictEqual(addEventSpy.callCount, 8); + //secure connect start should be added to an https resource + addEventSpy.resetHistory(); + addSpanNetworkEvents(span, { + ...entries, + name: 'https://foo', + } as PerformanceResourceTiming); + assert.strictEqual(addEventSpy.callCount, 9); }); it('should only include encoded size when content encoding is being used', () => { const addEventSpy = sinon.spy(); From 784a4225182037b4233aefb43c7a104eab1ac818 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 5 Jul 2023 11:09:15 +0200 Subject: [PATCH 28/94] fix(instrumentation-fastify): fix fastify typescript compilation issue (#1556) --- plugins/node/opentelemetry-instrumentation-fastify/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 6152d134a..946d4939e 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -54,7 +54,7 @@ "@types/express": "4.17.13", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "fastify": "^4.5.3", + "fastify": "4.18.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", From a675ae817b51ea6b8853e62ea460e3e944cd0930 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 5 Jul 2023 11:21:20 +0200 Subject: [PATCH 29/94] chore(deps): update all patch versions to v7.22.6 (#3965) --- .../packages/exporter-logs-otlp-grpc/package.json | 2 +- .../packages/exporter-logs-otlp-http/package.json | 2 +- .../packages/exporter-logs-otlp-proto/package.json | 2 +- .../packages/exporter-trace-otlp-grpc/package.json | 2 +- .../packages/exporter-trace-otlp-http/package.json | 2 +- .../packages/exporter-trace-otlp-proto/package.json | 2 +- .../packages/opentelemetry-browser-detector/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-grpc/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-http/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-instrumentation-fetch/package.json | 2 +- .../package.json | 2 +- .../packages/opentelemetry-instrumentation/package.json | 2 +- .../packages/otlp-grpc-exporter-base/package.json | 2 +- .../packages/otlp-proto-exporter-base/package.json | 2 +- packages/opentelemetry-context-zone-peer-dep/package.json | 2 +- packages/opentelemetry-context-zone/package.json | 2 +- packages/opentelemetry-exporter-zipkin/package.json | 2 +- packages/opentelemetry-sdk-trace-web/package.json | 2 +- selenium-tests/package.json | 8 ++++---- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 43dc22d22..fc70f70d0 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.40.0", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index a1ff95725..351eaa0cc 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -71,7 +71,7 @@ ], "sideEffects": false, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api-logs": "0.40.0", "@opentelemetry/resources": "1.14.0", "@types/mocha": "10.0.1", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 204414966..b8b685c42 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index fce71adbd..5b888affd 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-exporter-base": "0.40.0", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 9e55231aa..8d41fc087 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 5f0deff40..27acfa4e1 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -62,7 +62,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 788fb3dd9..52bc1e7f2 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index cebe38c3c..17e35ee07 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index e26bbcd17..fa10515d3 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index f10cf504c..f384dec98 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index c8f1bfcb3..742ec4086 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.14.0", "@opentelemetry/propagator-b3": "1.14.0", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 4eb469da0..a9d38e65f 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.14.0", "@opentelemetry/propagator-b3": "1.14.0", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 944258ad8..bdfaa89e5 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -82,7 +82,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@opentelemetry/sdk-metrics": "1.14.0", "@types/mocha": "10.0.1", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 4956fbee1..65d86fe70 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-transformer": "0.40.0", "@opentelemetry/resources": "1.14.0", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 0587dc9de..46b31d990 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -59,7 +59,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 9904e9da8..b2905d6da 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 84a937ce9..1edc610e3 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -50,7 +50,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index bbe473b65..ff26a83e1 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -60,7 +60,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index b3bfc1558..8e16b1637 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -55,7 +55,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@opentelemetry/context-zone": "1.14.0", "@opentelemetry/propagator-b3": "1.14.0", diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 6d7726c13..3cdfb5d9d 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -31,11 +31,11 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.6", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.22.5", - "@babel/plugin-transform-runtime": "7.22.5", - "@babel/preset-env": "7.22.5", + "@babel/plugin-proposal-decorators": "7.22.6", + "@babel/plugin-transform-runtime": "7.22.6", + "@babel/preset-env": "7.22.6", "@opentelemetry/api": "^1.0.0", "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", From a18b0749ac2d43758e6378c4bd41f52e8eca5c89 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 6 Jul 2023 10:54:25 +0200 Subject: [PATCH 30/94] docs: document merge reqiurements (#1553) * docs: document merge reqiurements * docs: remove redundant wording * docs: remove redundant wording * docs: lint --- CONTRIBUTING.md | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c2b7513b..9a9164724 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,10 +87,6 @@ The `opentelemetry-js-contrib` project is written in TypeScript. - `npm test` tests code the same way that our CI will test it. - `npm run lint:fix` lint (and maybe fix) any changes. -### Generating API documentation - -- `npm run docs` to generate API documentation. Generates the documentation in `packages/opentelemetry-api/docs/out` - ### Generating CHANGELOG documentation - `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details). @@ -117,6 +113,9 @@ A component may be **unreleased**, **experimental**, **beta**, **stable**, **unm With the exception of the stable status, it is up to each individual [component owner](#component-ownership) to determine the status of a component. A component may only be marked stable with the approval of a member of @open-telemetry/javascript-maintainers; see the definition of stable below for more details. +A Pull Request modifying components in any stage of the lifecycle is subject to the +[Pull Request Merge Requirements](#pull-request-merge-requirements). + ### Unreleased Unreleased components are in active development and have not yet been released to NPM. @@ -162,6 +161,33 @@ They may not work and there are no guarantees for fixes or new features. Their source files may be deleted from the repository. Any packages released from their source will be marked as deprecated in NPM. +## Pull Request Merge Requirements + +Pull requests MAY be merged by an approver OR a maintainer provided they meet all the following requirements: + +- Approved by + - at least one component owner if one is defined in [.github/component_owners.yml](.github/component_owners.yml) + - OR one maintainer + - OR at least one approver who is not the approver merging the pull request + - A pull request for small (simple typo, URL, update docs, or grammatical fix) changes may be approved and merged by the same approver +- No “changes requested” reviews or unresolved conversations by + - approvers + - maintainers + - technical committee members + - component owners + - subject-matter experts +- New or changed functionality is tested by unit tests +- New or changed functionality is documented if appropriate +- Substantial changes should not be merged within 24 hours of opening in order to allow reviewers from all time zones to have a chance to review + +All requirements are at the discretion of the maintainers. +Maintainers MAY merge pull requests which have not strictly met these requirements. +Maintainers MAY close, block, or put on hold pull requests even if they have strictly met these requirements. + +If a PR has not been interacted with by a reviewer within one week, please ping the component +owners as listed in [.github/component_owners.yml](.github/component_owners.yml), if component owners are unresponsive +please ping ([@open-telemetry/javascript-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers)). + ## Contributing Vendor Components This repo is generally meant for hosting components that work with popular open-source frameworks and tools. However, it is also possible to contribute components specific to a 3rd party vendor in this repo. From 06e919d6c909e8cc8e28b6624d9843f401d9b059 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 6 Jul 2023 13:06:26 +0200 Subject: [PATCH 31/94] chore: prepare release 1.15 / 0.41 (#3963) --- CHANGELOG.md | 17 ++++++----- examples/esm-http-ts/package.json | 16 +++++----- examples/http/package.json | 18 +++++------ examples/https/package.json | 18 +++++------ examples/opentelemetry-web/package.json | 30 +++++++++---------- examples/otlp-exporter-node/package.json | 24 +++++++-------- experimental/CHANGELOG.md | 19 ++++++++++-- .../node14/package.json | 6 ++-- .../node16/package.json | 6 ++-- experimental/examples/logs/package.json | 6 ++-- .../examples/opencensus-shim/package.json | 17 +++++------ experimental/examples/prometheus/package.json | 6 ++-- experimental/packages/api-events/package.json | 2 +- experimental/packages/api-logs/package.json | 2 +- .../exporter-logs-otlp-grpc/package.json | 16 +++++----- .../exporter-logs-otlp-http/package.json | 14 ++++----- .../exporter-logs-otlp-proto/package.json | 18 +++++------ .../exporter-trace-otlp-grpc/package.json | 14 ++++----- .../exporter-trace-otlp-http/package.json | 12 ++++---- .../exporter-trace-otlp-proto/package.json | 14 ++++----- .../package.json | 6 ++-- .../package.json | 14 ++++----- .../package.json | 12 ++++---- .../package.json | 16 +++++----- .../package.json | 10 +++---- .../package.json | 16 +++++----- .../package.json | 14 ++++----- .../package.json | 16 +++++----- .../package.json | 16 +++++----- .../package.json | 4 +-- .../opentelemetry-sdk-node/package.json | 28 ++++++++--------- .../packages/otlp-exporter-base/package.json | 4 +-- .../otlp-grpc-exporter-base/package.json | 12 ++++---- .../otlp-proto-exporter-base/package.json | 6 ++-- .../packages/otlp-transformer/package.json | 14 ++++----- experimental/packages/sdk-logs/package.json | 8 ++--- .../packages/shim-opencensus/package.json | 8 ++--- .../package.json | 8 ++--- .../package.json | 2 +- .../package.json | 2 +- .../opentelemetry-context-zone/package.json | 8 ++--- packages/opentelemetry-core/package.json | 4 +-- .../package.json | 10 +++---- .../package.json | 10 +++---- .../opentelemetry-propagator-b3/package.json | 4 +-- .../package.json | 4 +-- packages/opentelemetry-resources/package.json | 6 ++-- .../opentelemetry-sdk-trace-base/package.json | 8 ++--- .../opentelemetry-sdk-trace-node/package.json | 16 +++++----- .../opentelemetry-sdk-trace-web/package.json | 14 ++++----- .../package.json | 2 +- .../package.json | 12 ++++---- packages/sdk-metrics/package.json | 6 ++-- packages/template/package.json | 2 +- selenium-tests/package.json | 22 +++++++------- 55 files changed, 316 insertions(+), 303 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42ca36c05..6f7294606 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,22 +11,24 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) -* feat(exporter-metrics-otlp-*)!: add LowMemory metrics temporality preference [#3915](https://github.com/open-telemetry/opentelemetry-js/pull/3915) - * Breaking: From now on `AggregationTemporalityPreference` has to be used instead of `AggregationTemporality` when configuring the exporter. - * Adds support for [LowMemory temporality preference](https://github.com/open-telemetry/opentelemetry-specification/blob/f09624bb97e9be3be259733b93be507df18927bd/specification/metrics/sdk_exporters/otlp.md#additional-configuration) - * Adds support for `lowmemory` in `OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE` +### :bug: (Bug Fix) + +### :books: (Refine Doc) + +### :house: (Internal) + +## 1.15.0 ### :bug: (Bug Fix) * fix(opentelemetry-exporter-prometheus): Update default PrometheusExporter to not append a timestamp to match the text based exposition format [#3961](https://github.com/open-telemetry/opentelemetry-js/pull/3961) @JacksonWeber * fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001 * fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass - -### :books: (Refine Doc) +* fix(sdk-trace-web): add secureConnectionStart to https only [#3879](https://github.com/open-telemetry/opentelemetry-js/pull/3879) @Abinet18 ### :house: (Internal) -* feat(minification): [Minification] Add noEmitHelpers, importHelpers and tslib as a dependency [#3913](https://github.com/open-telemetry/opentelemetry-js/issues/3913) +* feat(minification): [Minification] Add noEmitHelpers, importHelpers and tslib as a dependency [#3913](https://github.com/open-telemetry/opentelemetry-js/issues/3913) @MSNev ## 1.14.0 @@ -42,7 +44,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) -* fix(sdk-trace-web): add secureConnectionStart to https only [#3879](https://github.com/open-telemetry/opentelemetry-js/pull/3879) @Abinet18 * fix(http-instrumentation): stop listening to `request`'s `close` event once it has emitted `response` [#3625](https://github.com/open-telemetry/opentelemetry-js/pull/3625) @SimenB * fix(sdk-node): fix initialization in bundled environments by not loading @opentelemetry/exporter-jaeger [#3739](https://github.com/open-telemetry/opentelemetry-js/pull/3739) @pichlermarc diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json index 71977f73f..4dcbbf600 100644 --- a/examples/esm-http-ts/package.json +++ b/examples/esm-http-ts/package.json @@ -1,7 +1,7 @@ { "name": "esm-http-ts", "private": true, - "version": "0.40.0", + "version": "0.41.0", "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript", "main": "build/index.js", "type": "module", @@ -31,12 +31,12 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/", "dependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.40.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/instrumentation-http": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-node": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0" + "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/instrumentation-http": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0" } } diff --git a/examples/http/package.json b/examples/http/package.json index a48f8e2c1..22d3d29d9 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.40.0", + "version": "0.41.0", "description": "Example of HTTP integration with OpenTelemetry", "main": "index.js", "scripts": { @@ -29,14 +29,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.14.0", - "@opentelemetry/exporter-zipkin": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/instrumentation-http": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-node": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0" + "@opentelemetry/exporter-jaeger": "1.15.0", + "@opentelemetry/exporter-zipkin": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/instrumentation-http": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/examples/https/package.json b/examples/https/package.json index 2a63c724c..15b3ac513 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.40.0", + "version": "0.41.0", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -33,14 +33,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.14.0", - "@opentelemetry/exporter-zipkin": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/instrumentation-http": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-node": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0" + "@opentelemetry/exporter-jaeger": "1.15.0", + "@opentelemetry/exporter-zipkin": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/instrumentation-http": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index 7caa50413..762f17d65 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -1,7 +1,7 @@ { "name": "web-opentelemetry-example", "private": true, - "version": "0.40.0", + "version": "0.41.0", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", "main": "index.js", "scripts": { @@ -43,20 +43,20 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.14.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.40.0", - "@opentelemetry/exporter-trace-otlp-http": "0.40.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.40.0", - "@opentelemetry/exporter-zipkin": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/instrumentation-fetch": "0.40.0", - "@opentelemetry/instrumentation-xml-http-request": "0.40.0", - "@opentelemetry/propagator-b3": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-web": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/context-zone": "1.15.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", + "@opentelemetry/exporter-trace-otlp-http": "0.41.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", + "@opentelemetry/exporter-zipkin": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/instrumentation-fetch": "0.41.0", + "@opentelemetry/instrumentation-xml-http-request": "0.41.0", + "@opentelemetry/propagator-b3": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-web": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index bb5fa2513..888a0b1be 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.40.0", + "version": "0.41.0", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -29,17 +29,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.40.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.40.0", - "@opentelemetry/exporter-metrics-otlp-proto": "0.40.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.40.0", - "@opentelemetry/exporter-trace-otlp-http": "0.40.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0" + "@opentelemetry/core": "1.15.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", + "@opentelemetry/exporter-metrics-otlp-proto": "0.41.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", + "@opentelemetry/exporter-trace-otlp-http": "0.41.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 2ad8923f8..7d22becab 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,22 +6,35 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change +### :rocket: (Enhancement) + +### :bug: (Bug Fix) + +### :books: (Refine Doc) + +### :house: (Internal) + +## 0.41.0 + +### :boom: Breaking Change + * chore(instrumentation-grpc): Drop support for package `grpc`. [#3807](https://github.com/open-telemetry/opentelemetry-js/pull/3807) @llc1123 ### :rocket: (Enhancement) * feat(otlp-grpc-exporters): add support for UDS endpoints. [#3853](https://github.com/open-telemetry/opentelemetry-js/pull/3853) @llc1123 * feat(otlp-exporters): bump otlp proto to 0.20.0 [#3932](https://github.com/open-telemetry/opentelemetry-js/pull/3932) @pichlermarc +* feat(exporter-metrics-otlp-*): add LowMemory metrics temporality preference [#3915](https://github.com/open-telemetry/opentelemetry-js/pull/3915) @martinkuba + * Adds support for [LowMemory temporality preference](https://github.com/open-telemetry/opentelemetry-specification/blob/f09624bb97e9be3be259733b93be507df18927bd/specification/metrics/sdk_exporters/otlp.md#additional-configuration) + * Adds support for `lowmemory` in `OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE` ### :bug: (Bug Fix) * fix(exporter-logs-otlp-http): set useHex to true [#3875](https://github.com/open-telemetry/opentelemetry-js/pull/3875) @Nico385412 - fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc +* fix(otlp-proto-exporter-base): add missing type import [#3937](https://github.com/open-telemetry/opentelemetry-js/pull/3937) @pichlermarc * fix(example-opencensus-shim): avoid OpenCensus auto instrumentations [#3951](https://github.com/open-telemetry/opentelemetry-js/pull/3951) @llc1123 * fix(http-intrumentation): prevent request socket null from throwing uncaught error [#3858](https://github.com/open-telemetry/opentelemetry-js/pull/3858) @aodysseos -### :books: (Refine Doc) - ### :house: (Internal) * chore(instrumentation-grpc): Cleanup remnants of grpc-native support. [#3886](https://github.com/open-telemetry/opentelemetry-js/pull/3886) @llc1123 diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json index a18a2795f..1fc32b91f 100644 --- a/experimental/backwards-compatibility/node14/package.json +++ b/experimental/backwards-compatibility/node14/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node14", - "version": "0.40.0", + "version": "0.41.0", "private": true, "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.40.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/sdk-node": "0.41.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json index aaeb4db42..136ff5ff0 100644 --- a/experimental/backwards-compatibility/node16/package.json +++ b/experimental/backwards-compatibility/node16/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node16", - "version": "0.40.0", + "version": "0.41.0", "private": true, "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.40.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/sdk-node": "0.41.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/experimental/examples/logs/package.json b/experimental/examples/logs/package.json index 0df41c352..f4295a7c9 100644 --- a/experimental/examples/logs/package.json +++ b/experimental/examples/logs/package.json @@ -1,14 +1,14 @@ { "name": "logs-example", - "version": "0.40.0", + "version": "0.41.0", "private": true, "scripts": { "start": "ts-node index.ts" }, "dependencies": { "@opentelemetry/api": "^1.4.1", - "@opentelemetry/api-logs": "0.40.0", - "@opentelemetry/sdk-logs": "0.40.0" + "@opentelemetry/api-logs": "0.41.0", + "@opentelemetry/sdk-logs": "0.41.0" }, "devDependencies": { "@types/node": "18.6.5", diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index fd231ef11..ee201e117 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -1,7 +1,7 @@ { "name": "opencensus-shim", "private": true, - "version": "0.40.0", + "version": "0.41.0", "description": "Example of using @opentelemetry/shim-opencensus in Node.js", "main": "index.js", "scripts": { @@ -27,15 +27,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "1.4.1", - "@opentelemetry/sdk-trace-node": "1.14.0", "@opencensus/core": "0.1.0", "@opencensus/nodejs-base": "0.1.0", - "@opentelemetry/semantic-conventions": "1.14.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/shim-opencensus": "0.40.0" + "@opentelemetry/api": "1.4.1", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", + "@opentelemetry/shim-opencensus": "0.41.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim", - "devDependencies": {} + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" } diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json index 037e147dc..45c9f661d 100644 --- a/experimental/examples/prometheus/package.json +++ b/experimental/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.40.0", + "version": "0.41.0", "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.40.0", - "@opentelemetry/sdk-metrics": "1.14.0" + "@opentelemetry/exporter-prometheus": "0.41.0", + "@opentelemetry/sdk-metrics": "1.15.0" } } diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index ec768c618..1976e7ced 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-events", - "version": "0.40.0", + "version": "0.41.0", "description": "Public events API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 7be2db96e..1591770ca 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-logs", - "version": "0.40.0", + "version": "0.41.0", "description": "Public logs API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index fc70f70d0..9a8244e50 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -51,9 +51,9 @@ "@babel/core": "7.22.6", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/api-logs": "0.40.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/resources": "1.14.0", + "@opentelemetry/api-logs": "0.41.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/resources": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -73,10 +73,10 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/sdk-logs": "0.40.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/sdk-logs": "0.41.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 351eaa0cc..f0db30c44 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.40.0", + "version": "0.41.0", "publishConfig": { "access": "public" }, @@ -72,8 +72,8 @@ "sideEffects": false, "devDependencies": { "@babel/core": "7.22.6", - "@opentelemetry/api-logs": "0.40.0", - "@opentelemetry/resources": "1.14.0", + "@opentelemetry/api-logs": "0.41.0", + "@opentelemetry/resources": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -104,10 +104,10 @@ "@opentelemetry/api-logs": ">=0.38.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/sdk-logs": "0.40.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/sdk-logs": "0.41.0", "tslib": "^2.3.1" } } diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index b8b685c42..f7f08642e 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.40.0", + "version": "0.41.0", "description": "An OTLP exporter to send logs using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -83,14 +83,14 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.40.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/otlp-proto-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-logs": "0.40.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/api-logs": "0.41.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-proto-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-logs": "0.41.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 5b888affd..2cf8e237a 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ "@babel/core": "7.22.6", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/otlp-exporter-base": "0.40.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -70,11 +70,11 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 8d41fc087..ac6a84593 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -95,11 +95,11 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 27acfa4e1..f01322ce0 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -82,12 +82,12 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/otlp-proto-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-proto-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 52bc1e7f2..0a6cd39d1 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Resource Detector for Browser", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -72,8 +72,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 17e35ee07..380c0e212 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -69,12 +69,12 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.40.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index fa10515d3..556fbf9a9 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -95,11 +95,11 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index f384dec98..440af69cb 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -67,13 +67,13 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.40.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", - "@opentelemetry/otlp-proto-exporter-base": "0.40.0", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-proto-exporter-base": "0.41.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index 8ae497886..c9ffe2cdc 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/semantic-conventions": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -61,9 +61,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 742ec4086..bf8d32563 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,9 +56,9 @@ "devDependencies": { "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.14.0", - "@opentelemetry/propagator-b3": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/context-zone": "1.15.0", + "@opentelemetry/propagator-b3": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -88,10 +88,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/sdk-trace-web": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/sdk-trace-web": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index f8b247ffa..ca20eade9 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,10 +48,10 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.14.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-node": "1.14.0", + "@opentelemetry/context-async-hooks": "1.15.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", @@ -70,8 +70,8 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index c39d34ace..93ed303fa 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,10 +46,10 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-node": "1.14.0", + "@opentelemetry/context-async-hooks": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.18", @@ -74,9 +74,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/semantic-conventions": "1.15.0", "semver": "^7.5.1", "tslib": "^2.3.1" }, diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index a9d38e65f..62852cb31 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,9 +56,9 @@ "devDependencies": { "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.14.0", - "@opentelemetry/propagator-b3": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/context-zone": "1.15.0", + "@opentelemetry/propagator-b3": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -88,10 +88,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/sdk-trace-web": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/sdk-trace-web": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index bdfaa89e5..e2c06c4ff 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.40.0", + "version": "0.41.0", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation", @@ -84,7 +84,7 @@ "devDependencies": { "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", - "@opentelemetry/sdk-metrics": "1.14.0", + "@opentelemetry/sdk-metrics": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 5db8e3ced..e21bf6999 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,18 +44,18 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/exporter-jaeger": "1.14.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.40.0", - "@opentelemetry/exporter-trace-otlp-http": "0.40.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.40.0", - "@opentelemetry/exporter-zipkin": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-metrics": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-node": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/exporter-jaeger": "1.15.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", + "@opentelemetry/exporter-trace-otlp-http": "0.41.0", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", + "@opentelemetry/exporter-zipkin": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "peerDependencies": { @@ -63,7 +63,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.14.0", + "@opentelemetry/context-async-hooks": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index de1a70199..b6d15f7ae 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry OTLP Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,7 +61,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.14.0", + "@opentelemetry/core": "1.15.0", "tslib": "^2.3.1" }, "devDependencies": { diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 65d86fe70..c8fcd6fcd 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry OTLP-gRPC Exporter base (for internal use only)", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,9 +50,9 @@ "devDependencies": { "@babel/core": "7.22.6", "@opentelemetry/api": "1.4.1", - "@opentelemetry/otlp-transformer": "0.40.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/otlp-transformer": "0.41.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -73,8 +73,8 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", "protobufjs": "^7.2.3", "tslib": "^2.3.1" }, diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 46b31d990..fb8a8ce04 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-proto-exporter-base", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -79,8 +79,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/otlp-exporter-base": "0.40.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/otlp-exporter-base": "0.41.0", "protobufjs": "^7.2.3", "tslib": "^2.3.1" }, diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 4e2a83138..d0cb3701e 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "0.40.0", + "version": "0.41.0", "description": "Transform OpenTelemetry SDK data into OTLP", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", @@ -78,12 +78,12 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.40.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-logs": "0.40.0", - "@opentelemetry/sdk-metrics": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/api-logs": "0.41.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-logs": "0.41.0", + "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index be245fbe1..61415c040 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-logs", - "version": "0.40.0", + "version": "0.41.0", "publishConfig": { "access": "public" }, @@ -73,7 +73,7 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.4.0 <1.5.0", - "@opentelemetry/api-logs": "0.40.0", + "@opentelemetry/api-logs": "0.41.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -93,8 +93,8 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/resources": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/resources": "1.15.0", "tslib": "^2.3.1" } } diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 636efed87..b57628d38 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opencensus", - "version": "0.40.0", + "version": "0.41.0", "description": "OpenCensus to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,8 +50,8 @@ "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/context-async-hooks": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -69,7 +69,7 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", + "@opentelemetry/core": "1.15.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1", "tslib": "^2.3.1" diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 880251c50..8d577ea65 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "1.14.0", + "version": "1.15.0", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,9 +12,9 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.14.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/context-async-hooks": "1.15.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "axios": "1.4.0", "body-parser": "1.19.0", "express": "4.17.3", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 64366b205..23e3e65ee 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index b2905d6da..cf65319c1 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 1edc610e3..b2735c901 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -75,9 +75,9 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.14.0", - "zone.js": "^0.11.0", - "tslib": "^2.3.1" + "@opentelemetry/context-zone-peer-dep": "1.15.0", + "tslib": "^2.3.1", + "zone.js": "^0.11.0" }, "sideEffects": true, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone" diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 23e11a9e5..3fa3c7b20 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/core", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -91,7 +91,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 3b4164d3f..89e57e4c7 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.14.0", + "@opentelemetry/resources": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -63,9 +63,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "jaeger-client": "^3.15.0", "tslib": "^2.3.1" }, diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index ff26a83e1..dc3a8aaa4 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -92,10 +92,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 89dcef29b..85bc37879 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -51,7 +51,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.14.0", + "@opentelemetry/core": "1.15.0", "tslib": "^2.3.1" }, "peerDependencies": { diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index de2e90601..5d67b474c 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -81,7 +81,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", + "@opentelemetry/core": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 17de24f22..b450f1d57 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -91,8 +91,8 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 6cceaa64d..0b08b67d8 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-base", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -93,9 +93,9 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index bd4fb782f..1608b10f3 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,8 +46,8 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/resources": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/resources": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", @@ -65,11 +65,11 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "1.14.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/propagator-b3": "1.14.0", - "@opentelemetry/propagator-jaeger": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/context-async-hooks": "1.15.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/propagator-b3": "1.15.0", + "@opentelemetry/propagator-jaeger": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "semver": "^7.5.1", "tslib": "^2.3.1" }, diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 8e16b1637..551fbaab1 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-web", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,9 +57,9 @@ "devDependencies": { "@babel/core": "7.22.6", "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/context-zone": "1.14.0", - "@opentelemetry/propagator-b3": "1.14.0", - "@opentelemetry/resources": "1.14.0", + "@opentelemetry/context-zone": "1.15.0", + "@opentelemetry/propagator-b3": "1.15.0", + "@opentelemetry/resources": "1.15.0", "@types/jquery": "3.5.16", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -92,9 +92,9 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index c7585e68f..93cff0e7c 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 9b05c66d6..0555f0d70 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,9 +43,9 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/propagator-b3": "1.14.0", - "@opentelemetry/propagator-jaeger": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", + "@opentelemetry/propagator-b3": "1.15.0", + "@opentelemetry/propagator-jaeger": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -60,8 +60,8 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/semantic-conventions": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.0", "opentracing": "^0.14.4", "tslib": "^2.3.1" }, diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 2e327b6ac..37184d2d0 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-metrics", - "version": "1.14.0", + "version": "1.15.0", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -78,8 +78,8 @@ "@opentelemetry/api": ">=1.3.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.14.0", - "@opentelemetry/resources": "1.14.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/resources": "1.15.0", "lodash.merge": "^4.6.2", "tslib": "^2.3.1" }, diff --git a/packages/template/package.json b/packages/template/package.json index 00876cf2c..451da5d1e 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "1.14.0", + "version": "1.15.0", "private": true, "publishConfig": { "access": "restricted" diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 3cdfb5d9d..829be06e3 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/selenium-tests", - "version": "1.14.0", + "version": "1.15.0", "private": true, "description": "OpenTelemetry Selenium Tests", "main": "index.js", @@ -56,16 +56,16 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.14.0", - "@opentelemetry/core": "1.14.0", - "@opentelemetry/exporter-trace-otlp-http": "0.40.0", - "@opentelemetry/exporter-zipkin": "1.14.0", - "@opentelemetry/instrumentation": "0.40.0", - "@opentelemetry/instrumentation-fetch": "0.40.0", - "@opentelemetry/instrumentation-xml-http-request": "0.40.0", - "@opentelemetry/sdk-metrics": "1.14.0", - "@opentelemetry/sdk-trace-base": "1.14.0", - "@opentelemetry/sdk-trace-web": "1.14.0", + "@opentelemetry/context-zone-peer-dep": "1.15.0", + "@opentelemetry/core": "1.15.0", + "@opentelemetry/exporter-trace-otlp-http": "0.41.0", + "@opentelemetry/exporter-zipkin": "1.15.0", + "@opentelemetry/instrumentation": "0.41.0", + "@opentelemetry/instrumentation-fetch": "0.41.0", + "@opentelemetry/instrumentation-xml-http-request": "0.41.0", + "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/sdk-trace-web": "1.15.0", "zone.js": "0.11.4" } } From 02c1d95608d3cb05e93edb68007a46456337ec3c Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 6 Jul 2023 15:06:00 +0200 Subject: [PATCH 32/94] chore: replace istanbul-instrumenter-loader with maintained component (#3918) --- .nycrc | 1 - api/package.json | 8 ++++---- experimental/packages/api-events/package.json | 6 +++--- experimental/packages/api-logs/package.json | 6 +++--- .../exporter-logs-otlp-http/package.json | 6 +++--- .../exporter-logs-otlp-proto/package.json | 14 ++++++++++++-- .../exporter-trace-otlp-http/package.json | 6 +++--- .../exporter-trace-otlp-proto/package.json | 14 ++++++++++++-- .../opentelemetry-browser-detector/package.json | 14 ++++++++++++-- .../package.json | 6 +++--- .../package.json | 6 +++--- .../package.json | 6 +++--- .../opentelemetry-instrumentation/package.json | 6 +++--- .../opentelemetry-sdk-node/package.json | 1 - .../packages/otlp-exporter-base/package.json | 17 +++++++++++++---- .../packages/otlp-transformer/package.json | 6 +++--- experimental/packages/sdk-logs/package.json | 12 +++++++++--- karma.base.js | 10 +++++----- karma.webpack.js | 6 ++++-- .../package.json | 6 +++--- packages/opentelemetry-core/package.json | 6 +++--- .../opentelemetry-exporter-zipkin/package.json | 6 +++--- .../opentelemetry-propagator-b3/package.json | 1 - .../package.json | 6 +++--- packages/opentelemetry-resources/package.json | 6 +++--- .../opentelemetry-sdk-trace-base/package.json | 8 ++++---- .../opentelemetry-sdk-trace-web/package.json | 8 ++++---- packages/sdk-metrics/package.json | 12 +++++++++--- packages/template/package.json | 8 ++++---- tsconfig.tsbuildinfo | 1 + 30 files changed, 135 insertions(+), 84 deletions(-) create mode 100644 tsconfig.tsbuildinfo diff --git a/.nycrc b/.nycrc index 22383d8ab..eb64eeca2 100644 --- a/.nycrc +++ b/.nycrc @@ -8,7 +8,6 @@ "build/**/*.*", "src/index.ts", "src/platform/**/index.ts", - "src/platform/browser/*.ts", "src/version.ts", "test/**/*.*", ".eslintrc.js", diff --git a/api/package.json b/api/package.json index 888e602e5..296c86d4c 100644 --- a/api/package.json +++ b/api/package.json @@ -23,9 +23,9 @@ "docs:test": "linkinator docs/out --silent && linkinator docs/*.md *.md --markdown --silent", "lint:fix": "eslint . --ext .ts --fix", "lint": "eslint . --ext .ts", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:webworker": "nyc karma start karma.worker.js --single-run", + "test:webworker": "karma start karma.worker.js --single-run", "cycle-check": "dpdm --exit-code circular:1 src/index.ts", "version": "node ../scripts/version-update.js", "prewatch": "npm run precompile", @@ -68,10 +68,10 @@ "codecov": "3.8.3", "cross-var": "1.1.0", "dpdm": "3.13.1", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 1976e7ced..4b3f8660c 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -18,7 +18,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "build": "npm run compile", @@ -70,10 +70,10 @@ "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 1591770ca..315534d6b 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -18,7 +18,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "build": "npm run compile", @@ -70,10 +70,10 @@ "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index f0db30c44..b29e26ec0 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -38,7 +38,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -82,10 +82,10 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index f7f08642e..5935d1719 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -21,7 +21,7 @@ "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -71,13 +71,23 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", + "babel-plugin-istanbul": "6.1.1", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.0", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index ac6a84593..ce26e9463 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -23,7 +23,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -73,10 +73,10 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index f01322ce0..a812a1e7c 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -21,7 +21,7 @@ "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -70,13 +70,23 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", + "babel-plugin-istanbul": "6.1.1", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.0", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 0a6cd39d1..5c20aa95b 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -14,7 +14,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", @@ -60,13 +60,23 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", + "babel-plugin-istanbul": "6.1.1", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.0", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 556fbf9a9..6190a4144 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -23,7 +23,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -73,10 +73,10 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index bf8d32563..f641b9ec4 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -16,7 +16,7 @@ "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "version": "node ../../../scripts/version-update.js", "tdd": "karma start", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", @@ -66,10 +66,10 @@ "babel-loader": "8.3.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 62852cb31..f628c633e 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -16,7 +16,7 @@ "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "version": "node ../../../scripts/version-update.js", "tdd": "karma start", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", @@ -66,10 +66,10 @@ "babel-loader": "8.3.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index e2c06c4ff..4141beed0 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -51,7 +51,7 @@ "test:cjs": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:esm": "nyc node --experimental-loader=./hook.mjs ../../../node_modules/mocha/bin/mocha 'test/node/*.test.mjs' test/node/*.test.mjs", "test": "npm run test:cjs && npm run test:esm", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -94,10 +94,10 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index e21bf6999..9ec166cb7 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -70,7 +70,6 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index b6d15f7ae..77c49bfaa 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -24,7 +24,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -65,21 +65,30 @@ "tslib": "^2.3.1" }, "devDependencies": { + "@babel/core": "7.22.5", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", + "karma": "6.4.2", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.0", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "4.0.2", "lerna": "7.1.1", "mocha": "10.2.0", - "nock": "13.3.1", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0" diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index d0cb3701e..6c020a16f 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -20,7 +20,7 @@ "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "prewatch": "node ../../../scripts/version-update.js", "watch": "tsc --build -w tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "peer-api-check": "node ../../../scripts/peer-api-check.js", @@ -62,10 +62,10 @@ "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 61415c040..898bb86be 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -33,7 +33,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", @@ -74,14 +74,16 @@ "devDependencies": { "@opentelemetry/api": ">=1.4.0 <1.5.0", "@opentelemetry/api-logs": "0.41.0", + "@babel/core": "7.22.5", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", @@ -89,8 +91,12 @@ "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", + "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" }, "dependencies": { "@opentelemetry/core": "1.15.0", diff --git a/karma.base.js b/karma.base.js index 7df76d7b1..2af286936 100644 --- a/karma.base.js +++ b/karma.base.js @@ -19,12 +19,12 @@ module.exports = { hostname: 'localhost', browsers: ['ChromeHeadless'], frameworks: ['mocha'], - coverageIstanbulReporter: { - reports: ['html', 'json'], - dir: '.nyc_output', - fixWebpackSourcePaths: true + coverageReporter: { + type : 'json', + subdir: '.', + dir : '.nyc_output/' }, - reporters: ['spec', 'coverage-istanbul'], + reporters: ['spec', 'coverage'], files: ['test/index-webpack.ts'], preprocessors: { 'test/index-webpack*.ts': ['webpack'] diff --git a/karma.webpack.js b/karma.webpack.js index 138112547..b7fa7acb9 100644 --- a/karma.webpack.js +++ b/karma.webpack.js @@ -31,8 +31,10 @@ module.exports = { exclude: /(node_modules|\.test\.[tj]sx?$)/, test: /\.ts$/, use: { - loader: 'istanbul-instrumenter-loader', - options: { esModules: true }, + loader: 'babel-loader', + options: { + plugins: ['babel-plugin-istanbul'], + } }, }, // This setting configures Node polyfills for the browser that will be diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index cf65319c1..fa1ef0420 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -16,7 +16,7 @@ "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", "tdd": "karma start", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", @@ -63,10 +63,10 @@ "babel-loader": "8.3.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 3fa3c7b20..70d32b5de 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -18,7 +18,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts --exclude 'test/platform/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", @@ -71,10 +71,10 @@ "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index dc3a8aaa4..e8bd41837 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -23,7 +23,7 @@ "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "version": "node ../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", @@ -69,10 +69,10 @@ "babel-loader": "8.3.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 85bc37879..1cb95ba6b 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -63,7 +63,6 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 5d67b474c..fdabf7a7e 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -10,7 +10,7 @@ "prepublishOnly": "npm run compile", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", @@ -61,10 +61,10 @@ "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index b450f1d57..a5862f44d 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -22,8 +22,8 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "nyc karma start --single-run", - "test:webworker": "nyc karma start karma.worker.js --single-run", + "test:browser": "karma start --single-run", + "test:webworker": "karma start karma.worker.js --single-run", "tdd": "npm run test -- --watch-extensions ts --watch", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", @@ -71,7 +71,7 @@ "cross-var": "1.1.0", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 0b08b67d8..884e0e8c7 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -18,8 +18,8 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "nyc karma start --single-run", - "test:webworker": "nyc karma start karma.worker.js --single-run", + "test:browser": "karma start --single-run", + "test:webworker": "karma start karma.worker.js --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", @@ -72,10 +72,10 @@ "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 551fbaab1..ab668e3c4 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -17,8 +17,8 @@ "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", "tdd": "karma start", - "test:browser": "nyc karma start --single-run", - "test:webworker": "nyc karma start karma.worker.js --single-run", + "test:browser": "karma start --single-run", + "test:webworker": "karma start karma.worker.js --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", @@ -68,10 +68,10 @@ "babel-loader": "8.3.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "istanbul-instrumenter-loader": "3.0.1", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-jquery": "0.2.4", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 37184d2d0..e7d695ca9 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -12,7 +12,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", @@ -56,14 +56,16 @@ "devDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0", "@types/lodash.merge": "4.6.7", + "@babel/core": "7.22.5", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", + "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", @@ -71,8 +73,12 @@ "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", + "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4" + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0" diff --git a/packages/template/package.json b/packages/template/package.json index 451da5d1e..7d04d854a 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -47,7 +47,7 @@ "Add/change these to scripts if browser is supported": { "compile": "tsc --build tsconfig.json", "clean": "tsc --build --clean tsconfig.json", - "test:browser": "nyc karma start --single-run", + "test:browser": "karma start --single-run", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "watch": "tsc --build --watch tsconfig.json" }, @@ -97,10 +97,10 @@ }, "Add these to devDependencies if browser is targeted": { "@types/webpack-env": "1.16.0", - "istanbul-instrumenter-loader": "3.0.1", - "karma": "5.2.3", + "babel-plugin-istanbul": "6.1.1", + "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage-istanbul-reporter": "3.0.3", + "karma-coverage": "2.2.0", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.32", "karma-webpack": "4.0.2", diff --git a/tsconfig.tsbuildinfo b/tsconfig.tsbuildinfo new file mode 100644 index 000000000..bd9c8b8ea --- /dev/null +++ b/tsconfig.tsbuildinfo @@ -0,0 +1 @@ +{"version":"4.4.4"} \ No newline at end of file From b34c39bf3223cf2a3302ab762fa5743fe83e4414 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 6 Jul 2023 15:14:56 +0200 Subject: [PATCH 33/94] chore(deps): update dependency eslint to v8.43.0 (#3929) Co-authored-by: Renovate Bot --- api/.eslintrc.js | 2 +- eslint.config.js => eslint.base.js | 0 experimental/examples/.eslintrc.js | 2 +- experimental/packages/api-events/.eslintrc.js | 2 +- experimental/packages/api-logs/.eslintrc.js | 2 +- experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js | 2 +- experimental/packages/exporter-logs-otlp-http/.eslintrc.js | 2 +- experimental/packages/exporter-logs-otlp-proto/.eslintrc.js | 2 +- experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js | 2 +- experimental/packages/exporter-trace-otlp-http/.eslintrc.js | 2 +- experimental/packages/exporter-trace-otlp-proto/.eslintrc.js | 2 +- .../packages/opentelemetry-browser-detector/.eslintrc.js | 2 +- .../opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js | 2 +- .../opentelemetry-exporter-metrics-otlp-http/.eslintrc.js | 2 +- .../opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js | 2 +- .../packages/opentelemetry-exporter-prometheus/.eslintrc.js | 2 +- .../packages/opentelemetry-instrumentation-fetch/.eslintrc.js | 2 +- .../packages/opentelemetry-instrumentation-grpc/.eslintrc.js | 2 +- .../packages/opentelemetry-instrumentation-http/.eslintrc.js | 2 +- .../opentelemetry-instrumentation-xml-http-request/.eslintrc.js | 2 +- .../packages/opentelemetry-instrumentation/.eslintrc.js | 2 +- experimental/packages/opentelemetry-sdk-node/.eslintrc.js | 2 +- experimental/packages/otlp-exporter-base/.eslintrc.js | 2 +- experimental/packages/otlp-grpc-exporter-base/.eslintrc.js | 2 +- experimental/packages/otlp-proto-exporter-base/.eslintrc.js | 2 +- experimental/packages/otlp-transformer/.eslintrc.js | 2 +- experimental/packages/sdk-logs/.eslintrc.js | 2 +- experimental/packages/shim-opencensus/.eslintrc.js | 2 +- package.json | 2 +- packages/opentelemetry-context-async-hooks/.eslintrc.js | 2 +- packages/opentelemetry-context-zone-peer-dep/.eslintrc.js | 2 +- packages/opentelemetry-context-zone/.eslintrc.js | 2 +- packages/opentelemetry-core/.eslintrc.js | 2 +- packages/opentelemetry-exporter-jaeger/.eslintrc.js | 2 +- packages/opentelemetry-exporter-zipkin/.eslintrc.js | 2 +- packages/opentelemetry-propagator-b3/.eslintrc.js | 2 +- packages/opentelemetry-propagator-jaeger/.eslintrc.js | 2 +- packages/opentelemetry-resources/.eslintrc.js | 2 +- packages/opentelemetry-sdk-trace-base/.eslintrc.js | 2 +- packages/opentelemetry-sdk-trace-node/.eslintrc.js | 2 +- packages/opentelemetry-sdk-trace-web/.eslintrc.js | 2 +- packages/opentelemetry-semantic-conventions/.eslintrc.js | 2 +- packages/opentelemetry-shim-opentracing/.eslintrc.js | 2 +- packages/sdk-metrics/.eslintrc.js | 2 +- packages/template/.eslintrc.js | 2 +- 45 files changed, 44 insertions(+), 44 deletions(-) rename eslint.config.js => eslint.base.js (100%) diff --git a/api/.eslintrc.js b/api/.eslintrc.js index 7d5c10c7f..08f88d491 100644 --- a/api/.eslintrc.js +++ b/api/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../eslint.config.js') + ...require('../eslint.base.js') } diff --git a/eslint.config.js b/eslint.base.js similarity index 100% rename from eslint.config.js rename to eslint.base.js diff --git a/experimental/examples/.eslintrc.js b/experimental/examples/.eslintrc.js index 7927fa0c3..3f58849df 100644 --- a/experimental/examples/.eslintrc.js +++ b/experimental/examples/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/experimental/packages/api-events/.eslintrc.js b/experimental/packages/api-events/.eslintrc.js index 7654abb6a..5cb19b029 100644 --- a/experimental/packages/api-events/.eslintrc.js +++ b/experimental/packages/api-events/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/api-logs/.eslintrc.js b/experimental/packages/api-logs/.eslintrc.js index 7654abb6a..5cb19b029 100644 --- a/experimental/packages/api-logs/.eslintrc.js +++ b/experimental/packages/api-logs/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js b/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js +++ b/experimental/packages/exporter-logs-otlp-grpc/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/exporter-logs-otlp-http/.eslintrc.js b/experimental/packages/exporter-logs-otlp-http/.eslintrc.js index f3f22e861..24f29328f 100644 --- a/experimental/packages/exporter-logs-otlp-http/.eslintrc.js +++ b/experimental/packages/exporter-logs-otlp-http/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { node: true, browser: true, }, - ...require('../../../eslint.config.js'), + ...require('../../../eslint.base.js'), }; diff --git a/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js b/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js +++ b/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js b/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js +++ b/experimental/packages/exporter-trace-otlp-grpc/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/exporter-trace-otlp-http/.eslintrc.js b/experimental/packages/exporter-trace-otlp-http/.eslintrc.js index e41d9a929..c05408904 100644 --- a/experimental/packages/exporter-trace-otlp-http/.eslintrc.js +++ b/experimental/packages/exporter-trace-otlp-http/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js b/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js +++ b/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-browser-detector/.eslintrc.js b/experimental/packages/opentelemetry-browser-detector/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/opentelemetry-browser-detector/.eslintrc.js +++ b/experimental/packages/opentelemetry-browser-detector/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js index e41d9a929..c05408904 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js b/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js index e41d9a929..c05408904 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js index b50dfd815..7364a382d 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "browser": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-instrumentation/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js index e41d9a929..c05408904 100644 --- a/experimental/packages/opentelemetry-instrumentation/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/opentelemetry-sdk-node/.eslintrc.js b/experimental/packages/opentelemetry-sdk-node/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/experimental/packages/opentelemetry-sdk-node/.eslintrc.js +++ b/experimental/packages/opentelemetry-sdk-node/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/otlp-exporter-base/.eslintrc.js b/experimental/packages/otlp-exporter-base/.eslintrc.js index e41d9a929..c05408904 100644 --- a/experimental/packages/otlp-exporter-base/.eslintrc.js +++ b/experimental/packages/otlp-exporter-base/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/otlp-grpc-exporter-base/.eslintrc.js b/experimental/packages/otlp-grpc-exporter-base/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/otlp-grpc-exporter-base/.eslintrc.js +++ b/experimental/packages/otlp-grpc-exporter-base/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/otlp-proto-exporter-base/.eslintrc.js b/experimental/packages/otlp-proto-exporter-base/.eslintrc.js index 3ed0fbeba..9cfb3fd42 100644 --- a/experimental/packages/otlp-proto-exporter-base/.eslintrc.js +++ b/experimental/packages/otlp-proto-exporter-base/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/otlp-transformer/.eslintrc.js b/experimental/packages/otlp-transformer/.eslintrc.js index b9004d202..0fe1bbf97 100644 --- a/experimental/packages/otlp-transformer/.eslintrc.js +++ b/experimental/packages/otlp-transformer/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/experimental/packages/sdk-logs/.eslintrc.js b/experimental/packages/sdk-logs/.eslintrc.js index 0c986a856..fc24af194 100644 --- a/experimental/packages/sdk-logs/.eslintrc.js +++ b/experimental/packages/sdk-logs/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { mocha: true, node: true, }, - ...require('../../../eslint.config.js'), + ...require('../../../eslint.base.js'), }; diff --git a/experimental/packages/shim-opencensus/.eslintrc.js b/experimental/packages/shim-opencensus/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/experimental/packages/shim-opencensus/.eslintrc.js +++ b/experimental/packages/shim-opencensus/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/package.json b/package.json index c0b6c172e..a1fbadf6d 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "devDependencies": { "@typescript-eslint/eslint-plugin": "5.59.11", "@typescript-eslint/parser": "5.59.11", - "eslint": "8.22.0", + "eslint": "8.43.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-node": "11.1.0", diff --git a/packages/opentelemetry-context-async-hooks/.eslintrc.js b/packages/opentelemetry-context-async-hooks/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/packages/opentelemetry-context-async-hooks/.eslintrc.js +++ b/packages/opentelemetry-context-async-hooks/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js b/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js index f21c67400..7561e7f83 100644 --- a/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js +++ b/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js @@ -7,5 +7,5 @@ module.exports = { "globals": { "Zone": "readonly" }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-context-zone/.eslintrc.js b/packages/opentelemetry-context-zone/.eslintrc.js index c21aa0e35..a374ccda6 100644 --- a/packages/opentelemetry-context-zone/.eslintrc.js +++ b/packages/opentelemetry-context-zone/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "browser": true, "commonjs": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-core/.eslintrc.js b/packages/opentelemetry-core/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/opentelemetry-core/.eslintrc.js +++ b/packages/opentelemetry-core/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-exporter-jaeger/.eslintrc.js b/packages/opentelemetry-exporter-jaeger/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/packages/opentelemetry-exporter-jaeger/.eslintrc.js +++ b/packages/opentelemetry-exporter-jaeger/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-exporter-zipkin/.eslintrc.js b/packages/opentelemetry-exporter-zipkin/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/opentelemetry-exporter-zipkin/.eslintrc.js +++ b/packages/opentelemetry-exporter-zipkin/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-propagator-b3/.eslintrc.js b/packages/opentelemetry-propagator-b3/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/opentelemetry-propagator-b3/.eslintrc.js +++ b/packages/opentelemetry-propagator-b3/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-propagator-jaeger/.eslintrc.js b/packages/opentelemetry-propagator-jaeger/.eslintrc.js index b23ee98fc..3913d6d94 100644 --- a/packages/opentelemetry-propagator-jaeger/.eslintrc.js +++ b/packages/opentelemetry-propagator-jaeger/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "browser": true, }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-resources/.eslintrc.js b/packages/opentelemetry-resources/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/opentelemetry-resources/.eslintrc.js +++ b/packages/opentelemetry-resources/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-sdk-trace-base/.eslintrc.js b/packages/opentelemetry-sdk-trace-base/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/opentelemetry-sdk-trace-base/.eslintrc.js +++ b/packages/opentelemetry-sdk-trace-base/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-sdk-trace-node/.eslintrc.js b/packages/opentelemetry-sdk-trace-node/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/packages/opentelemetry-sdk-trace-node/.eslintrc.js +++ b/packages/opentelemetry-sdk-trace-node/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-sdk-trace-web/.eslintrc.js b/packages/opentelemetry-sdk-trace-web/.eslintrc.js index 86d794e2f..359356edd 100644 --- a/packages/opentelemetry-sdk-trace-web/.eslintrc.js +++ b/packages/opentelemetry-sdk-trace-web/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "browser": true, }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-semantic-conventions/.eslintrc.js b/packages/opentelemetry-semantic-conventions/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/opentelemetry-semantic-conventions/.eslintrc.js +++ b/packages/opentelemetry-semantic-conventions/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/opentelemetry-shim-opentracing/.eslintrc.js b/packages/opentelemetry-shim-opentracing/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/packages/opentelemetry-shim-opentracing/.eslintrc.js +++ b/packages/opentelemetry-shim-opentracing/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/sdk-metrics/.eslintrc.js b/packages/sdk-metrics/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/packages/sdk-metrics/.eslintrc.js +++ b/packages/sdk-metrics/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/packages/template/.eslintrc.js b/packages/template/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/packages/template/.eslintrc.js +++ b/packages/template/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } From 68039c55ecc7f8ff6af15c5c430d9202b6bf9f8b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 6 Jul 2023 15:27:02 +0200 Subject: [PATCH 34/94] chore(deps): update dependency eslint to v8.44.0 (#3916) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1fbadf6d..2890bbe58 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "devDependencies": { "@typescript-eslint/eslint-plugin": "5.59.11", "@typescript-eslint/parser": "5.59.11", - "eslint": "8.43.0", + "eslint": "8.44.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-node": "11.1.0", From cab31aadb14c3e3ff3dda3e501234e717f1461e2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 7 Jul 2023 10:10:00 +0200 Subject: [PATCH 35/94] chore(deps): update all patch versions (#3972) --- api/package.json | 2 +- experimental/packages/api-events/package.json | 2 +- experimental/packages/api-logs/package.json | 2 +- .../packages/exporter-logs-otlp-grpc/package.json | 2 +- .../packages/exporter-logs-otlp-http/package.json | 4 ++-- .../packages/exporter-logs-otlp-proto/package.json | 4 ++-- .../packages/exporter-trace-otlp-grpc/package.json | 2 +- .../packages/exporter-trace-otlp-http/package.json | 4 ++-- .../packages/exporter-trace-otlp-proto/package.json | 4 ++-- .../packages/opentelemetry-browser-detector/package.json | 4 ++-- .../opentelemetry-exporter-metrics-otlp-grpc/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-http/package.json | 4 ++-- .../package.json | 2 +- .../opentelemetry-instrumentation-fetch/package.json | 4 ++-- .../package.json | 4 ++-- .../packages/opentelemetry-instrumentation/package.json | 4 ++-- experimental/packages/otlp-exporter-base/package.json | 4 ++-- .../packages/otlp-grpc-exporter-base/package.json | 2 +- .../packages/otlp-proto-exporter-base/package.json | 2 +- experimental/packages/otlp-transformer/package.json | 2 +- experimental/packages/sdk-logs/package.json | 4 ++-- packages/opentelemetry-context-zone-peer-dep/package.json | 4 ++-- packages/opentelemetry-context-zone/package.json | 2 +- packages/opentelemetry-core/package.json | 2 +- packages/opentelemetry-exporter-zipkin/package.json | 4 ++-- packages/opentelemetry-propagator-jaeger/package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- packages/opentelemetry-sdk-trace-base/package.json | 2 +- packages/opentelemetry-sdk-trace-web/package.json | 4 ++-- packages/sdk-metrics/package.json | 4 ++-- selenium-tests/package.json | 8 ++++---- 31 files changed, 49 insertions(+), 49 deletions(-) diff --git a/api/package.json b/api/package.json index 296c86d4c..e8952c3cf 100644 --- a/api/package.json +++ b/api/package.json @@ -71,7 +71,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 4b3f8660c..fe43dbc69 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -73,7 +73,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 315534d6b..02cc0bc2b 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -73,7 +73,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 9a8244e50..1a71d47cf 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.0", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index b29e26ec0..459612e2c 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -71,7 +71,7 @@ ], "sideEffects": false, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api-logs": "0.41.0", "@opentelemetry/resources": "1.15.0", "@types/mocha": "10.0.1", @@ -85,7 +85,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 5935d1719..a166f6241 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -74,7 +74,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 2cf8e237a..524adb106 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-exporter-base": "0.41.0", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index ce26e9463..cdb697283 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -76,7 +76,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index a812a1e7c..ef8f876ac 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -62,7 +62,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -73,7 +73,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 5c20aa95b..29373f305 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -63,7 +63,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 380c0e212..15624bac4 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 6190a4144..1e696f527 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -76,7 +76,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 440af69cb..2168d2864 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index f641b9ec4..c1213ea31 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.0", "@opentelemetry/propagator-b3": "1.15.0", @@ -69,7 +69,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index f628c633e..c7179d59d 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.0", "@opentelemetry/propagator-b3": "1.15.0", @@ -69,7 +69,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 4141beed0..b788dea26 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -82,7 +82,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@opentelemetry/sdk-metrics": "1.15.0", "@types/mocha": "10.0.1", @@ -97,7 +97,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 77c49bfaa..142f9ca88 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -65,7 +65,7 @@ "tslib": "^2.3.1" }, "devDependencies": { - "@babel/core": "7.22.5", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -75,7 +75,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index c8fcd6fcd..0610cb9d4 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index fb8a8ce04..a76429985 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -59,7 +59,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 6c020a16f..ca8d12685 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -65,7 +65,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 898bb86be..106a3dbf4 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -74,7 +74,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.4.0 <1.5.0", "@opentelemetry/api-logs": "0.41.0", - "@babel/core": "7.22.5", + "@babel/core": "7.22.8", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -83,7 +83,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index fa1ef0420..8026461c6 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -66,7 +66,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index b2735c901..70f79503f 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -50,7 +50,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 70d32b5de..1e9d1d8c6 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -74,7 +74,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index e8bd41837..4b979ec13 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -60,7 +60,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -72,7 +72,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index fdabf7a7e..f110f2d8d 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -64,7 +64,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index a5862f44d..997635f42 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -71,7 +71,7 @@ "cross-var": "1.1.0", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 884e0e8c7..4c306805c 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -75,7 +75,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index ab668e3c4..f7dd504e7 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -55,7 +55,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@opentelemetry/context-zone": "1.15.0", "@opentelemetry/propagator-b3": "1.15.0", @@ -71,7 +71,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-jquery": "0.2.4", "karma-mocha": "2.0.1", "karma-mocha-webworker": "1.3.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index e7d695ca9..f85e67faf 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0", "@types/lodash.merge": "4.6.7", - "@babel/core": "7.22.5", + "@babel/core": "7.22.8", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -65,7 +65,7 @@ "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.0", + "karma-coverage": "2.2.1", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 829be06e3..5c0fe40da 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -31,11 +31,11 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.22.6", + "@babel/core": "7.22.8", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.22.6", - "@babel/plugin-transform-runtime": "7.22.6", - "@babel/preset-env": "7.22.6", + "@babel/plugin-proposal-decorators": "7.22.7", + "@babel/plugin-transform-runtime": "7.22.7", + "@babel/preset-env": "7.22.7", "@opentelemetry/api": "^1.0.0", "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", From 6d13eb437932e46e021c840ac5d327d556eb3c52 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 10 Jul 2023 10:36:44 +0200 Subject: [PATCH 36/94] chore(deps): update dependency semver to v7.5.4 (#3977) --- .../packages/opentelemetry-instrumentation-grpc/package.json | 2 +- experimental/packages/opentelemetry-sdk-node/package.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index ca20eade9..10019d25c 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -61,7 +61,7 @@ "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", - "semver": "7.5.3", + "semver": "7.5.4", "sinon": "15.1.2", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 9ec166cb7..dcf827d0f 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -73,7 +73,7 @@ "lerna": "7.1.1", "mocha": "10.2.0", "nyc": "15.1.0", - "semver": "7.5.3", + "semver": "7.5.4", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", diff --git a/package.json b/package.json index 2890bbe58..2b8572602 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "linkinator": "5.0.1", "markdownlint-cli": "0.35.0", "prettier": "2.8.8", - "semver": "7.5.3", + "semver": "7.5.4", "typedoc": "0.22.18", "typedoc-plugin-missing-exports": "1.0.0", "typedoc-plugin-resolve-crossmodule-references": "0.2.2", From fc28665d090f4426ece597ea44546dbc1d95d665 Mon Sep 17 00:00:00 2001 From: Jamie Danielson Date: Mon, 10 Jul 2023 11:31:57 -0400 Subject: [PATCH 37/94] docs(sdk-metrics): add example of exponential histogram metric (#3855) Co-authored-by: Chengzhong Wu Co-authored-by: Marc Pichler --- doc/metrics.md | 8 ++--- examples/otlp-exporter-node/metrics.js | 44 ++++++++++++++++++++++---- experimental/CHANGELOG.md | 4 +++ 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/doc/metrics.md b/doc/metrics.md index 7162f4363..e2f2b5a14 100644 --- a/doc/metrics.md +++ b/doc/metrics.md @@ -20,7 +20,7 @@ _Metrics API Reference: { requestCounter.add(1, attributes); upDownCounter.add(Math.random() > 0.5 ? 1 : -1, attributes); histogram.record(Math.random(), attributes); + exponentialHistogram.record(Math.random(), attributes); }, 1000); diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 7d22becab..762a2b9aa 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to experimental packages in this project will be documented ## Unreleased +### :books: (Refine Doc) + +* docs(sdk-metrics): add example of exponential histogram metric [#3855](https://github.com/open-telemetry/opentelemetry-js/pull/3855) @JamieDanielson + ### :boom: Breaking Change ### :rocket: (Enhancement) From 552abc822178212edf48e56123928d86bad6f092 Mon Sep 17 00:00:00 2001 From: Pushpak Prateek <56984884+psk001@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:25:53 +0530 Subject: [PATCH 38/94] feat(sdk-node): logs support added (#3969) --- experimental/CHANGELOG.md | 2 + .../opentelemetry-sdk-node/package.json | 2 + .../opentelemetry-sdk-node/src/index.ts | 1 + .../opentelemetry-sdk-node/src/sdk.ts | 58 +++++++++++++++++ .../opentelemetry-sdk-node/src/types.ts | 2 + .../opentelemetry-sdk-node/test/sdk.test.ts | 63 +++++++++++++++++++ .../opentelemetry-sdk-node/tsconfig.json | 6 ++ 7 files changed, 134 insertions(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 762a2b9aa..c62993188 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -12,6 +12,8 @@ All notable changes to experimental packages in this project will be documented ### :rocket: (Enhancement) +* feat(sdk-node): logs support added [#3969](https://github.com/open-telemetry/opentelemetry-js/pull/3969) @psk001 + ### :bug: (Bug Fix) ### :books: (Refine Doc) diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index dcf827d0f..a99bab01a 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -44,6 +44,7 @@ "access": "public" }, "dependencies": { + "@opentelemetry/api-logs":"0.41.0", "@opentelemetry/core": "1.15.0", "@opentelemetry/exporter-jaeger": "1.15.0", "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", @@ -52,6 +53,7 @@ "@opentelemetry/exporter-zipkin": "1.15.0", "@opentelemetry/instrumentation": "0.41.0", "@opentelemetry/resources": "1.15.0", + "@opentelemetry/sdk-logs":"0.41.0", "@opentelemetry/sdk-metrics": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", "@opentelemetry/sdk-trace-node": "1.15.0", diff --git a/experimental/packages/opentelemetry-sdk-node/src/index.ts b/experimental/packages/opentelemetry-sdk-node/src/index.ts index d24617420..891288ee6 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/index.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/index.ts @@ -17,6 +17,7 @@ export * as api from '@opentelemetry/api'; export * as contextBase from '@opentelemetry/api'; export * as core from '@opentelemetry/core'; +export * as logs from '@opentelemetry/sdk-logs'; export * as metrics from '@opentelemetry/sdk-metrics'; export * as node from '@opentelemetry/sdk-trace-node'; export * as resources from '@opentelemetry/resources'; diff --git a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts index 07921a88b..8b96dddea 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/sdk.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/sdk.ts @@ -21,6 +21,7 @@ import { diag, DiagConsoleLogger, } from '@opentelemetry/api'; +import { logs } from '@opentelemetry/api-logs'; import { InstrumentationOption, registerInstrumentations, @@ -35,6 +36,7 @@ import { Resource, ResourceDetectionConfig, } from '@opentelemetry/resources'; +import { LogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs'; import { MeterProvider, MetricReader, View } from '@opentelemetry/sdk-metrics'; import { BatchSpanProcessor, @@ -63,6 +65,13 @@ export type MeterProviderConfig = { views?: View[]; }; +export type LoggerProviderConfig = { + /** + * Reference to the LoggerRecordProcessor instance by the NodeSDK + */ + logRecordProcessor: LogRecordProcessor; +}; + export class NodeSDK { private _tracerProviderConfig?: { tracerConfig: NodeTracerConfig; @@ -70,6 +79,7 @@ export class NodeSDK { contextManager?: ContextManager; textMapPropagator?: TextMapPropagator; }; + private _loggerProviderConfig?: LoggerProviderConfig; private _meterProviderConfig?: MeterProviderConfig; private _instrumentations: InstrumentationOption[]; @@ -79,6 +89,7 @@ export class NodeSDK { private _autoDetectResources: boolean; private _tracerProvider?: NodeTracerProvider | TracerProviderWithEnvExporters; + private _loggerProvider?: LoggerProvider; private _meterProvider?: MeterProvider; private _serviceName?: string; @@ -140,6 +151,13 @@ export class NodeSDK { ); } + if (configuration.logRecordProcessor) { + const loggerProviderConfig: LoggerProviderConfig = { + logRecordProcessor: configuration.logRecordProcessor, + }; + this.configureLoggerProvider(loggerProviderConfig); + } + if (configuration.metricReader || configuration.views) { const meterProviderConfig: MeterProviderConfig = {}; if (configuration.metricReader) { @@ -175,6 +193,30 @@ export class NodeSDK { }; } + /**Set configurations needed to register a LoggerProvider */ + public configureLoggerProvider(config: LoggerProviderConfig): void { + // nothing is set yet, we can set config and then return + if (this._loggerProviderConfig == null) { + this._loggerProviderConfig = config; + return; + } + + // make sure we do not override existing logRecordProcessor with other logRecordProcessors. + if ( + this._loggerProviderConfig.logRecordProcessor != null && + config.logRecordProcessor != null + ) { + throw new Error( + 'LogRecordProcessor passed but LogRecordProcessor has already been configured.' + ); + } + + // set logRecordProcessor, but make sure we do not override existing logRecordProcessors with null/undefined. + if (config.logRecordProcessor != null) { + this._loggerProviderConfig.logRecordProcessor = config.logRecordProcessor; + } + } + /** Set configurations needed to register a MeterProvider */ public configureMeterProvider(config: MeterProviderConfig): void { // nothing is set yet, we can set config and return. @@ -269,6 +311,19 @@ export class NodeSDK { propagator: this._tracerProviderConfig?.textMapPropagator, }); + if (this._loggerProviderConfig) { + const loggerProvider = new LoggerProvider({ + resource: this._resource, + }); + loggerProvider.addLogRecordProcessor( + this._loggerProviderConfig.logRecordProcessor + ); + + this._loggerProvider = loggerProvider; + + logs.setGlobalLoggerProvider(loggerProvider); + } + if (this._meterProviderConfig) { const meterProvider = new MeterProvider({ resource: this._resource, @@ -299,6 +354,9 @@ export class NodeSDK { if (this._tracerProvider) { promises.push(this._tracerProvider.shutdown()); } + if (this._loggerProvider) { + promises.push(this._loggerProvider.shutdown()); + } if (this._meterProvider) { promises.push(this._meterProvider.shutdown()); } diff --git a/experimental/packages/opentelemetry-sdk-node/src/types.ts b/experimental/packages/opentelemetry-sdk-node/src/types.ts index 03efc3114..9292e0ae7 100644 --- a/experimental/packages/opentelemetry-sdk-node/src/types.ts +++ b/experimental/packages/opentelemetry-sdk-node/src/types.ts @@ -18,6 +18,7 @@ import type { ContextManager } from '@opentelemetry/api'; import { TextMapPropagator } from '@opentelemetry/api'; import { InstrumentationOption } from '@opentelemetry/instrumentation'; import { Detector, DetectorSync, IResource } from '@opentelemetry/resources'; +import { LogRecordProcessor } from '@opentelemetry/sdk-logs'; import { MetricReader, View } from '@opentelemetry/sdk-metrics'; import { Sampler, @@ -31,6 +32,7 @@ export interface NodeSDKConfiguration { autoDetectResources: boolean; contextManager: ContextManager; textMapPropagator: TextMapPropagator; + logRecordProcessor: LogRecordProcessor; metricReader: MetricReader; views: View[]; instrumentations: InstrumentationOption[]; diff --git a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts index 7a385a760..6fb76f3da 100644 --- a/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts +++ b/experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts @@ -59,6 +59,12 @@ import { Resource, } from '@opentelemetry/resources'; import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; +import { logs } from '@opentelemetry/api-logs'; +import { + SimpleLogRecordProcessor, + InMemoryLogRecordExporter, + LoggerProvider, +} from '@opentelemetry/sdk-logs'; const DefaultContextManager = semver.gte(process.version, '14.8.0') ? AsyncLocalStorageContextManager @@ -112,6 +118,7 @@ describe('Node SDK', () => { 'tracer provider should not have changed' ); assert.ok(!(metrics.getMeterProvider() instanceof MeterProvider)); + assert.ok(!(logs.getLoggerProvider() instanceof LoggerProvider)); delete env.OTEL_TRACES_EXPORTER; }); @@ -233,6 +240,40 @@ describe('Node SDK', () => { await sdk.shutdown(); delete env.OTEL_TRACES_EXPORTER; }); + + it('should register a logger provider if a log record processor is provided', async () => { + env.OTEL_TRACES_EXPORTER = 'none'; + const logRecordExporter = new InMemoryLogRecordExporter(); + const logRecordProcessor = new SimpleLogRecordProcessor( + logRecordExporter + ); + const sdk = new NodeSDK({ + logRecordProcessor: logRecordProcessor, + autoDetectResources: false, + }); + + sdk.start(); + + assert.strictEqual( + context['_getContextManager'](), + ctxManager, + 'context manager should not change' + ); + assert.strictEqual( + propagation['_getGlobalPropagator'](), + propagator, + 'propagator should not change' + ); + assert.strictEqual( + (trace.getTracerProvider() as ProxyTracerProvider).getDelegate(), + delegate, + 'tracer provider should not have changed' + ); + + assert.ok(logs.getLoggerProvider() instanceof LoggerProvider); + await sdk.shutdown(); + delete env.OTEL_TRACES_EXPORTER; + }); }); async function waitForNumberOfMetrics( @@ -406,6 +447,28 @@ describe('Node SDK', () => { ); }); + it('should throw error when calling configureLoggerProvider when logRecordProcessor is already configured', () => { + const logRecordExporter = new InMemoryLogRecordExporter(); + const logRecordProcessor = new SimpleLogRecordProcessor(logRecordExporter); + const sdk = new NodeSDK({ + logRecordProcessor: logRecordProcessor, + autoDetectResources: false, + }); + + assert.throws( + () => { + sdk.configureLoggerProvider({ + logRecordProcessor: logRecordProcessor, + }); + }, + (error: Error) => { + return error.message.includes( + 'LogRecordProcessor passed but LogRecordProcessor has already been configured.' + ); + } + ); + }); + describe('detectResources', async () => { beforeEach(() => { process.env.OTEL_RESOURCE_ATTRIBUTES = diff --git a/experimental/packages/opentelemetry-sdk-node/tsconfig.json b/experimental/packages/opentelemetry-sdk-node/tsconfig.json index add730f8b..4091bf66e 100644 --- a/experimental/packages/opentelemetry-sdk-node/tsconfig.json +++ b/experimental/packages/opentelemetry-sdk-node/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../../../api" }, + { + "path": "../../packages/api-logs" + }, { "path": "../../../packages/opentelemetry-context-async-hooks" }, @@ -36,6 +39,9 @@ { "path": "../../../packages/opentelemetry-semantic-conventions" }, + { + "path": "../../packages/sdk-logs" + }, { "path": "../../../packages/sdk-metrics" }, From 013695d45d5c77dfee658ec1ee0675a87977657d Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 11 Jul 2023 08:51:11 +0200 Subject: [PATCH 39/94] docs(api-logs): add disclaimers (#3979) --- experimental/packages/api-logs/README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/experimental/packages/api-logs/README.md b/experimental/packages/api-logs/README.md index b36d5bf06..a4e3459f0 100644 --- a/experimental/packages/api-logs/README.md +++ b/experimental/packages/api-logs/README.md @@ -1,13 +1,19 @@ -# OpenTelemetry API for JavaScript +# OpenTelemetry Logs Bridge API for JavaScript [![NPM Published Version][npm-img]][npm-url] [![Apache License][license-image]][license-image] -This package provides everything needed to interact with the unstable OpenTelemetry Logs API, including all TypeScript interfaces, enums, and no-op implementations. It is intended for use both on the server and in the browser. +**Note: This is an experimental package under active development. New releases may include breaking changes.** -## Beta Software - Use at your own risk +This package provides everything needed to interact with the unstable OpenTelemetry Logs Bridge API, including all TypeScript interfaces, enums, and no-op implementations. It is intended for use both on the server and in the browser. -The logs API is considered alpha software and there is no guarantee of stability or long-term support. When the API is stabilized, it will be made available and supported long-term in the `@opentelemetry/api` package and this package will be deprecated. +**Note: This module defines a log backend API. The API is not intended to be called by application developers directly. +It is provided for logging library authors to build log appenders, which use this API to bridge between existing +logging libraries and the OpenTelemetry log data model.** + +## Alpha Software - Use at your own risk + +The Logs Bridge API is considered alpha software and there is no guarantee of stability or long-term support. When the API is stabilized, it will be made available and supported long-term in the `@opentelemetry/api` package and this package will be deprecated. ## Quick Start From 774d25463bdbf7f290d99a07f627237888137e24 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Tue, 11 Jul 2023 22:58:16 +0700 Subject: [PATCH 40/94] fix(document-load): compatibility issue with @opentelemetry/sdk-trace-web@1.15.0 (#1565) --- .../package.json | 2 +- .../test/documentLoad.test.ts | 23 ++++++------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 463dab251..b637d7940 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -79,7 +79,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.40.0", "@opentelemetry/sdk-trace-base": "^1.0.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", + "@opentelemetry/sdk-trace-web": "^1.15.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts b/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts index 3ba404c07..b27674bb6 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts +++ b/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts @@ -210,11 +210,10 @@ function ensureNetworkEventsExists(events: TimedEvent[]) { assert.strictEqual(events[1].name, PTN.DOMAIN_LOOKUP_START); assert.strictEqual(events[2].name, PTN.DOMAIN_LOOKUP_END); assert.strictEqual(events[3].name, PTN.CONNECT_START); - assert.strictEqual(events[4].name, PTN.SECURE_CONNECTION_START); - assert.strictEqual(events[5].name, PTN.CONNECT_END); - assert.strictEqual(events[6].name, PTN.REQUEST_START); - assert.strictEqual(events[7].name, PTN.RESPONSE_START); - assert.strictEqual(events[8].name, PTN.RESPONSE_END); + assert.strictEqual(events[4].name, PTN.CONNECT_END); + assert.strictEqual(events[5].name, PTN.REQUEST_START); + assert.strictEqual(events[6].name, PTN.RESPONSE_START); + assert.strictEqual(events[7].name, PTN.RESPONSE_END); } describe('DocumentLoad Instrumentation', () => { @@ -370,7 +369,7 @@ describe('DocumentLoad Instrumentation', () => { assert.strictEqual(fsEvents[7].name, PTN.LOAD_EVENT_START); assert.strictEqual(fsEvents[8].name, PTN.LOAD_EVENT_END); - assert.strictEqual(rsEvents.length, 9); + assert.strictEqual(rsEvents.length, 8); assert.strictEqual(fsEvents.length, 11); assert.strictEqual(exporter.getFinishedSpans().length, 2); done(); @@ -486,15 +485,7 @@ describe('DocumentLoad Instrumentation', () => { 'http://localhost:8090/bundle.js' ); - assert.strictEqual(srEvents1[0].name, PTN.FETCH_START); - assert.strictEqual(srEvents1[1].name, PTN.DOMAIN_LOOKUP_START); - assert.strictEqual(srEvents1[2].name, PTN.DOMAIN_LOOKUP_END); - assert.strictEqual(srEvents1[3].name, PTN.CONNECT_START); - assert.strictEqual(srEvents1[4].name, PTN.SECURE_CONNECTION_START); - assert.strictEqual(srEvents1[5].name, PTN.CONNECT_END); - assert.strictEqual(srEvents1[6].name, PTN.REQUEST_START); - assert.strictEqual(srEvents1[7].name, PTN.RESPONSE_START); - assert.strictEqual(srEvents1[8].name, PTN.RESPONSE_END); + ensureNetworkEventsExists(srEvents1); assert.strictEqual(exporter.getFinishedSpans().length, 3); done(); @@ -570,7 +561,7 @@ describe('DocumentLoad Instrumentation', () => { assert.strictEqual(rsEvents[7].name, PTN.LOAD_EVENT_START); assert.strictEqual(rsEvents[8].name, PTN.LOAD_EVENT_END); - assert.strictEqual(fsEvents.length, 9); + assert.strictEqual(fsEvents.length, 8); assert.strictEqual(rsEvents.length, 9); assert.strictEqual(exporter.getFinishedSpans().length, 2); done(); From 939d2d72b458e0906a1c776914f02684b54c2ede Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 11 Jul 2023 18:13:07 +0000 Subject: [PATCH 41/94] [AutoMerge] Identifying and fixing merge issues from staged repos Processing otel-js - (xM) /auto-merge/js/eslint.base.js - Re-Copying master file - (xS) /auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js - Re-Copying master file as size mismatch 129 !== 127 - (xS) /auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js - Re-Copying master file as size mismatch 129 !== 127 - (xS) /auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js - Re-Copying master file as size mismatch 129 !== 127 - (xS) /auto-merge/js/experimental/packages/opentelemetry-sdk-node/.eslintrc.js - Re-Copying master file as size mismatch 129 !== 127 - (xS) /auto-merge/js/experimental/packages/shim-opencensus/.eslintrc.js - Re-Copying master file as size mismatch 129 !== 127 - (xS) /auto-merge/js/packages/opentelemetry-context-async-hooks/.eslintrc.js - Re-Copying master file as size mismatch 126 !== 124 - (xS) /auto-merge/js/packages/opentelemetry-exporter-jaeger/.eslintrc.js - Re-Copying master file as size mismatch 126 !== 124 - (xS) /auto-merge/js/packages/opentelemetry-sdk-trace-node/.eslintrc.js - Re-Copying master file as size mismatch 126 !== 124 - (xS) /auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js - Re-Copying master file as size mismatch 177 !== 175 - (xS) /auto-merge/js/packages/opentelemetry-shim-opentracing/.eslintrc.js - Re-Copying master file as size mismatch 126 !== 124 - (xS) /auto-merge/js/packages/sdk-metrics/.eslintrc.js - Re-Copying master file as size mismatch 126 !== 124 - (xS) /auto-merge/js/packages/template/.eslintrc.js - Re-Copying master file as size mismatch 177 !== 175 - (xM) /auto-merge/js/tsconfig.tsbuildinfo - Re-Copying master file - (*E) /auto-merge/js/eslint.config.js - Removing extra file - (*E) /eslint.base.js - Removing extra file - (*F) /experimental - Removing extra folder experimental - (*F) /packages - Removing extra folder packages ...truncated... Processing otel-js-contrib --- .../opentelemetry-host-metrics/.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../opentelemetry-redis-common/.eslintrc.js | 2 +- .../opentelemetry-sql-common/.eslintignore | 0 .../opentelemetry-sql-common/.eslintrc.js | 0 .../opentelemetry-sql-common/LICENSE | 0 .../opentelemetry-sql-common/README.md | 0 .../opentelemetry-sql-common/package.json | 0 .../opentelemetry-sql-common/src/index.ts | 0 .../test/sql-common.test.ts | 0 .../opentelemetry-sql-common/tsconfig.json | 0 .../opentelemetry-test-utils/.eslintrc.js | 2 +- .../node/instrumentation-amqplib/.eslintrc.js | 2 +- .../node/instrumentation-fs/.eslintrc.js | 2 +- .../instrumentation-lru-memoizer/.eslintrc.js | 2 +- .../instrumentation-mongoose/.eslintrc.js | 2 +- .../instrumentation-socket.io/.eslintrc.js | 2 +- .../test/mongodb-v4.metrics.test.ts | 180 ------------------ .../.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../js/eslint.base.js | 0 auto-merge/js/eslint.config.js | 71 ------- .../.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../opentelemetry-sdk-node/.eslintrc.js | 2 +- .../packages/shim-opencensus/.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../opentelemetry-sdk-trace-node/.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../.eslintrc.js | 2 +- .../js/packages/sdk-metrics/.eslintrc.js | 2 +- auto-merge/js/packages/template/.eslintrc.js | 2 +- .../js/tsconfig.tsbuildinfo | 0 36 files changed, 24 insertions(+), 275 deletions(-) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/.eslintignore (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/.eslintrc.js (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/LICENSE (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/README.md (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/package.json (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/src/index.ts (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/test/sql-common.test.ts (100%) rename {packages => auto-merge/contrib/packages}/opentelemetry-sql-common/tsconfig.json (100%) delete mode 100644 auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts rename eslint.base.js => auto-merge/js/eslint.base.js (100%) delete mode 100644 auto-merge/js/eslint.config.js rename tsconfig.tsbuildinfo => auto-merge/js/tsconfig.tsbuildinfo (100%) diff --git a/auto-merge/contrib/packages/opentelemetry-host-metrics/.eslintrc.js b/auto-merge/contrib/packages/opentelemetry-host-metrics/.eslintrc.js index 3d9af536b..f726f3bec 100644 --- a/auto-merge/contrib/packages/opentelemetry-host-metrics/.eslintrc.js +++ b/auto-merge/contrib/packages/opentelemetry-host-metrics/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js b/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js index 36847df9f..9dfe62f9b 100644 --- a/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js +++ b/auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/auto-merge/contrib/packages/opentelemetry-propagation-utils/.eslintrc.js b/auto-merge/contrib/packages/opentelemetry-propagation-utils/.eslintrc.js index 3d9af536b..f726f3bec 100644 --- a/auto-merge/contrib/packages/opentelemetry-propagation-utils/.eslintrc.js +++ b/auto-merge/contrib/packages/opentelemetry-propagation-utils/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/auto-merge/contrib/packages/opentelemetry-redis-common/.eslintrc.js b/auto-merge/contrib/packages/opentelemetry-redis-common/.eslintrc.js index 3d9af536b..f726f3bec 100644 --- a/auto-merge/contrib/packages/opentelemetry-redis-common/.eslintrc.js +++ b/auto-merge/contrib/packages/opentelemetry-redis-common/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/packages/opentelemetry-sql-common/.eslintignore b/auto-merge/contrib/packages/opentelemetry-sql-common/.eslintignore similarity index 100% rename from packages/opentelemetry-sql-common/.eslintignore rename to auto-merge/contrib/packages/opentelemetry-sql-common/.eslintignore diff --git a/packages/opentelemetry-sql-common/.eslintrc.js b/auto-merge/contrib/packages/opentelemetry-sql-common/.eslintrc.js similarity index 100% rename from packages/opentelemetry-sql-common/.eslintrc.js rename to auto-merge/contrib/packages/opentelemetry-sql-common/.eslintrc.js diff --git a/packages/opentelemetry-sql-common/LICENSE b/auto-merge/contrib/packages/opentelemetry-sql-common/LICENSE similarity index 100% rename from packages/opentelemetry-sql-common/LICENSE rename to auto-merge/contrib/packages/opentelemetry-sql-common/LICENSE diff --git a/packages/opentelemetry-sql-common/README.md b/auto-merge/contrib/packages/opentelemetry-sql-common/README.md similarity index 100% rename from packages/opentelemetry-sql-common/README.md rename to auto-merge/contrib/packages/opentelemetry-sql-common/README.md diff --git a/packages/opentelemetry-sql-common/package.json b/auto-merge/contrib/packages/opentelemetry-sql-common/package.json similarity index 100% rename from packages/opentelemetry-sql-common/package.json rename to auto-merge/contrib/packages/opentelemetry-sql-common/package.json diff --git a/packages/opentelemetry-sql-common/src/index.ts b/auto-merge/contrib/packages/opentelemetry-sql-common/src/index.ts similarity index 100% rename from packages/opentelemetry-sql-common/src/index.ts rename to auto-merge/contrib/packages/opentelemetry-sql-common/src/index.ts diff --git a/packages/opentelemetry-sql-common/test/sql-common.test.ts b/auto-merge/contrib/packages/opentelemetry-sql-common/test/sql-common.test.ts similarity index 100% rename from packages/opentelemetry-sql-common/test/sql-common.test.ts rename to auto-merge/contrib/packages/opentelemetry-sql-common/test/sql-common.test.ts diff --git a/packages/opentelemetry-sql-common/tsconfig.json b/auto-merge/contrib/packages/opentelemetry-sql-common/tsconfig.json similarity index 100% rename from packages/opentelemetry-sql-common/tsconfig.json rename to auto-merge/contrib/packages/opentelemetry-sql-common/tsconfig.json diff --git a/auto-merge/contrib/packages/opentelemetry-test-utils/.eslintrc.js b/auto-merge/contrib/packages/opentelemetry-test-utils/.eslintrc.js index 3d9af536b..f726f3bec 100644 --- a/auto-merge/contrib/packages/opentelemetry-test-utils/.eslintrc.js +++ b/auto-merge/contrib/packages/opentelemetry-test-utils/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/auto-merge/contrib/plugins/node/instrumentation-amqplib/.eslintrc.js b/auto-merge/contrib/plugins/node/instrumentation-amqplib/.eslintrc.js index 9baf1b495..f756f4488 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-amqplib/.eslintrc.js +++ b/auto-merge/contrib/plugins/node/instrumentation-amqplib/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.base.js') + ...require('../../../eslint.config.js') } diff --git a/auto-merge/contrib/plugins/node/instrumentation-fs/.eslintrc.js b/auto-merge/contrib/plugins/node/instrumentation-fs/.eslintrc.js index 9baf1b495..f756f4488 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-fs/.eslintrc.js +++ b/auto-merge/contrib/plugins/node/instrumentation-fs/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.base.js') + ...require('../../../eslint.config.js') } diff --git a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/.eslintrc.js b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/.eslintrc.js index 9baf1b495..f756f4488 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/.eslintrc.js +++ b/auto-merge/contrib/plugins/node/instrumentation-lru-memoizer/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.base.js') + ...require('../../../eslint.config.js') } diff --git a/auto-merge/contrib/plugins/node/instrumentation-mongoose/.eslintrc.js b/auto-merge/contrib/plugins/node/instrumentation-mongoose/.eslintrc.js index 9baf1b495..f756f4488 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-mongoose/.eslintrc.js +++ b/auto-merge/contrib/plugins/node/instrumentation-mongoose/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.base.js') + ...require('../../../eslint.config.js') } diff --git a/auto-merge/contrib/plugins/node/instrumentation-socket.io/.eslintrc.js b/auto-merge/contrib/plugins/node/instrumentation-socket.io/.eslintrc.js index 9baf1b495..f756f4488 100644 --- a/auto-merge/contrib/plugins/node/instrumentation-socket.io/.eslintrc.js +++ b/auto-merge/contrib/plugins/node/instrumentation-socket.io/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.base.js') + ...require('../../../eslint.config.js') } diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts deleted file mode 100644 index 189ff458d..000000000 --- a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.metrics.test.ts +++ /dev/null @@ -1,180 +0,0 @@ -/* - * 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. - */ - -// for testing locally "npm run docker:start" - -import { MongoDBInstrumentation } from '../src'; - -// TODO: use test-utils after the new package has released. -import { - AggregationTemporality, - DataPointType, - InMemoryMetricExporter, - MeterProvider, - PeriodicExportingMetricReader, - ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; - -const otelTestingMeterProvider = new MeterProvider(); -const inMemoryMetricsExporter = new InMemoryMetricExporter( - AggregationTemporality.CUMULATIVE -); -const metricReader = new PeriodicExportingMetricReader({ - exporter: inMemoryMetricsExporter, - exportIntervalMillis: 100, - exportTimeoutMillis: 100, -}); - -import { registerInstrumentationTesting } from '@opentelemetry/contrib-test-utils'; -const instrumentation = registerInstrumentationTesting( - new MongoDBInstrumentation() -); - -import { accessCollection, DEFAULT_MONGO_HOST } from './utils'; -import * as mongodb from 'mongodb'; -import * as assert from 'assert'; - -async function waitForNumberOfExports( - exporter: InMemoryMetricExporter, - numberOfExports: number -): Promise { - if (numberOfExports <= 0) { - throw new Error('numberOfExports must be greater than or equal to 0'); - } - - let totalExports = 0; - while (totalExports < numberOfExports) { - await new Promise(resolve => setTimeout(resolve, 20)); - const exportedMetrics = exporter.getMetrics(); - totalExports = exportedMetrics.length; - } - - return exporter.getMetrics(); -} - -describe('MongoDBInstrumentation-Metrics', () => { - // For these tests, mongo must be running. Add RUN_MONGODB_TESTS to run - // these tests. - const RUN_MONGODB_TESTS = process.env.RUN_MONGODB_TESTS as string; - let shouldTest = true; - if (!RUN_MONGODB_TESTS) { - console.log('Skipping test-mongodb. Run MongoDB to test'); - shouldTest = false; - } - - const HOST = process.env.MONGODB_HOST || DEFAULT_MONGO_HOST; - const PORT = process.env.MONGODB_PORT || '27017'; - const DB_NAME = process.env.MONGODB_DB || 'opentelemetry-tests-metrics'; - const COLLECTION_NAME = 'test-metrics'; - const URL = `mongodb://${HOST}:${PORT}/${DB_NAME}`; - let client: mongodb.MongoClient; - - before(() => { - otelTestingMeterProvider.addMetricReader(metricReader); - instrumentation?.setMeterProvider(otelTestingMeterProvider); - }); - - beforeEach(function mongoBeforeEach(done) { - // Skipping all tests in beforeEach() is a workaround. Mocha does not work - // properly when skipping tests in before() on nested describe() calls. - // https://github.com/mochajs/mocha/issues/2819 - if (!shouldTest) { - this.skip(); - } - - inMemoryMetricsExporter.reset(); - done(); - }); - - it('Should add connection usage metrics', async () => { - const result = await accessCollection(URL, DB_NAME, COLLECTION_NAME); - client = result.client; - const collection = result.collection; - const insertData = [{ a: 1 }, { a: 2 }, { a: 3 }]; - await collection.insertMany(insertData); - await collection.deleteMany({}); - const exportedMetrics = await waitForNumberOfExports( - inMemoryMetricsExporter, - 1 - ); - - assert.strictEqual(exportedMetrics.length, 1); - const metrics = exportedMetrics[0].scopeMetrics[0].metrics; - assert.strictEqual(metrics.length, 1); - assert.strictEqual(metrics[0].dataPointType, DataPointType.SUM); - - assert.strictEqual( - metrics[0].descriptor.description, - 'The number of connections that are currently in state described by the state attribute.' - ); - assert.strictEqual(metrics[0].descriptor.unit, '{connection}'); - assert.strictEqual( - metrics[0].descriptor.name, - 'db.client.connections.usage' - ); - - // Checking dataPoints - const dataPoints = metrics[0].dataPoints; - assert.strictEqual(dataPoints.length, 2); - assert.strictEqual(dataPoints[0].value, 0); - assert.strictEqual(dataPoints[0].attributes['state'], 'used'); - assert.strictEqual( - dataPoints[0].attributes['pool.name'], - `mongodb://${HOST}:${PORT}/${DB_NAME}` - ); - - assert.strictEqual(dataPoints[1].value, 1); - assert.strictEqual(dataPoints[1].attributes['state'], 'idle'); - assert.strictEqual( - dataPoints[1].attributes['pool.name'], - `mongodb://${HOST}:${PORT}/${DB_NAME}` - ); - }); - - it('Should add disconnection usage metrics', async () => { - await client.close(); - - const exportedMetrics = await waitForNumberOfExports( - inMemoryMetricsExporter, - 2 - ); - assert.strictEqual(exportedMetrics.length, 2); - const metrics = exportedMetrics[1].scopeMetrics[0].metrics; - assert.strictEqual(metrics.length, 1); - assert.strictEqual(metrics[0].dataPointType, DataPointType.SUM); - - assert.strictEqual( - metrics[0].descriptor.description, - 'The number of connections that are currently in state described by the state attribute.' - ); - - // Checking dataPoints - const dataPoints = metrics[0].dataPoints; - assert.strictEqual(dataPoints.length, 2); - assert.strictEqual(dataPoints[0].value, 0); - assert.strictEqual(dataPoints[0].attributes['state'], 'used'); - assert.strictEqual( - dataPoints[0].attributes['pool.name'], - `mongodb://${HOST}:${PORT}/${DB_NAME}` - ); - assert.strictEqual(dataPoints[1].value, 0); - assert.strictEqual(dataPoints[1].attributes['state'], 'idle'); - assert.strictEqual( - dataPoints[1].attributes['pool.name'], - `mongodb://${HOST}:${PORT}/${DB_NAME}` - ); - }); -}); diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/.eslintrc.js b/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/.eslintrc.js index 3d9af536b..f726f3bec 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/.eslintrc.js +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-grpc-census-binary/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/.eslintrc.js b/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/.eslintrc.js index 36847df9f..9dfe62f9b 100644 --- a/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/.eslintrc.js +++ b/auto-merge/contrib/propagators/opentelemetry-propagator-ot-trace/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.base.js') + ...require('../../eslint.config.js') } diff --git a/eslint.base.js b/auto-merge/js/eslint.base.js similarity index 100% rename from eslint.base.js rename to auto-merge/js/eslint.base.js diff --git a/auto-merge/js/eslint.config.js b/auto-merge/js/eslint.config.js deleted file mode 100644 index 2ec897464..000000000 --- a/auto-merge/js/eslint.config.js +++ /dev/null @@ -1,71 +0,0 @@ -module.exports = { - plugins: [ - "@typescript-eslint", - "header", - "node", - "prettier" - ], - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"], - parser: "@typescript-eslint/parser", - parserOptions: { - "project": "./tsconfig.json" - }, - rules: { - "quotes": ["error", "single", { "avoidEscape": true }], - "eqeqeq": [ - "error", - "smart" - ], - "prefer-rest-params": "off", - "no-console": "error", - "no-shadow": "off", - "node/no-deprecated-api": ["warn"], - "header/header": ["error", "block", [{ - pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \* https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm, - template: - `\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n ` - }]] - }, - overrides: [ - { - files: ['*.ts'], - rules: { - "@typescript-eslint/no-floating-promises": "error", - "@typescript-eslint/no-this-alias": "off", - "@typescript-eslint/naming-convention": [ - "error", - { - "selector": "memberLike", - "modifiers": ["private", "protected"], - "format": ["camelCase"], - "leadingUnderscore": "require" - } - ], - "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_", "args": "after-used"}], - "@typescript-eslint/no-inferrable-types": ["error", { ignoreProperties: true }], - "@typescript-eslint/no-empty-function": ["off"], - "@typescript-eslint/ban-types": ["warn", { - "types": { - "Function": null, - } - }], - "@typescript-eslint/no-shadow": ["warn"], - } - }, - { - files: ["test/**/*.ts"], - rules: { - "no-empty": "off", - "@typescript-eslint/ban-ts-ignore": "off", - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/no-var-requires": "off", - "@typescript-eslint/no-shadow": ["off"], - "@typescript-eslint/no-floating-promises": ["off"], - "@typescript-eslint/no-non-null-assertion": ["off"], - "@typescript-eslint/explicit-module-boundary-types": ["off"] - } - } - ] -}; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js b/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js +++ b/auto-merge/js/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js +++ b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js +++ b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/opentelemetry-sdk-node/.eslintrc.js b/auto-merge/js/experimental/packages/opentelemetry-sdk-node/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-sdk-node/.eslintrc.js +++ b/auto-merge/js/experimental/packages/opentelemetry-sdk-node/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/shim-opencensus/.eslintrc.js b/auto-merge/js/experimental/packages/shim-opencensus/.eslintrc.js index f756f4488..9baf1b495 100644 --- a/auto-merge/js/experimental/packages/shim-opencensus/.eslintrc.js +++ b/auto-merge/js/experimental/packages/shim-opencensus/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-context-async-hooks/.eslintrc.js b/auto-merge/js/packages/opentelemetry-context-async-hooks/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/auto-merge/js/packages/opentelemetry-context-async-hooks/.eslintrc.js +++ b/auto-merge/js/packages/opentelemetry-context-async-hooks/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-exporter-jaeger/.eslintrc.js b/auto-merge/js/packages/opentelemetry-exporter-jaeger/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-jaeger/.eslintrc.js +++ b/auto-merge/js/packages/opentelemetry-exporter-jaeger/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-node/.eslintrc.js b/auto-merge/js/packages/opentelemetry-sdk-trace-node/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-node/.eslintrc.js +++ b/auto-merge/js/packages/opentelemetry-sdk-trace-node/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js b/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js +++ b/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-shim-opentracing/.eslintrc.js b/auto-merge/js/packages/opentelemetry-shim-opentracing/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/auto-merge/js/packages/opentelemetry-shim-opentracing/.eslintrc.js +++ b/auto-merge/js/packages/opentelemetry-shim-opentracing/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/packages/sdk-metrics/.eslintrc.js b/auto-merge/js/packages/sdk-metrics/.eslintrc.js index f726f3bec..3d9af536b 100644 --- a/auto-merge/js/packages/sdk-metrics/.eslintrc.js +++ b/auto-merge/js/packages/sdk-metrics/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/packages/template/.eslintrc.js b/auto-merge/js/packages/template/.eslintrc.js index 9dfe62f9b..36847df9f 100644 --- a/auto-merge/js/packages/template/.eslintrc.js +++ b/auto-merge/js/packages/template/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.base.js') } diff --git a/tsconfig.tsbuildinfo b/auto-merge/js/tsconfig.tsbuildinfo similarity index 100% rename from tsconfig.tsbuildinfo rename to auto-merge/js/tsconfig.tsbuildinfo From 8e2f518d668bb5e0382e1e071bac0213b57142a0 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 12 Jul 2023 01:23:04 +0700 Subject: [PATCH 42/94] feat(express): Skip update HTTP's span name and update RpcMetadata's route instead (#1557) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(express): Skip update HTTP's span name and update RpcMetadata's route instead * feat(express): simplify condition to when written to rpcMetadata.route * feat(express): remove comment related to layerType being undefined * chore: force build * chore: force cache key * Revert "chore: force cache key" This reverts commit 483c7f1b59d47cfb9b5583159dd0ca91c4aa95ce. --------- Co-authored-by: Gerhard Stöbich --- .../README.md | 2 +- .../src/instrumentation.ts | 23 +-- .../src/types.ts | 5 +- .../test/custom-config.test.ts | 18 +- .../test/express.test.ts | 185 +++++++++--------- .../test/hooks.test.ts | 34 +--- .../test/ignore-all.test.ts | 12 +- 7 files changed, 118 insertions(+), 161 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-express/README.md b/plugins/node/opentelemetry-instrumentation-express/README.md index 7c937e8e9..6eba2b6c6 100644 --- a/plugins/node/opentelemetry-instrumentation-express/README.md +++ b/plugins/node/opentelemetry-instrumentation-express/README.md @@ -76,7 +76,7 @@ Express instrumentation has few options available to choose from. You can set th `spanNameHook` is invoked with 2 arguments: -- `info: ExpressRequestInfo` containing the incoming Express.js request, the current route handler creating a span and `ExpressLayerType` - the type of the handling layer or undefined when renaming the root HTTP instrumentation span. +- `info: ExpressRequestInfo` containing the incoming Express.js request, the current route handler creating a span and `ExpressLayerType` - the type of the handling layer. - `defaultName: string` - original name proposed by the instrumentation. #### Ignore a whole Express route diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts index 2fda3891f..0c27a8a88 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { setRPCMetadata, getRPCMetadata, RPCType } from '@opentelemetry/core'; +import { getRPCMetadata, RPCType } from '@opentelemetry/core'; import { trace, context, diag, SpanAttributes } from '@opentelemetry/api'; import type * as express from 'express'; import { ExpressInstrumentationConfig, ExpressRequestInfo } from './types'; @@ -198,18 +198,10 @@ export class ExpressInstrumentation extends InstrumentationBase< // once we reach the request handler const rpcMetadata = getRPCMetadata(context.active()); if ( - metadata.attributes[AttributeNames.EXPRESS_TYPE] === - ExpressLayerType.REQUEST_HANDLER && + type === ExpressLayerType.REQUEST_HANDLER && rpcMetadata?.type === RPCType.HTTP ) { - const name = instrumentation._getSpanName( - { - request: req, - route, - }, - `${req.method} ${route.length > 0 ? route : '/'}` - ); - rpcMetadata.span.updateName(name); + rpcMetadata.route = route || '/'; } // verify against the config if the layer should be ignored @@ -270,13 +262,6 @@ export class ExpressInstrumentation extends InstrumentationBase< // verify we have a callback const args = Array.from(arguments); const callbackIdx = args.findIndex(arg => typeof arg === 'function'); - const newContext = - rpcMetadata?.type === RPCType.HTTP - ? setRPCMetadata( - context.active(), - Object.assign(rpcMetadata, { route: route }) - ) - : context.active(); if (callbackIdx >= 0) { arguments[callbackIdx] = function () { if (spanHasEnded === false) { @@ -288,7 +273,7 @@ export class ExpressInstrumentation extends InstrumentationBase< (req[_LAYERS_STORE_PROPERTY] as string[]).pop(); } const callback = args[callbackIdx] as Function; - return context.bind(newContext, callback).apply(this, arguments); + return callback.apply(this, arguments); }; } const result = original.apply(this, arguments); diff --git a/plugins/node/opentelemetry-instrumentation-express/src/types.ts b/plugins/node/opentelemetry-instrumentation-express/src/types.ts index d8498e3b9..a6d376fac 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/types.ts +++ b/plugins/node/opentelemetry-instrumentation-express/src/types.ts @@ -24,10 +24,7 @@ export type IgnoreMatcher = string | RegExp | ((name: string) => boolean); export type ExpressRequestInfo = { request: Request; route: string; - /** - * If layerType is undefined, SpanNameHook is being invoked to rename the original root HTTP span. - */ - layerType?: ExpressLayerType; + layerType: ExpressLayerType; }; export type SpanNameHook = ( diff --git a/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts index 7cff1c117..d6b418c60 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts @@ -23,7 +23,7 @@ import { } from '@opentelemetry/sdk-trace-base'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; -import { RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; import { ExpressLayerType } from '../src/enums/ExpressLayerType'; import { AttributeNames } from '../src/enums/AttributeNames'; import { ExpressInstrumentation, ExpressInstrumentationConfig } from '../src'; @@ -110,8 +110,9 @@ describe('ExpressInstrumentation', () => { }); it('should not repeat middleware paths in the span name', async () => { + let rpcMetadata: RPCMetadata; app.use((req, res, next) => { - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; return context.with( setRPCMetadata( trace.setSpan(context.active(), rootSpan), @@ -139,8 +140,6 @@ describe('ExpressInstrumentation', () => { assert.strictEqual(response, 'ok'); rootSpan.end(); - const spans = memoryExporter.getFinishedSpans(); - const requestHandlerSpan = memoryExporter .getFinishedSpans() .find(span => span.name.includes('request handler')); @@ -154,8 +153,7 @@ describe('ExpressInstrumentation', () => { requestHandlerSpan?.attributes[AttributeNames.EXPRESS_TYPE], 'request_handler' ); - const exportedRootSpan = spans.find(span => span.name === 'GET /mw'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata.route, '/mw'); } ); }); @@ -167,8 +165,9 @@ describe('ExpressInstrumentation', () => { ExpressLayerType.REQUEST_HANDLER, ], } as ExpressInstrumentationConfig); + let rpcMetadata: RPCMetadata; app.use((req, res, next) => { - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; return context.with( setRPCMetadata( trace.setSpan(context.active(), rootSpan), @@ -192,8 +191,6 @@ describe('ExpressInstrumentation', () => { assert.strictEqual(response, 'ok'); rootSpan.end(); - const spans = memoryExporter.getFinishedSpans(); - const requestHandlerSpan = memoryExporter .getFinishedSpans() .find(span => span.name.includes('request handler')); @@ -207,8 +204,7 @@ describe('ExpressInstrumentation', () => { requestHandlerSpan?.attributes[AttributeNames.EXPRESS_TYPE], 'request_handler' ); - const exportedRootSpan = spans.find(span => span.name === 'GET /'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata?.route, '/'); } ); }); diff --git a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts index 04f2826f6..79b5f2948 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts @@ -32,6 +32,8 @@ instrumentation.enable(); instrumentation.disable(); import * as express from 'express'; +import { RPCMetadata, getRPCMetadata } from '@opentelemetry/core'; +import { Server } from 'http'; describe('ExpressInstrumentation', () => { const provider = new NodeTracerProvider(); @@ -54,6 +56,11 @@ describe('ExpressInstrumentation', () => { }); describe('Instrumenting normal get operations', () => { + let server: Server, port: number; + afterEach(() => { + server?.close(); + }); + it('should create a child span for middlewares', async () => { const rootSpan = tracer.startSpan('rootSpan'); const customMiddleware: express.RequestHandler = (req, res, next) => { @@ -63,22 +70,22 @@ describe('ExpressInstrumentation', () => { return next(); }; let finishListenerCount: number | undefined; - const { server, port } = await serverWithMiddleware( - tracer, - rootSpan, - app => { - app.use(express.json()); - app.use((req, res, next) => { - res.on('finish', () => { - finishListenerCount = res.listenerCount('finish'); - }); - next(); + let rpcMetadata: RPCMetadata | undefined; + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use(express.json()); + app.use((req, res, next) => { + rpcMetadata = getRPCMetadata(context.active()); + res.on('finish', () => { + finishListenerCount = res.listenerCount('finish'); }); - for (let index = 0; index < 15; index++) { - app.use(customMiddleware); - } + next(); + }); + for (let index = 0; index < 15; index++) { + app.use(customMiddleware); } - ); + }); + server = httpServer.server; + port = httpServer.port; assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), @@ -113,39 +120,34 @@ describe('ExpressInstrumentation', () => { requestHandlerSpan?.attributes[AttributeNames.EXPRESS_TYPE], 'request_handler' ); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /toto/:id'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata?.route, '/toto/:id'); } ); - server.close(); }); it('supports sync middlewares directly responding', async () => { const rootSpan = tracer.startSpan('rootSpan'); let finishListenerCount: number | undefined; - const { server, port } = await serverWithMiddleware( - tracer, - rootSpan, - app => { - app.use((req, res, next) => { - res.on('finish', () => { - finishListenerCount = res.listenerCount('finish'); - }); - next(); + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use((req, res, next) => { + res.on('finish', () => { + finishListenerCount = res.listenerCount('finish'); }); - const syncMiddleware: express.RequestHandler = (req, res, next) => { - for (let i = 0; i < 1000000; i++) { - continue; - } - res.status(200).end('middleware'); - }; - for (let index = 0; index < 15; index++) { - app.use(syncMiddleware); + next(); + }); + const syncMiddleware: express.RequestHandler = (req, res, next) => { + for (let i = 0; i < 1000000; i++) { + continue; } + res.status(200).end('middleware'); + }; + for (let index = 0; index < 15; index++) { + app.use(syncMiddleware); } - ); + }); + server = httpServer.server; + port = httpServer.port; + assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), @@ -165,32 +167,30 @@ describe('ExpressInstrumentation', () => { ); } ); - server.close(); }); it('supports async middlewares', async () => { const rootSpan = tracer.startSpan('rootSpan'); let finishListenerCount: number | undefined; - const { server, port } = await serverWithMiddleware( - tracer, - rootSpan, - app => { - app.use((req, res, next) => { - res.on('finish', () => { - finishListenerCount = res.listenerCount('finish'); - }); - next(); + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use((req, res, next) => { + res.on('finish', () => { + finishListenerCount = res.listenerCount('finish'); }); - const asyncMiddleware: express.RequestHandler = (req, res, next) => { - setTimeout(() => { - next(); - }, 50); - }; - for (let index = 0; index < 15; index++) { - app.use(asyncMiddleware); - } + next(); + }); + const asyncMiddleware: express.RequestHandler = (req, res, next) => { + setTimeout(() => { + next(); + }, 50); + }; + for (let index = 0; index < 15; index++) { + app.use(asyncMiddleware); } - ); + }); + server = httpServer.server; + port = httpServer.port; + assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), @@ -210,32 +210,30 @@ describe('ExpressInstrumentation', () => { ); } ); - server.close(); }); it('supports async middlewares directly responding', async () => { const rootSpan = tracer.startSpan('rootSpan'); let finishListenerCount: number | undefined; - const { server, port } = await serverWithMiddleware( - tracer, - rootSpan, - app => { - app.use((req, res, next) => { - res.on('finish', () => { - finishListenerCount = res.listenerCount('finish'); - }); - next(); + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use((req, res, next) => { + res.on('finish', () => { + finishListenerCount = res.listenerCount('finish'); }); - const asyncMiddleware: express.RequestHandler = (req, res, next) => { - setTimeout(() => { - res.status(200).end('middleware'); - }, 50); - }; - for (let index = 0; index < 15; index++) { - app.use(asyncMiddleware); - } + next(); + }); + const asyncMiddleware: express.RequestHandler = (req, res, next) => { + setTimeout(() => { + res.status(200).end('middleware'); + }, 50); + }; + for (let index = 0; index < 15; index++) { + app.use(asyncMiddleware); } - ); + }); + server = httpServer.server; + port = httpServer.port; + assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), @@ -255,7 +253,6 @@ describe('ExpressInstrumentation', () => { ); } ); - server.close(); }); it('should not create span because there are no parent', async () => { @@ -270,33 +267,36 @@ describe('ExpressInstrumentation', () => { router.get('/:id', (req, res, next) => { return res.status(200).end('test'); }); - const { server, port } = await createServer(app); + const httpServer = await createServer(app); + server = httpServer.server; + port = httpServer.port; assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); const res = await httpRequest.get(`http://localhost:${port}/toto/tata`); assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); assert.strictEqual(res, 'test'); - server.close(); }); }); describe('Disabling plugin', () => { + let server: Server, port: number; + afterEach(() => { + server?.close(); + }); it('should not create new spans', async () => { instrumentation.disable(); const rootSpan = tracer.startSpan('rootSpan'); - const { server, port } = await serverWithMiddleware( - tracer, - rootSpan, - app => { - app.use(express.json()); - const customMiddleware: express.RequestHandler = (req, res, next) => { - for (let i = 0; i < 1000; i++) { - continue; - } - return next(); - }; - app.use(customMiddleware); - } - ); + const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { + app.use(express.json()); + const customMiddleware: express.RequestHandler = (req, res, next) => { + for (let i = 0; i < 1000; i++) { + continue; + } + return next(); + }; + app.use(customMiddleware); + }); + server = httpServer.server; + port = httpServer.port; assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), @@ -312,7 +312,6 @@ describe('ExpressInstrumentation', () => { ); } ); - server.close(); }); }); }); diff --git a/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts index f15a49650..90d98a356 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts @@ -34,6 +34,7 @@ instrumentation.enable(); instrumentation.disable(); import { httpRequest, serverWithMiddleware } from './utils'; +import { RPCMetadata, getRPCMetadata } from '@opentelemetry/core'; describe('ExpressInstrumentation hooks', () => { const provider = new NodeTracerProvider(); @@ -59,12 +60,14 @@ describe('ExpressInstrumentation hooks', () => { let server: http.Server; let port: number; let rootSpan: Span; + let rpcMetadata: RPCMetadata | undefined; beforeEach(async () => { rootSpan = tracer.startSpan('rootSpan'); const httpServer = await serverWithMiddleware(tracer, rootSpan, app => { app.get('*', (req, res) => { + rpcMetadata = getRPCMetadata(context.active()); res.send('ok'); }); }); @@ -78,16 +81,8 @@ describe('ExpressInstrumentation hooks', () => { it('should rename spans', async () => { instrumentation.setConfig({ - spanNameHook: ({ request, route, layerType }, defaultName) => { - if (layerType) { - return `hook - ${route}`; - } - - if (route === '*') { - return `parent - ${request.method} ${request.url}`; - } - - return defaultName; + spanNameHook: ({ route, layerType }) => { + return `custom: ${layerType} - ${route}`; }, }); @@ -101,12 +96,7 @@ describe('ExpressInstrumentation hooks', () => { assert.strictEqual(spans.length, 2); assert.notStrictEqual( - spans.find(span => span.name === 'parent - GET /foo/3'), - undefined - ); - - assert.notStrictEqual( - spans.find(span => span.name === 'hook - *'), + spans.find(span => span.name === 'custom: request_handler - *'), undefined ); } @@ -129,11 +119,7 @@ describe('ExpressInstrumentation hooks', () => { const spans = memoryExporter.getFinishedSpans(); assert.strictEqual(spans.length, 2); - assert.notStrictEqual( - spans.find(span => span.name === 'GET *'), - undefined - ); - + assert.strictEqual(rpcMetadata?.route, '*'); assert.notStrictEqual( spans.find(span => span.name === 'request handler - *'), undefined @@ -159,11 +145,7 @@ describe('ExpressInstrumentation hooks', () => { const spans = memoryExporter.getFinishedSpans(); assert.strictEqual(spans.length, 2); - assert.notStrictEqual( - spans.find(span => span.name === 'GET *'), - undefined - ); - + assert.strictEqual(rpcMetadata?.route, '*'); assert.notStrictEqual( spans.find(span => span.name === 'request handler - *'), undefined diff --git a/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts index ae07b1efc..92c7c7046 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts @@ -22,7 +22,7 @@ import { SimpleSpanProcessor, } from '@opentelemetry/sdk-trace-base'; import * as assert from 'assert'; -import { RPCType, setRPCMetadata } from '@opentelemetry/core'; +import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; import { AttributeNames } from '../src/enums/AttributeNames'; import { ExpressInstrumentation, ExpressLayerType } from '../src'; import { createServer, httpRequest } from './utils'; @@ -64,13 +64,14 @@ describe('ExpressInstrumentation', () => { let server: http.Server; let port: number; let rootSpan: Span; + let rpcMetadata: RPCMetadata; beforeEach(async () => { rootSpan = tracer.startSpan('rootSpan'); const app = express(); app.use((req, res, next) => { - const rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; + rpcMetadata = { type: RPCType.HTTP, span: rootSpan }; return context.with( setRPCMetadata( trace.setSpan(context.active(), rootSpan), @@ -126,17 +127,14 @@ describe('ExpressInstrumentation', () => { ); }); - it('root span name should be modified to GET /todo/:id', async () => { + it('rpcMetadata.route should be modified to /todo/:id', async () => { assert.strictEqual(memoryExporter.getFinishedSpans().length, 0); await context.with( trace.setSpan(context.active(), rootSpan), async () => { await httpRequest.get(`http://localhost:${port}/toto/tata`); rootSpan.end(); - const exportedRootSpan = memoryExporter - .getFinishedSpans() - .find(span => span.name === 'GET /toto/:id'); - assert.notStrictEqual(exportedRootSpan, undefined); + assert.strictEqual(rpcMetadata.route, '/toto/:id'); } ); }); From ffb45fe8c9319bc28e35b09540b0d1e6cbace9df Mon Sep 17 00:00:00 2001 From: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Date: Wed, 12 Jul 2023 12:20:33 +0300 Subject: [PATCH 43/94] chore(renovate): split patch and minor rules (#1572) --- renovate.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index 80634068e..7fd57aae1 100644 --- a/renovate.json +++ b/renovate.json @@ -4,9 +4,15 @@ ], "packageRules": [ { - "groupName": "all non-major dependencies", - "updateTypes": ["patch", "minor"], - "groupSlug": "all-minor-patch" + "groupName": "all patch versions", + "groupSlug": "all-patch", + "matchUpdateTypes": ["patch"], + "excludePackageNames": ["prettier"], + "schedule": ["before 3am every weekday"] + }, + { + "matchUpdateTypes": ["minor"], + "dependencyDashboardApproval": true }, { "matchPackageNames": ["@opentelemetry/api"], From 84a2377845c313f0ca68b4de7f3e7a464be68885 Mon Sep 17 00:00:00 2001 From: Nathan Walters Date: Wed, 12 Jul 2023 02:23:34 -0700 Subject: [PATCH 44/94] fix(deps): update otel core experimental to ^0.41.0 (#1566) Co-authored-by: Marc Pichler --- .../opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 8 ++++---- metapackages/auto-instrumentations-web/package.json | 6 +++--- packages/opentelemetry-test-utils/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-dataloader/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../opentelemetry-instrumentation-aws-lambda/package.json | 2 +- .../opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-cassandra/package.json | 2 +- .../opentelemetry-instrumentation-connect/package.json | 2 +- .../node/opentelemetry-instrumentation-dns/package.json | 2 +- .../examples/package.json | 4 ++-- .../opentelemetry-instrumentation-express/package.json | 2 +- .../opentelemetry-instrumentation-fastify/package.json | 4 ++-- .../package.json | 2 +- .../opentelemetry-instrumentation-graphql/package.json | 2 +- .../node/opentelemetry-instrumentation-hapi/package.json | 2 +- .../opentelemetry-instrumentation-ioredis/package.json | 2 +- .../node/opentelemetry-instrumentation-knex/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-koa/package.json | 2 +- .../opentelemetry-instrumentation-memcached/package.json | 2 +- .../examples/package.json | 4 ++-- .../opentelemetry-instrumentation-mongodb/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-mysql/package.json | 2 +- .../opentelemetry-instrumentation-mysql2/package.json | 2 +- .../package.json | 2 +- .../node/opentelemetry-instrumentation-net/package.json | 2 +- .../node/opentelemetry-instrumentation-pg/package.json | 2 +- .../node/opentelemetry-instrumentation-pino/package.json | 2 +- .../opentelemetry-instrumentation-redis-4/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-redis/package.json | 2 +- .../opentelemetry-instrumentation-restify/package.json | 2 +- .../opentelemetry-instrumentation-router/package.json | 2 +- .../opentelemetry-instrumentation-winston/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-instrumentation-long-task/package.json | 2 +- .../package.json | 4 ++-- 46 files changed, 58 insertions(+), 58 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 4a0963bd7..0997a3c7c 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.33.4", - "@opentelemetry/sdk-node": "^0.40.0", + "@opentelemetry/sdk-node": "^0.41.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", "@types/semver": "7.3.8", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 95bdd589d..926861873 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -49,7 +49,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/instrumentation-amqplib": "^0.32.5", "@opentelemetry/instrumentation-aws-lambda": "^0.35.3", "@opentelemetry/instrumentation-aws-sdk": "^0.34.3", @@ -63,9 +63,9 @@ "@opentelemetry/instrumentation-fastify": "^0.31.4", "@opentelemetry/instrumentation-generic-pool": "^0.31.4", "@opentelemetry/instrumentation-graphql": "^0.34.3", - "@opentelemetry/instrumentation-grpc": "^0.40.0", + "@opentelemetry/instrumentation-grpc": "^0.41.0", "@opentelemetry/instrumentation-hapi": "^0.31.4", - "@opentelemetry/instrumentation-http": "^0.40.0", + "@opentelemetry/instrumentation-http": "^0.41.0", "@opentelemetry/instrumentation-ioredis": "^0.34.3", "@opentelemetry/instrumentation-knex": "^0.31.4", "@opentelemetry/instrumentation-koa": "^0.34.6", @@ -91,7 +91,7 @@ "@opentelemetry/resource-detector-container": "^0.2.5", "@opentelemetry/resource-detector-gcp": "^0.28.3", "@opentelemetry/resources": "^1.12.0", - "@opentelemetry/sdk-node": "^0.40.0", + "@opentelemetry/sdk-node": "^0.41.0", "tslib": "^2.3.1" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 5fd9c2964..aa11f581a 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -59,11 +59,11 @@ "webpack-merge": "5.8.0" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/instrumentation-document-load": "^0.32.3", - "@opentelemetry/instrumentation-fetch": "^0.40.0", + "@opentelemetry/instrumentation-fetch": "^0.41.0", "@opentelemetry/instrumentation-user-interaction": "^0.32.4", - "@opentelemetry/instrumentation-xml-http-request": "^0.40.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", "tslib": "^2.3.1" } } diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 78f1e3af1..48493d0e5 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -48,7 +48,7 @@ "dependencies": { "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.3.1", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 9c0cfa10b..11137bc0e 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index e270e078b..befebb720 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 19422a709..3100d2121 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 6c569adef..d2a7d012e 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -57,7 +57,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 9f7c59633..0d271057c 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -61,7 +61,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 17fc26680..2af9cf830 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -58,7 +58,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index cf51a7691..dcb9360c8 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -62,7 +62,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/tedious": "^4.0.6", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 55fd53b17..adfc67d4f 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -59,7 +59,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/propagator-aws-xray": "^1.2.1", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 2ed8a50c6..f39141431 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/propagation-utils": "^0.29.5", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 90a3705c3..dfe7b2701 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -64,7 +64,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@types/bunyan": "1.8.7", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 0de9dec3d..012eddbbb 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -64,7 +64,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 34d640fe9..829f4e770 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/connect": "3.4.35", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index d0d5b1be0..757ebfea8 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -62,7 +62,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "semver": "^7.3.2", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index fd3b8679e..303c76d72 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -32,9 +32,9 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/instrumentation-express": "0.28.0", - "@opentelemetry/instrumentation-http": "^0.40.0", + "@opentelemetry/instrumentation-http": "^0.41.0", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 724fa4cb8..f606916bf 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -66,7 +66,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/express": "4.17.13", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 946d4939e..f86886071 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -48,7 +48,7 @@ "@fastify/express": "^2.0.2", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/instrumentation-http": "0.40.0", + "@opentelemetry/instrumentation-http": "0.41.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/express": "4.17.13", @@ -63,7 +63,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index a98d5c1cb..91f2ec8ce 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/generic-pool": "^3.1.9", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 0e6c47c10..0dc5a93a3 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 19eefe706..d1780d464 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -60,7 +60,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/hapi__hapi": "20.0.9", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index a1507eaa4..eabb62e69 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -69,7 +69,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/redis-common": "^0.35.1", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/ioredis4": "npm:@types/ioredis@^4.28.10", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index e5b1553a6..e908dc7b9 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -60,7 +60,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index c46bf95f8..6a23e6fe7 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/instrumentation-http": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.0", "@opentelemetry/instrumentation-koa": "^0.31.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 18d52a52b..0d0cff956 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -68,7 +68,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.6", "@types/koa__router": "8.0.7", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 0d4a84bc5..649f84481 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -63,7 +63,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/memcached": "^2.2.6", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index 62943a13f..e64136898 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -33,8 +33,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/instrumentation-http": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.0", "@opentelemetry/instrumentation-mongodb": "^0.32.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index e2a54723b..2816eba95 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -71,7 +71,7 @@ }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index 881876d79..2adaa420a 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/instrumentation-http": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.0", "@opentelemetry/instrumentation-mysql": "^0.31.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index d15998bde..4b220da0f 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -63,7 +63,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/mysql": "2.15.19", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 2e627296d..ebd8f55aa 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -66,7 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 8135edb60..15a8441a2 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -73,7 +73,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index df6bc5974..ba1853206 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 8f700a563..187dba00d 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -75,7 +75,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.39.0", "@types/pg": "8.6.1", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index de187ff65..44afe9f36 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -66,7 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 8d84fc557..0ef944074 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -69,7 +69,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/redis-common": "^0.35.1", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 95749d9ed..8d76b3b85 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.40.0", - "@opentelemetry/instrumentation-http": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.0", "@opentelemetry/instrumentation-redis": "^0.32.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 3942689cb..4a92a6567 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -70,7 +70,7 @@ "@types/redis": "2.8.31" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/redis-common": "^0.35.1", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index db1e2b171..9b266dfa7 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -65,7 +65,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 9f0ac7e26..5d664dc42 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -59,7 +59,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 166ffc552..e220a250a 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -66,7 +66,7 @@ "winston2": "npm:winston@2.4.5" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index b637d7940..f2cdcd863 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -77,7 +77,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.15.0", "@opentelemetry/semantic-conventions": "^1.0.0", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 6604fafa3..390498c9c 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/sdk-trace-web": "^1.8.0", "tslib": "^2.3.1" }, diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index b4b590967..694195789 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -50,7 +50,7 @@ "@babel/core": "7.15.0", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.40.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.6", "@types/mocha": "7.0.2", @@ -80,7 +80,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.40.0", + "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/sdk-trace-web": "^1.8.0", "tslib": "^2.3.1" }, From 273993b8d438c0caf6d7b933af611d45ef770e0e Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 12 Jul 2023 17:35:18 +0700 Subject: [PATCH 45/94] chore: re-enable instrumentation-fastify unit test on node@18 (#1568) Co-authored-by: Marc Pichler --- .github/workflows/unit-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 57c9f4e14..fc0566c6c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -14,7 +14,6 @@ jobs: - node: "18" lerna-extra-args: >- --ignore @opentelemetry/resource-detector-alibaba-cloud - --ignore @opentelemetry/instrumentation-fastify --ignore @opentelemetry/instrumentation-restify runs-on: ubuntu-latest services: From 3139dbf5e07a4d58ff06d2f67870b1bb2e1de0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= Date: Wed, 12 Jul 2023 12:37:21 +0200 Subject: [PATCH 46/94] chore: update renovate.json (#1575) Co-authored-by: Marc Pichler --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 7fd57aae1..5a90445ab 100644 --- a/renovate.json +++ b/renovate.json @@ -26,6 +26,7 @@ "@opentelemetry/instrumentation-http", "@opentelemetry/instrumentation-fetch", "@opentelemetry/instrumentation-xml-http-request", + "@opentelemetry/exporter-metrics-otlp-grpc", "@opentelemetry/sdk-node" ], "rangeStrategy": "bump" @@ -33,7 +34,7 @@ ], "ignoreDeps": ["lerna", "lerna-changelog"], "ignorePaths": ["archive/**", "examples/**"], - "assignees": ["@blumamir", "@dyladan", "@legendecas", "@Rauno56", "@vmarchaud"], + "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc" ], "schedule": [ "before 3am on Friday" ], From bf25eb112b458ddab330dad2ad3d77bcb14bced2 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 12 Jul 2023 13:58:02 +0200 Subject: [PATCH 47/94] chore(renovate): change strategy for @opentelemetry/api, run experimental update every weekday (#1578) --- renovate.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index 5a90445ab..6f9621a66 100644 --- a/renovate.json +++ b/renovate.json @@ -16,10 +16,10 @@ }, { "matchPackageNames": ["@opentelemetry/api"], - "rangeStrategy": "bump" + "rangeStrategy": "widen" }, { - "groupName": "Otel Core experimental", + "groupName": "OTel Core experimental", "matchPackageNames": [ "@opentelemetry/instrumentation", "@opentelemetry/instrumentation-grpc", @@ -29,7 +29,8 @@ "@opentelemetry/exporter-metrics-otlp-grpc", "@opentelemetry/sdk-node" ], - "rangeStrategy": "bump" + "rangeStrategy": "bump", + "schedule": ["before 3am every weekday"] } ], "ignoreDeps": ["lerna", "lerna-changelog"], From 8d9687d89e4a80dbf2a5e8be6fb027ff20824593 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 12 Jul 2023 19:38:20 +0700 Subject: [PATCH 48/94] feat(fastify): Skip update HTTP's span name and update RpcMetadata's route instead (#1569) Co-authored-by: Marc Pichler --- .../src/instrumentation.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts index d3ac0a74a..fcaf3114e 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts @@ -96,8 +96,7 @@ export class FastifyInstrumentation extends InstrumentationBase { const rpcMetadata = getRPCMetadata(context.active()); const routeName = request.routerPath; if (routeName && rpcMetadata?.type === RPCType.HTTP) { - rpcMetadata.span.setAttribute(SemanticAttributes.HTTP_ROUTE, routeName); - rpcMetadata.span.updateName(`${request.method} ${routeName}`); + rpcMetadata.route = routeName; } done(); }; From f81f8a76a8f0af2101c62dbc73cde442f875d833 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 12 Jul 2023 11:23:46 -0400 Subject: [PATCH 49/94] chore: release main (#1539) * chore: release main * chore: release main --- .release-please-manifest.json | 2 +- .../CHANGELOG.md | 14 ++++ .../package.json | 4 +- .../CHANGELOG.md | 15 ++++ .../package.json | 4 +- .../CHANGELOG.md | 14 ++++ .../package.json | 4 +- .../CHANGELOG.md | 14 ++++ .../package.json | 4 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- .../CHANGELOG.md | 19 +++++ .../package.json | 4 +- .../auto-instrumentations-node/CHANGELOG.md | 56 +++++++++++++ .../auto-instrumentations-node/package.json | 78 +++++++++---------- .../auto-instrumentations-web/CHANGELOG.md | 20 +++++ .../auto-instrumentations-web/package.json | 6 +- .../opentelemetry-host-metrics/CHANGELOG.md | 7 ++ .../opentelemetry-host-metrics/package.json | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- .../CHANGELOG.md | 14 ++++ .../package.json | 4 +- .../opentelemetry-redis-common/CHANGELOG.md | 7 ++ .../opentelemetry-redis-common/package.json | 2 +- .../opentelemetry-sql-common/CHANGELOG.md | 9 +++ .../opentelemetry-sql-common/package.json | 2 +- .../opentelemetry-test-utils/CHANGELOG.md | 13 ++++ .../opentelemetry-test-utils/package.json | 2 +- .../node/instrumentation-amqplib/CHANGELOG.md | 19 +++++ .../node/instrumentation-amqplib/package.json | 4 +- .../instrumentation-dataloader/CHANGELOG.md | 12 +++ .../instrumentation-dataloader/package.json | 2 +- plugins/node/instrumentation-fs/CHANGELOG.md | 12 +++ plugins/node/instrumentation-fs/package.json | 2 +- .../instrumentation-lru-memoizer/CHANGELOG.md | 19 +++++ .../instrumentation-lru-memoizer/package.json | 4 +- .../instrumentation-mongoose/CHANGELOG.md | 19 +++++ .../instrumentation-mongoose/package.json | 4 +- .../instrumentation-socket.io/CHANGELOG.md | 19 +++++ .../instrumentation-socket.io/package.json | 4 +- .../node/instrumentation-tedious/CHANGELOG.md | 19 +++++ .../node/instrumentation-tedious/package.json | 4 +- .../CHANGELOG.md | 20 +++++ .../package.json | 4 +- .../CHANGELOG.md | 22 ++++++ .../package.json | 6 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 19 +++++ .../package.json | 4 +- .../CHANGELOG.md | 13 ++++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 13 ++++ .../package.json | 2 +- .../CHANGELOG.md | 14 ++++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 21 +++++ .../package.json | 6 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 19 +++++ .../package.json | 4 +- .../CHANGELOG.md | 20 +++++ .../package.json | 4 +- .../CHANGELOG.md | 19 +++++ .../package.json | 4 +- .../CHANGELOG.md | 21 +++++ .../package.json | 6 +- .../CHANGELOG.md | 13 ++++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 22 ++++++ .../package.json | 6 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 21 +++++ .../package.json | 6 +- .../CHANGELOG.md | 21 +++++ .../package.json | 6 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 14 ++++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 12 +++ .../package.json | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- 113 files changed, 955 insertions(+), 125 deletions(-) create mode 100644 packages/opentelemetry-sql-common/CHANGELOG.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b91425697..d70e6b815 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.7","detectors/node/opentelemetry-resource-detector-aws":"1.2.5","detectors/node/opentelemetry-resource-detector-container":"0.2.5","detectors/node/opentelemetry-resource-detector-gcp":"0.28.3","detectors/node/opentelemetry-resource-detector-github":"0.27.1","detectors/node/opentelemetry-resource-detector-instana":"0.4.4","metapackages/auto-instrumentations-node":"0.37.1","metapackages/auto-instrumentations-web":"0.32.3","packages/opentelemetry-host-metrics":"0.32.2","packages/opentelemetry-id-generator-aws-xray":"1.1.2","packages/opentelemetry-propagation-utils":"0.29.5","packages/opentelemetry-redis-common":"0.35.1","packages/opentelemetry-sql-common":"0.39.0","packages/opentelemetry-test-utils":"0.33.4","plugins/node/instrumentation-amqplib":"0.32.5","plugins/node/instrumentation-dataloader":"0.4.3","plugins/node/instrumentation-fs":"0.7.4","plugins/node/instrumentation-lru-memoizer":"0.32.4","plugins/node/instrumentation-mongoose":"0.32.4","plugins/node/instrumentation-socket.io":"0.33.4","plugins/node/instrumentation-tedious":"0.5.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.3","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.4","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.4","plugins/node/opentelemetry-instrumentation-connect":"0.31.4","plugins/node/opentelemetry-instrumentation-dns":"0.31.5","plugins/node/opentelemetry-instrumentation-express":"0.32.4","plugins/node/opentelemetry-instrumentation-fastify":"0.31.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.4","plugins/node/opentelemetry-instrumentation-graphql":"0.34.3","plugins/node/opentelemetry-instrumentation-hapi":"0.31.4","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.3","plugins/node/opentelemetry-instrumentation-knex":"0.31.4","plugins/node/opentelemetry-instrumentation-koa":"0.34.6","plugins/node/opentelemetry-instrumentation-memcached":"0.31.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql":"0.33.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.5","plugins/node/opentelemetry-instrumentation-net":"0.31.4","plugins/node/opentelemetry-instrumentation-pg":"0.35.3","plugins/node/opentelemetry-instrumentation-pino":"0.33.4","plugins/node/opentelemetry-instrumentation-redis":"0.34.7","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.6","plugins/node/opentelemetry-instrumentation-restify":"0.32.4","plugins/node/opentelemetry-instrumentation-router":"0.32.4","plugins/node/opentelemetry-instrumentation-winston":"0.31.4","plugins/web/opentelemetry-instrumentation-document-load":"0.32.3","plugins/web/opentelemetry-instrumentation-long-task":"0.32.5","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.4","plugins/web/opentelemetry-plugin-react-load":"0.28.2","propagators/opentelemetry-propagator-aws-xray":"1.2.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.1","propagators/opentelemetry-propagator-instana":"0.2.2","propagators/opentelemetry-propagator-ot-trace":"0.26.3"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"} diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md index cd09bf78a..f12bdd2de 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md @@ -36,6 +36,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.7...resource-detector-alibaba-cloud-v0.28.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.27.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.5...resource-detector-alibaba-cloud-v0.27.6) (2023-05-16) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 66585dcf0..d1f0efdf3 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-alibaba-cloud", - "version": "0.27.7", + "version": "0.28.0", "description": "OpenTelemetry resource detector for Alibaba Cloud", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md index 5fa8c4d82..62193c329 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md @@ -36,6 +36,21 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [1.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.5...resource-detector-aws-v1.3.0) (2023-07-12) + + +### Features + +* **aws-ecs:** add cloud resource attributes for fargate ([#1543](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1543)) ([de17f77](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/de17f77bd7f75fc2fc8a92d35dfcfbf749b50f71)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [1.2.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.3...resource-detector-aws-v1.2.4) (2023-05-16) diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index dae53b7b6..5149eadfb 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-aws", - "version": "1.2.5", + "version": "1.3.0", "description": "OpenTelemetry SDK resource detector for AWS", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,7 +42,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md index bfa945b7e..25171400d 100644 --- a/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md @@ -30,6 +30,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.2.5...resource-detector-container-v0.3.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.2.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.2.3...resource-detector-container-v0.2.4) (2023-05-16) diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index b5fc5e735..01aeebcdc 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-container", - "version": "0.2.5", + "version": "0.3.0", "description": "Opentelemetry resource detector to get container resource attributes", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -36,7 +36,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "^18.0.0", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md index c965354fd..d626ba109 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md @@ -36,6 +36,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.28.3...resource-detector-gcp-v0.29.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.28.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.28.1...resource-detector-gcp-v0.28.2) (2023-05-16) diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index a0de2cef0..e932955f9 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-gcp", - "version": "0.28.3", + "version": "0.29.0", "description": "OpenTelemetry SDK resource detector for GCP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,7 +42,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", "@types/semver": "7.3.8", diff --git a/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md index cc96bf973..1a0003bf0 100644 --- a/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.27.1...resource-detector-github-v0.28.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.27.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-github-v0.27.0...resource-detector-github-v0.27.1) (2023-05-16) diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 841c90fab..25c802d46 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-github", - "version": "0.27.1", + "version": "0.28.0", "description": "OpenTelemetry SDK resource detector for GitHub", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md index 782d7dfb2..1b4df2536 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.5.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.4.4...resource-detector-instana-v0.5.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.4.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.4.3...resource-detector-instana-v0.4.4) (2023-06-12) diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 0997a3c7c..aee9d5994 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-instana", - "version": "0.4.4", + "version": "0.5.0", "description": "OpenTelemetry SDK resource detector for Instana", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -40,7 +40,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-node": "^0.41.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md index cd943918b..030e8cd31 100644 --- a/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -87,6 +87,62 @@ * @opentelemetry/instrumentation-koa bumped from ^0.34.2 to ^0.34.3 * @opentelemetry/instrumentation-redis bumped from ^0.34.3 to ^0.34.4 +## [0.38.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.37.1...auto-instrumentations-node-v0.38.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-amqplib bumped from ^0.32.5 to ^0.33.0 + * @opentelemetry/instrumentation-aws-lambda bumped from ^0.35.3 to ^0.36.0 + * @opentelemetry/instrumentation-aws-sdk bumped from ^0.34.3 to ^0.35.0 + * @opentelemetry/instrumentation-bunyan bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-cassandra-driver bumped from ^0.32.4 to ^0.33.0 + * @opentelemetry/instrumentation-connect bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-dataloader bumped from ^0.4.3 to ^0.5.0 + * @opentelemetry/instrumentation-dns bumped from ^0.31.5 to ^0.32.0 + * @opentelemetry/instrumentation-express bumped from ^0.32.4 to ^0.33.0 + * @opentelemetry/instrumentation-fs bumped from ^0.7.4 to ^0.8.0 + * @opentelemetry/instrumentation-fastify bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-generic-pool bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-graphql bumped from ^0.34.3 to ^0.35.0 + * @opentelemetry/instrumentation-hapi bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-ioredis bumped from ^0.34.3 to ^0.35.0 + * @opentelemetry/instrumentation-knex bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-koa bumped from ^0.34.6 to ^0.35.0 + * @opentelemetry/instrumentation-lru-memoizer bumped from ^0.32.4 to ^0.33.0 + * @opentelemetry/instrumentation-memcached bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-mongodb bumped from ^0.35.0 to ^0.36.0 + * @opentelemetry/instrumentation-mongoose bumped from ^0.32.4 to ^0.33.0 + * @opentelemetry/instrumentation-mysql bumped from ^0.33.3 to ^0.34.0 + * @opentelemetry/instrumentation-mysql2 bumped from ^0.33.4 to ^0.34.0 + * @opentelemetry/instrumentation-nestjs-core bumped from ^0.32.5 to ^0.33.0 + * @opentelemetry/instrumentation-net bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/instrumentation-pg bumped from ^0.35.3 to ^0.36.0 + * @opentelemetry/instrumentation-pino bumped from ^0.33.4 to ^0.34.0 + * @opentelemetry/instrumentation-redis bumped from ^0.34.7 to ^0.35.0 + * @opentelemetry/instrumentation-redis-4 bumped from ^0.34.6 to ^0.35.0 + * @opentelemetry/instrumentation-restify bumped from ^0.32.4 to ^0.33.0 + * @opentelemetry/instrumentation-router bumped from ^0.32.4 to ^0.33.0 + * @opentelemetry/instrumentation-socket.io bumped from ^0.33.4 to ^0.34.0 + * @opentelemetry/instrumentation-tedious bumped from ^0.5.4 to ^0.6.0 + * @opentelemetry/instrumentation-winston bumped from ^0.31.4 to ^0.32.0 + * @opentelemetry/resource-detector-alibaba-cloud bumped from ^0.27.7 to ^0.28.0 + * @opentelemetry/resource-detector-aws bumped from ^1.2.5 to ^1.3.0 + * @opentelemetry/resource-detector-container bumped from ^0.2.5 to ^0.3.0 + * @opentelemetry/resource-detector-gcp bumped from ^0.28.3 to ^0.29.0 + ## [0.37.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.37.0...auto-instrumentations-node-v0.37.1) (2023-06-12) diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 926861873..e8cc26df9 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.37.1", + "version": "0.38.0", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme", @@ -50,46 +50,46 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-amqplib": "^0.32.5", - "@opentelemetry/instrumentation-aws-lambda": "^0.35.3", - "@opentelemetry/instrumentation-aws-sdk": "^0.34.3", - "@opentelemetry/instrumentation-bunyan": "^0.31.4", - "@opentelemetry/instrumentation-cassandra-driver": "^0.32.4", - "@opentelemetry/instrumentation-connect": "^0.31.4", - "@opentelemetry/instrumentation-dataloader": "^0.4.3", - "@opentelemetry/instrumentation-dns": "^0.31.5", - "@opentelemetry/instrumentation-express": "^0.32.4", - "@opentelemetry/instrumentation-fs": "^0.7.4", - "@opentelemetry/instrumentation-fastify": "^0.31.4", - "@opentelemetry/instrumentation-generic-pool": "^0.31.4", - "@opentelemetry/instrumentation-graphql": "^0.34.3", + "@opentelemetry/instrumentation-amqplib": "^0.33.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.36.0", + "@opentelemetry/instrumentation-aws-sdk": "^0.35.0", + "@opentelemetry/instrumentation-bunyan": "^0.32.0", + "@opentelemetry/instrumentation-cassandra-driver": "^0.33.0", + "@opentelemetry/instrumentation-connect": "^0.32.0", + "@opentelemetry/instrumentation-dataloader": "^0.5.0", + "@opentelemetry/instrumentation-dns": "^0.32.0", + "@opentelemetry/instrumentation-express": "^0.33.0", + "@opentelemetry/instrumentation-fs": "^0.8.0", + "@opentelemetry/instrumentation-fastify": "^0.32.0", + "@opentelemetry/instrumentation-generic-pool": "^0.32.0", + "@opentelemetry/instrumentation-graphql": "^0.35.0", "@opentelemetry/instrumentation-grpc": "^0.41.0", - "@opentelemetry/instrumentation-hapi": "^0.31.4", + "@opentelemetry/instrumentation-hapi": "^0.32.0", "@opentelemetry/instrumentation-http": "^0.41.0", - "@opentelemetry/instrumentation-ioredis": "^0.34.3", - "@opentelemetry/instrumentation-knex": "^0.31.4", - "@opentelemetry/instrumentation-koa": "^0.34.6", - "@opentelemetry/instrumentation-lru-memoizer": "^0.32.4", - "@opentelemetry/instrumentation-memcached": "^0.31.4", - "@opentelemetry/instrumentation-mongodb": "^0.35.0", - "@opentelemetry/instrumentation-mongoose": "^0.32.4", - "@opentelemetry/instrumentation-mysql": "^0.33.3", - "@opentelemetry/instrumentation-mysql2": "^0.33.4", - "@opentelemetry/instrumentation-nestjs-core": "^0.32.5", - "@opentelemetry/instrumentation-net": "^0.31.4", - "@opentelemetry/instrumentation-pg": "^0.35.3", - "@opentelemetry/instrumentation-pino": "^0.33.4", - "@opentelemetry/instrumentation-redis": "^0.34.7", - "@opentelemetry/instrumentation-redis-4": "^0.34.6", - "@opentelemetry/instrumentation-restify": "^0.32.4", - "@opentelemetry/instrumentation-router": "^0.32.4", - "@opentelemetry/instrumentation-socket.io": "^0.33.4", - "@opentelemetry/instrumentation-tedious": "^0.5.4", - "@opentelemetry/instrumentation-winston": "^0.31.4", - "@opentelemetry/resource-detector-alibaba-cloud": "^0.27.7", - "@opentelemetry/resource-detector-aws": "^1.2.5", - "@opentelemetry/resource-detector-container": "^0.2.5", - "@opentelemetry/resource-detector-gcp": "^0.28.3", + "@opentelemetry/instrumentation-ioredis": "^0.35.0", + "@opentelemetry/instrumentation-knex": "^0.32.0", + "@opentelemetry/instrumentation-koa": "^0.35.0", + "@opentelemetry/instrumentation-lru-memoizer": "^0.33.0", + "@opentelemetry/instrumentation-memcached": "^0.32.0", + "@opentelemetry/instrumentation-mongodb": "^0.36.0", + "@opentelemetry/instrumentation-mongoose": "^0.33.0", + "@opentelemetry/instrumentation-mysql": "^0.34.0", + "@opentelemetry/instrumentation-mysql2": "^0.34.0", + "@opentelemetry/instrumentation-nestjs-core": "^0.33.0", + "@opentelemetry/instrumentation-net": "^0.32.0", + "@opentelemetry/instrumentation-pg": "^0.36.0", + "@opentelemetry/instrumentation-pino": "^0.34.0", + "@opentelemetry/instrumentation-redis": "^0.35.0", + "@opentelemetry/instrumentation-redis-4": "^0.35.0", + "@opentelemetry/instrumentation-restify": "^0.33.0", + "@opentelemetry/instrumentation-router": "^0.33.0", + "@opentelemetry/instrumentation-socket.io": "^0.34.0", + "@opentelemetry/instrumentation-tedious": "^0.6.0", + "@opentelemetry/instrumentation-winston": "^0.32.0", + "@opentelemetry/resource-detector-alibaba-cloud": "^0.28.0", + "@opentelemetry/resource-detector-aws": "^1.3.0", + "@opentelemetry/resource-detector-container": "^0.3.0", + "@opentelemetry/resource-detector-gcp": "^0.29.0", "@opentelemetry/resources": "^1.12.0", "@opentelemetry/sdk-node": "^0.41.0", "tslib": "^2.3.1" diff --git a/metapackages/auto-instrumentations-web/CHANGELOG.md b/metapackages/auto-instrumentations-web/CHANGELOG.md index 55af3d789..8269ad067 100644 --- a/metapackages/auto-instrumentations-web/CHANGELOG.md +++ b/metapackages/auto-instrumentations-web/CHANGELOG.md @@ -12,6 +12,26 @@ * dependencies * @opentelemetry/instrumentation-document-load bumped from ^0.31.1 to ^0.31.2 +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.32.3...auto-instrumentations-web-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-document-load bumped from ^0.32.3 to ^0.33.0 + * @opentelemetry/instrumentation-user-interaction bumped from ^0.32.4 to ^0.33.0 + ## [0.32.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.32.2...auto-instrumentations-web-v0.32.3) (2023-06-12) diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index aa11f581a..e50748e1c 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-web", - "version": "0.32.3", + "version": "0.33.0", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-web#readme", @@ -60,9 +60,9 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-document-load": "^0.32.3", + "@opentelemetry/instrumentation-document-load": "^0.33.0", "@opentelemetry/instrumentation-fetch": "^0.41.0", - "@opentelemetry/instrumentation-user-interaction": "^0.32.4", + "@opentelemetry/instrumentation-user-interaction": "^0.33.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", "tslib": "^2.3.1" } diff --git a/packages/opentelemetry-host-metrics/CHANGELOG.md b/packages/opentelemetry-host-metrics/CHANGELOG.md index 4de1a4d20..24fef2d60 100644 --- a/packages/opentelemetry-host-metrics/CHANGELOG.md +++ b/packages/opentelemetry-host-metrics/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.32.2...host-metrics-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.32.1...host-metrics-v0.32.2) (2023-05-16) diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index d5ba9f347..b3ae7cd86 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/host-metrics", - "version": "0.32.2", + "version": "0.33.0", "description": "OpenTelemetry Host Metrics for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md b/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md index 1449444b8..55ef243c5 100644 --- a/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md +++ b/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.2.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/id-generator-aws-xray-v1.1.2...id-generator-aws-xray-v1.2.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [1.1.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/id-generator-aws-xray-v1.1.1...id-generator-aws-xray-v1.1.2) (2023-05-16) diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index 8f84ed2ca..5848c7683 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/id-generator-aws-xray", - "version": "1.1.2", + "version": "1.2.0", "description": "AWS X-Ray ID generator for OpenTelemetry", "main": "build/src/index.js", "publishConfig": { diff --git a/packages/opentelemetry-propagation-utils/CHANGELOG.md b/packages/opentelemetry-propagation-utils/CHANGELOG.md index 14dc247aa..5b0feb6c7 100644 --- a/packages/opentelemetry-propagation-utils/CHANGELOG.md +++ b/packages/opentelemetry-propagation-utils/CHANGELOG.md @@ -24,6 +24,20 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4 +## [0.30.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagation-utils-v0.29.5...propagation-utils-v0.30.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.29.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagation-utils-v0.29.3...propagation-utils-v0.29.4) (2023-05-16) diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 8a442fc0e..76f94f229 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagation-utils", - "version": "0.29.5", + "version": "0.30.0", "description": "Propagation utilities for opentelemetry instrumentations", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "^9.1.1", "@types/node": "18.11.7", "@types/sinon": "^10.0.11", diff --git a/packages/opentelemetry-redis-common/CHANGELOG.md b/packages/opentelemetry-redis-common/CHANGELOG.md index beb728a3b..a8856d1aa 100644 --- a/packages/opentelemetry-redis-common/CHANGELOG.md +++ b/packages/opentelemetry-redis-common/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/redis-common-v0.35.1...redis-common-v0.36.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.35.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/redis-common-v0.35.0...redis-common-v0.35.1) (2023-05-16) diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json index 51604ed21..536aa3997 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/opentelemetry-redis-common/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/redis-common", - "version": "0.35.1", + "version": "0.36.0", "description": "Redis utilities for redis instrumentations", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-sql-common/CHANGELOG.md b/packages/opentelemetry-sql-common/CHANGELOG.md new file mode 100644 index 000000000..ee7f4757e --- /dev/null +++ b/packages/opentelemetry-sql-common/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +## [0.40.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/sql-common-v0.39.0...sql-common-v0.40.0) (2023-07-12) + + +### Features + +* add sqlcommenter comment to mysql2 queries ([#1523](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1523)) ([856c252](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/856c25211567104ced8b2a2b56d0818a3c48e671)) +* upstream mocha instrumentation testing plugin from ext-js [#621](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/621) ([#669](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/669)) ([a5170c4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a5170c494706a2bec3ba51e59966d0ca8a41d00e)) diff --git a/packages/opentelemetry-sql-common/package.json b/packages/opentelemetry-sql-common/package.json index a194f9252..1bdb924de 100644 --- a/packages/opentelemetry-sql-common/package.json +++ b/packages/opentelemetry-sql-common/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sql-common", - "version": "0.39.0", + "version": "0.40.0", "description": "Utilities for SQL instrumentations", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-test-utils/CHANGELOG.md b/packages/opentelemetry-test-utils/CHANGELOG.md index d524135de..bb81d76fd 100644 --- a/packages/opentelemetry-test-utils/CHANGELOG.md +++ b/packages/opentelemetry-test-utils/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.33.4...contrib-test-utils-v0.34.0) (2023-07-12) + + +### Features + +* add sqlcommenter comment to mysql2 queries ([#1523](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1523)) ([856c252](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/856c25211567104ced8b2a2b56d0818a3c48e671)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.33.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.33.3...contrib-test-utils-v0.33.4) (2023-06-12) diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 48493d0e5..c164fbcad 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/contrib-test-utils", - "version": "0.33.4", + "version": "0.34.0", "description": "Test utilities for opentelemetry components", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/instrumentation-amqplib/CHANGELOG.md b/plugins/node/instrumentation-amqplib/CHANGELOG.md index 54ce4a93a..7dd0b6fe3 100644 --- a/plugins/node/instrumentation-amqplib/CHANGELOG.md +++ b/plugins/node/instrumentation-amqplib/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.32.5...instrumentation-amqplib-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.32.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.32.4...instrumentation-amqplib-v0.32.5) (2023-06-12) diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 11137bc0e..2ba05fb24 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-amqplib", - "version": "0.32.5", + "version": "0.33.0", "description": "OpenTelemetry automatic instrumentation for the `amqplib` package", "keywords": [ "amqplib", @@ -53,7 +53,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/amqplib": "^0.5.17", "@types/lodash": "4.14.178", "@types/mocha": "8.2.3", diff --git a/plugins/node/instrumentation-dataloader/CHANGELOG.md b/plugins/node/instrumentation-dataloader/CHANGELOG.md index 2e6bf45b1..02cb54984 100644 --- a/plugins/node/instrumentation-dataloader/CHANGELOG.md +++ b/plugins/node/instrumentation-dataloader/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.5.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dataloader-v0.4.3...instrumentation-dataloader-v0.5.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.4.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dataloader-v0.4.2...instrumentation-dataloader-v0.4.3) (2023-06-12) diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index befebb720..96f298eea 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-dataloader", - "version": "0.4.3", + "version": "0.5.0", "description": "OpenTelemetry instrumentation for dataloader", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/instrumentation-fs/CHANGELOG.md b/plugins/node/instrumentation-fs/CHANGELOG.md index 43780cac4..5d889a9bf 100644 --- a/plugins/node/instrumentation-fs/CHANGELOG.md +++ b/plugins/node/instrumentation-fs/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fs-v0.7.4...instrumentation-fs-v0.8.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.7.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fs-v0.7.3...instrumentation-fs-v0.7.4) (2023-06-12) diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 3100d2121..f9f976e93 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fs", - "version": "0.7.4", + "version": "0.8.0", "description": "OpenTelemetry automatic instrumentation package for fs", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md b/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md index 684096a54..207bb3bc2 100644 --- a/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md +++ b/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-lru-memoizer-v0.32.4...instrumentation-lru-memoizer-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-lru-memoizer-v0.32.3...instrumentation-lru-memoizer-v0.32.4) (2023-06-12) diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index d2a7d012e..ff540408f 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-lru-memoizer", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry automatic instrumentation package for lru-memoizer", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/lru-cache": "7.10.9", "@types/mocha": "8.2.3", "@types/node": "18.11.7", diff --git a/plugins/node/instrumentation-mongoose/CHANGELOG.md b/plugins/node/instrumentation-mongoose/CHANGELOG.md index e2d4c1951..214b8e526 100644 --- a/plugins/node/instrumentation-mongoose/CHANGELOG.md +++ b/plugins/node/instrumentation-mongoose/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongoose-v0.32.4...instrumentation-mongoose-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongoose-v0.32.3...instrumentation-mongoose-v0.32.4) (2023-06-12) diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 0d271057c..0d4c3996e 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mongoose", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry automatic instrumentation package for mongoose", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,7 +46,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", diff --git a/plugins/node/instrumentation-socket.io/CHANGELOG.md b/plugins/node/instrumentation-socket.io/CHANGELOG.md index ec1ef7147..afa984966 100644 --- a/plugins/node/instrumentation-socket.io/CHANGELOG.md +++ b/plugins/node/instrumentation-socket.io/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-socket.io-v0.33.4...instrumentation-socket.io-v0.34.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.33.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-socket.io-v0.33.3...instrumentation-socket.io-v0.33.4) (2023-06-12) diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 2af9cf830..cea3369e2 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-socket.io", - "version": "0.33.4", + "version": "0.34.0", "description": "OpenTelemetry automatic instrumentation package for socket.io", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", diff --git a/plugins/node/instrumentation-tedious/CHANGELOG.md b/plugins/node/instrumentation-tedious/CHANGELOG.md index 564b8827e..b9cdd5afb 100644 --- a/plugins/node/instrumentation-tedious/CHANGELOG.md +++ b/plugins/node/instrumentation-tedious/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.6.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-tedious-v0.5.4...instrumentation-tedious-v0.6.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.5.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-tedious-v0.5.3...instrumentation-tedious-v0.5.4) (2023-06-12) diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index dcb9360c8..1fe2216fe 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-tedious", - "version": "0.5.4", + "version": "0.6.0", "description": "OpenTelemetry instrumentation for `tedious`", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md index 7bf27f4be..8459346a3 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.35.3...instrumentation-aws-lambda-v0.36.0) (2023-07-12) + + +### Features + +* **lambda:** add OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION environment variable ([#1227](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1227)) ([8777cbd](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8777cbd3178bb970686488c7e8383d5fa0aaa187)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/propagator-aws-xray bumped from ^1.2.1 to ^1.3.0 + ## [0.35.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.35.2...instrumentation-aws-lambda-v0.35.3) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index adfc67d4f..3a8c4ad01 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.35.3", + "version": "0.36.0", "description": "OpenTelemetry AWS Lambda automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -60,7 +60,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/propagator-aws-xray": "^1.2.1", + "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/aws-lambda": "8.10.81", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md index 192c705e2..04ee79009 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.34.3...instrumentation-aws-sdk-v0.35.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) +* **opentelemetry-instrumentation-aws-sdk:** add missing spec-defined DynamoDB attributes ([#1524](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1524)) ([f7c4324](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f7c432495dc04b02f7279c543bb4565f4f111134)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/propagation-utils bumped from ^0.29.5 to ^0.30.0 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.34.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.34.2...instrumentation-aws-sdk-v0.34.3) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index f39141431..7c1f02d22 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.34.3", + "version": "0.35.0", "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package", "keywords": [ "aws", @@ -49,7 +49,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.29.5", + "@opentelemetry/propagation-utils": "^0.30.0", "tslib": "^2.3.1" }, "devDependencies": { @@ -60,7 +60,7 @@ "@aws-sdk/client-sns": "3.85.0", "@aws-sdk/types": "3.78.0", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md index f058c4da8..164f7231a 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.31.4...instrumentation-bunyan-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.31.3...instrumentation-bunyan-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index dfe7b2701..c6c0e5559 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-bunyan", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry instrumentation for bunyan", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md index 1e3cac7ce..fbec3a968 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.32.4...instrumentation-cassandra-driver-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.32.3...instrumentation-cassandra-driver-v0.32.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 012eddbbb..21136a3b3 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-cassandra-driver", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry instrumentation for cassandra-driver", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,7 +48,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md index a074cc3fa..fd62f6fe4 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.31.4...instrumentation-connect-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **connect:** Skip update HTTP's span name and update RpcMetadata's route instead ([#1534](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1534)) ([8499b16](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8499b16b720db19b8982ad7745fc79b68c6555a3)) +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.31.3...instrumentation-connect-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 829f4e770..9334e1af6 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-connect", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry connect automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md index 5cb59bc9b..04e95eb85 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.31.5...instrumentation-dns-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.31.4...instrumentation-dns-v0.31.5) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 757ebfea8..1b17d9d98 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-dns", - "version": "0.31.5", + "version": "0.32.0", "description": "OpenTelemetry dns automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md index e25096c91..f19c0050e 100644 --- a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.32.4...instrumentation-express-v0.33.0) (2023-07-12) + + +### Features + +* **express:** Skip update HTTP's span name and update RpcMetadata's route instead ([#1557](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1557)) ([8e2f518](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8e2f518d668bb5e0382e1e071bac0213b57142a0)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.32.3...instrumentation-express-v0.32.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index f606916bf..bf3060098 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-express", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry express automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md index 6b69f92b2..2f928199f 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.31.4...instrumentation-fastify-v0.32.0) (2023-07-12) + + +### Features + +* **fastify:** Skip update HTTP's span name and update RpcMetadata's route instead ([#1569](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1569)) ([8d9687d](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8d9687d89e4a80dbf2a5e8be6fb027ff20824593)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) +* **instrumentation-fastify:** fix fastify typescript compilation issue ([#1556](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1556)) ([784a422](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/784a4225182037b4233aefb43c7a104eab1ac818)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.31.3...instrumentation-fastify-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index f86886071..8fcc571c7 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fastify", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry fastify automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md index 9a1799ca4..03ba9f770 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.31.4...instrumentation-generic-pool-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.31.3...instrumentation-generic-pool-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 91f2ec8ce..a63b3878e 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-generic-pool", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry Generic Pool automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md index 280a5ff1e..583a16253 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.34.3...instrumentation-graphql-v0.35.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.34.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.34.2...instrumentation-graphql-v0.34.3) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 0dc5a93a3..bc92d8df5 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-graphql", - "version": "0.34.3", + "version": "0.35.0", "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md index ddcb6d162..06bc9b2c2 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.31.4...instrumentation-hapi-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.31.3...instrumentation-hapi-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index d1780d464..cf4c02956 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-hapi", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry Hapi automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md index f953d9bcc..e46622780 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.34.3...instrumentation-ioredis-v0.35.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/redis-common bumped from ^0.35.1 to ^0.36.0 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.34.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.34.2...instrumentation-ioredis-v0.34.3) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index eabb62e69..f450a8702 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-ioredis", - "version": "0.34.3", + "version": "0.35.0", "description": "OpenTelemetry ioredis automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,7 +52,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -70,7 +70,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/redis-common": "^0.35.1", + "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/ioredis4": "npm:@types/ioredis@^4.28.10", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md index 8fb0cbd30..3487a3f6c 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.31.4...instrumentation-knex-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.31.3...instrumentation-knex-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index e908dc7b9..f73a782cf 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-knex", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry Knex automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md index 424b456f0..3633e25a6 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.34.6...instrumentation-koa-v0.35.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.34.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.34.5...instrumentation-koa-v0.34.6) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 0d0cff956..fe1fa47d6 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-koa", - "version": "0.34.6", + "version": "0.35.0", "description": "OpenTelemetry Koa automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md index f990c8f96..44aa792ba 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.31.4...instrumentation-memcached-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.31.3...instrumentation-memcached-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 649f84481..1bfbc6c0c 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-memcached", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry memcached automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md index 338e48979..298848c9e 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.35.0...instrumentation-mongodb-v0.36.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) +* **mongodb:** support v5 ([#1451](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1451)) ([05c4e9e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/05c4e9ee3e740b3bfba609b3e8a4c02ca7119a1c)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.34.3...instrumentation-mongodb-v0.35.0) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 2816eba95..4816bcf78 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mongodb", - "version": "0.35.0", + "version": "0.36.0", "description": "OpenTelemetry mongodb automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,7 +53,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md index bb177e54e..fad5b536e 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.33.3...instrumentation-mysql-v0.34.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.33.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.33.2...instrumentation-mysql-v0.33.3) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 4b220da0f..3d5f1d583 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql", - "version": "0.33.3", + "version": "0.34.0", "description": "OpenTelemetry mysql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-metrics": "^1.8.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md index 267e7e012..25b5b5f5b 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.33.4...instrumentation-mysql2-v0.34.0) (2023-07-12) + + +### Features + +* add sqlcommenter comment to mysql2 queries ([#1523](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1523)) ([856c252](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/856c25211567104ced8b2a2b56d0818a3c48e671)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + * @opentelemetry/sql-common bumped from ^0.39.0 to ^0.40.0 + ## [0.33.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.33.3...instrumentation-mysql2-v0.33.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index ebd8f55aa..fd8feb541 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql2", - "version": "0.33.4", + "version": "0.34.0", "description": "OpenTelemetry mysql2 automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,9 +49,9 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@opentelemetry/sql-common": "^0.39.0", + "@opentelemetry/sql-common": "^0.40.0", "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", "@types/node": "18.11.7", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md index 615a7d5b1..f465577aa 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.32.5...instrumentation-nestjs-core-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) +* **nestjs:** update dependency @nestjs/x to v9 ([#1538](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1538)) ([fec1799](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/fec17997d64349f00c1141ada9ae4bcbde3e5e89)) + ## [0.32.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.32.4...instrumentation-nestjs-core-v0.32.5) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 15a8441a2..dfee97d12 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-nestjs-core", - "version": "0.32.5", + "version": "0.33.0", "description": "OpenTelemetry NestJS automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md index 08322c393..fd1e8ef3f 100644 --- a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.31.4...instrumentation-net-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.31.3...instrumentation-net-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index ba1853206..54084e5d0 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-net", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry net module automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md index e56613223..79db223ad 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [0.36.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.35.3...instrumentation-pg-v0.36.0) (2023-07-12) + + +### Features + +* add sqlcommenter comment to mysql2 queries ([#1523](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1523)) ([856c252](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/856c25211567104ced8b2a2b56d0818a3c48e671)) +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/sql-common bumped from ^0.39.0 to ^0.40.0 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.35.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.35.2...instrumentation-pg-v0.35.3) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 187dba00d..89f1af9d8 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pg", - "version": "0.35.3", + "version": "0.36.0", "description": "OpenTelemetry postgres automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -55,7 +55,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -77,7 +77,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/sql-common": "^0.39.0", + "@opentelemetry/sql-common": "^0.40.0", "@types/pg": "8.6.1", "@types/pg-pool": "2.0.3", "tslib": "^2.3.1" diff --git a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md index 91d339fdc..e07d91259 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.33.4...instrumentation-pino-v0.34.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.33.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.33.3...instrumentation-pino-v0.33.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 44afe9f36..6232bba6e 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pino", - "version": "0.33.4", + "version": "0.34.0", "description": "OpenTelemetry instrumentation for pino", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md index 229cc3b8d..06a7d17ee 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-redis-4/CHANGELOG.md @@ -6,6 +6,27 @@ * dependencies * @opentelemetry/redis-common bumped from ^0.34.0 to ^0.35.0 +## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-4-v0.34.6...instrumentation-redis-4-v0.35.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/redis-common bumped from ^0.35.1 to ^0.36.0 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.34.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-4-v0.34.5...instrumentation-redis-4-v0.34.6) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 0ef944074..42b35b2d5 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-redis-4", - "version": "0.34.6", + "version": "0.35.0", "description": "Automatic OpenTelemetry instrumentation for redis package version 4", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,7 +54,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/core": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -70,7 +70,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/redis-common": "^0.35.1", + "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md index efea06e6b..0dfa4a4ec 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md @@ -6,6 +6,27 @@ * dependencies * @opentelemetry/redis-common bumped from ^0.34.0 to ^0.35.0 +## [0.35.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.34.7...instrumentation-redis-v0.35.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/redis-common bumped from ^0.35.1 to ^0.36.0 + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0 + ## [0.34.7](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.34.6...instrumentation-redis-v0.34.7) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 4a92a6567..f396c4214 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-redis", - "version": "0.34.7", + "version": "0.35.0", "description": "Automatic OpenTelemetry instrumentation for redis package version 2 and 3", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -54,7 +54,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/contrib-test-utils": "^0.33.4", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", @@ -71,7 +71,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/redis-common": "^0.35.1", + "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0", "tslib": "^2.3.1" }, diff --git a/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md index 1f3e15605..4dfd96d09 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.32.4...instrumentation-restify-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.32.3...instrumentation-restify-v0.32.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 9b266dfa7..d5d9046c4 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-restify", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry restify automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md index d38b8b43c..81c8f2e46 100644 --- a/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.32.4...instrumentation-router-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.32.3...instrumentation-router-v0.32.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 5d664dc42..174b72b10 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-router", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry Router automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md index d952f9a12..a11e34c03 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.32.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.31.4...instrumentation-winston-v0.32.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.31.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.31.3...instrumentation-winston-v0.31.4) (2023-06-12) diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index e220a250a..21118eaaa 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-winston", - "version": "0.31.4", + "version": "0.32.0", "description": "OpenTelemetry instrumentation for winston", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md b/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md index db63db43b..4230bfda0 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md +++ b/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.32.3...instrumentation-document-load-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) +* **opentelemetry-instrumentation-document-load:** Add access to performance resource timing object for custom attributes ([#1529](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1529)) ([7c7294c](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/7c7294ce0591a3c8d4c12b5f135f4fcd24b79762)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) +* **document-load:** compatibility issue with @opentelemetry/sdk-trace-web@1.15.0 ([#1565](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1565)) ([774d254](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/774d25463bdbf7f290d99a07f627237888137e24)) + ## [0.32.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.32.2...instrumentation-document-load-v0.32.3) (2023-06-12) diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index f2cdcd863..1f7b50bab 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-document-load", - "version": "0.32.3", + "version": "0.33.0", "description": "OpenTelemetry document-load automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md b/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md index a150d4ada..fb7d9c17e 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md +++ b/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-long-task-v0.32.5...instrumentation-long-task-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.32.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-long-task-v0.32.4...instrumentation-long-task-v0.32.5) (2023-06-12) diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 390498c9c..68819e966 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-long-task", - "version": "0.32.5", + "version": "0.33.0", "description": "OpenTelemetry long task API automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md b/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md index 678a8f7d5..16732bf9e 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.32.4...instrumentation-user-interaction-v0.33.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + + +### Bug Fixes + +* **deps:** update otel core experimental to ^0.41.0 ([#1566](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1566)) ([84a2377](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/84a2377845c313f0ca68b4de7f3e7a464be68885)) + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.32.3...instrumentation-user-interaction-v0.32.4) (2023-06-12) diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 694195789..291487f50 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-user-interaction", - "version": "0.32.4", + "version": "0.33.0", "description": "OpenTelemetry UserInteraction automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md b/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md index 74924d12e..358a95f95 100644 --- a/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md +++ b/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/plugin-react-load-v0.28.2...plugin-react-load-v0.29.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.28.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/plugin-react-load-v0.28.1...plugin-react-load-v0.28.2) (2023-05-16) diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 99be2797f..d334aeecd 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/plugin-react-load", - "version": "0.28.2", + "version": "0.29.0", "description": "OpenTelemetry React loading automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md b/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md index bcba2c5f8..b40d7bb2e 100644 --- a/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md +++ b/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-aws-xray-v1.2.1...propagator-aws-xray-v1.3.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [1.2.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-aws-xray-v1.2.0...propagator-aws-xray-v1.2.1) (2023-05-16) diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index 237589324..427ebe670 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-aws-xray", - "version": "1.2.1", + "version": "1.3.0", "description": "OpenTelemetry AWS Xray propagator provides context propagation for systems that are using AWS X-Ray format.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md b/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md index e4c4d75ac..b55e21ced 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md +++ b/propagators/opentelemetry-propagator-grpc-census-binary/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-grpc-census-binary-v0.26.1...propagator-grpc-census-binary-v0.27.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.26.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-grpc-census-binary-v0.26.0...propagator-grpc-census-binary-v0.26.1) (2023-05-16) diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0eaabc96b..c3c5693f7 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-grpc-census-binary", - "version": "0.26.1", + "version": "0.27.0", "description": "OpenTelemetry gRPC Census propagator provides a context propagator for OpenTelemetry that can use the gRPC binary header: 'grpc-trace-bin' for interoperability with OpenCensus", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/propagators/opentelemetry-propagator-instana/CHANGELOG.md b/propagators/opentelemetry-propagator-instana/CHANGELOG.md index a2184d829..363f18007 100644 --- a/propagators/opentelemetry-propagator-instana/CHANGELOG.md +++ b/propagators/opentelemetry-propagator-instana/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-instana-v0.2.2...propagator-instana-v0.3.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.2.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-instana-v0.2.1...propagator-instana-v0.2.2) (2023-05-16) diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index c6434a0b9..713430252 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-instana", - "version": "0.2.2", + "version": "0.3.0", "description": "The OpenTelemetry Instana Propagator implements the propagation format used by IBM Observability by Instana", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md b/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md index 3322053e4..2630db118 100644 --- a/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md +++ b/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-ot-trace-v0.26.3...propagator-ot-trace-v0.27.0) (2023-07-12) + + +### Features + +* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482)) + ## [0.26.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagator-ot-trace-v0.26.2...propagator-ot-trace-v0.26.3) (2023-05-16) diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 9bb140fb3..ab74a191a 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-ot-trace", - "version": "0.26.3", + "version": "0.27.0", "description": "The OpenTelemetry OTTracepropagator implements the propagation format used by the \"basic tracer\" implementations from the OpenTracing project", "main": "build/src/index.js", "module": "build/esm/index.js", From 5352cc78b6e61a4816977e250f5e5fa279e5550f Mon Sep 17 00:00:00 2001 From: Chengzhong Wu Date: Thu, 13 Jul 2023 18:58:25 +0800 Subject: [PATCH 50/94] chore: apply update-ts-configs (#3987) --- .../packages/opentelemetry-sdk-node/tsconfig.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/experimental/packages/opentelemetry-sdk-node/tsconfig.json b/experimental/packages/opentelemetry-sdk-node/tsconfig.json index 4091bf66e..94c80b884 100644 --- a/experimental/packages/opentelemetry-sdk-node/tsconfig.json +++ b/experimental/packages/opentelemetry-sdk-node/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../../../api" }, - { - "path": "../../packages/api-logs" - }, { "path": "../../../packages/opentelemetry-context-async-hooks" }, @@ -40,10 +37,10 @@ "path": "../../../packages/opentelemetry-semantic-conventions" }, { - "path": "../../packages/sdk-logs" + "path": "../../../packages/sdk-metrics" }, { - "path": "../../../packages/sdk-metrics" + "path": "../api-logs" }, { "path": "../exporter-trace-otlp-grpc" @@ -56,6 +53,9 @@ }, { "path": "../opentelemetry-instrumentation" + }, + { + "path": "../sdk-logs" } ] } From 65483a4fe93ff6fc265bbe469150b8b25c68562d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 13 Jul 2023 15:49:25 +0200 Subject: [PATCH 51/94] chore(deps): update all patch versions (#3984) --- api/package.json | 2 +- experimental/packages/api-events/package.json | 2 +- experimental/packages/api-logs/package.json | 2 +- experimental/packages/exporter-logs-otlp-grpc/package.json | 4 ++-- experimental/packages/exporter-logs-otlp-http/package.json | 4 ++-- experimental/packages/exporter-logs-otlp-proto/package.json | 4 ++-- experimental/packages/exporter-trace-otlp-grpc/package.json | 4 ++-- experimental/packages/exporter-trace-otlp-http/package.json | 4 ++-- .../packages/exporter-trace-otlp-proto/package.json | 4 ++-- .../packages/opentelemetry-browser-detector/package.json | 4 ++-- .../opentelemetry-exporter-metrics-otlp-grpc/package.json | 4 ++-- .../opentelemetry-exporter-metrics-otlp-http/package.json | 4 ++-- .../opentelemetry-exporter-metrics-otlp-proto/package.json | 4 ++-- .../packages/opentelemetry-exporter-prometheus/package.json | 2 +- .../opentelemetry-instrumentation-fetch/package.json | 4 ++-- .../opentelemetry-instrumentation-grpc/package.json | 2 +- .../opentelemetry-instrumentation-http/package.json | 2 +- .../package.json | 4 ++-- .../packages/opentelemetry-instrumentation/package.json | 4 ++-- experimental/packages/opentelemetry-sdk-node/package.json | 2 +- experimental/packages/otlp-exporter-base/package.json | 4 ++-- experimental/packages/otlp-grpc-exporter-base/package.json | 4 ++-- experimental/packages/otlp-proto-exporter-base/package.json | 4 ++-- experimental/packages/otlp-transformer/package.json | 2 +- experimental/packages/sdk-logs/package.json | 4 ++-- experimental/packages/shim-opencensus/package.json | 2 +- package.json | 4 ++-- packages/opentelemetry-context-async-hooks/package.json | 2 +- packages/opentelemetry-context-zone-peer-dep/package.json | 4 ++-- packages/opentelemetry-context-zone/package.json | 4 ++-- packages/opentelemetry-core/package.json | 2 +- packages/opentelemetry-exporter-jaeger/package.json | 2 +- packages/opentelemetry-exporter-zipkin/package.json | 4 ++-- packages/opentelemetry-propagator-b3/package.json | 2 +- packages/opentelemetry-propagator-jaeger/package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- packages/opentelemetry-sdk-trace-base/package.json | 2 +- packages/opentelemetry-sdk-trace-node/package.json | 2 +- packages/opentelemetry-sdk-trace-web/package.json | 4 ++-- packages/opentelemetry-semantic-conventions/package.json | 2 +- packages/opentelemetry-shim-opentracing/package.json | 2 +- packages/sdk-metrics/package.json | 4 ++-- packages/template/package.json | 2 +- selenium-tests/package.json | 6 +++--- 44 files changed, 69 insertions(+), 69 deletions(-) diff --git a/api/package.json b/api/package.json index e8952c3cf..d78638160 100644 --- a/api/package.json +++ b/api/package.json @@ -76,7 +76,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "memfs": "3.5.3", "mocha": "10.2.0", "nyc": "15.1.0", diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index fe43dbc69..e2fed0e67 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -77,7 +77,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 02cc0bc2b..15f4d1c86 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -77,7 +77,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 1a71d47cf..643ab186f 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.0", @@ -60,7 +60,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 459612e2c..b77b63df2 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -71,7 +71,7 @@ ], "sideEffects": false, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api-logs": "0.41.0", "@opentelemetry/resources": "1.15.0", "@types/mocha": "10.0.1", @@ -89,7 +89,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index a166f6241..355e5333d 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -78,7 +78,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 524adb106..22a4eae70 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-exporter-base": "0.41.0", @@ -57,7 +57,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index cdb697283..56e01988a 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -80,7 +80,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index ef8f876ac..96c327b60 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -62,7 +62,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -77,7 +77,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 29373f305..357f63061 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -67,7 +67,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 15624bac4..4c239a6e2 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", @@ -56,7 +56,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 1e696f527..89017dfb0 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -80,7 +80,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 2168d2864..d98c421bc 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -55,7 +55,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index c9ffe2cdc..5b44a67c3 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -50,7 +50,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index c1213ea31..b36c60a67 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.0", "@opentelemetry/propagator-b3": "1.15.0", @@ -73,7 +73,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 10019d25c..ac047252e 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -58,7 +58,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "semver": "7.5.4", diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 93ed303fa..d765adc52 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -59,7 +59,7 @@ "axios": "1.4.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index c7179d59d..71585b4e0 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.0", "@opentelemetry/propagator-b3": "1.15.0", @@ -73,7 +73,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index b788dea26..46ba9af64 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -82,7 +82,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@opentelemetry/sdk-metrics": "1.15.0", "@types/mocha": "10.0.1", @@ -101,7 +101,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index a99bab01a..8e6f97f27 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -72,7 +72,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "semver": "7.5.4", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 142f9ca88..687fcdf50 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -65,7 +65,7 @@ "tslib": "^2.3.1" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -79,7 +79,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 0610cb9d4..232b83bf6 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", @@ -59,7 +59,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "protobufjs-cli": "1.1.1", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index a76429985..f1fd58623 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -59,14 +59,14 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "protobufjs-cli": "1.1.1", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index ca8d12685..3a53906d5 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -69,7 +69,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 106a3dbf4..14a18889e 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -74,7 +74,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.4.0 <1.5.0", "@opentelemetry/api-logs": "0.41.0", - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -87,7 +87,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index b57628d38..d5ebb224d 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -57,7 +57,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/package.json b/package.json index 2b8572602..867154052 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "4.2.1", "gh-pages": "5.0.0", - "lerna": "7.1.1", - "@lerna/legacy-package-management": "7.1.1", + "lerna": "7.1.3", + "@lerna/legacy-package-management": "7.1.3", "linkinator": "5.0.1", "markdownlint-cli": "0.35.0", "prettier": "2.8.8", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 23e3e65ee..a1073523b 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -52,7 +52,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 8026461c6..515059557 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -70,7 +70,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 70f79503f..342c580ff 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -50,7 +50,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -63,7 +63,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 1e9d1d8c6..c8ba0b364 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -78,7 +78,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 89e57e4c7..9419fe104 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -51,7 +51,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 4b979ec13..d4cdf4472 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -60,7 +60,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -76,7 +76,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 1cb95ba6b..69fce8a12 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -63,7 +63,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index f110f2d8d..ef8d9915a 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -68,7 +68,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 997635f42..a56531034 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -76,7 +76,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 4c306805c..d220f8cae 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -80,7 +80,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 1608b10f3..7afeef5bc 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -54,7 +54,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index f7dd504e7..4c1c347cd 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -55,7 +55,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@opentelemetry/context-zone": "1.15.0", "@opentelemetry/propagator-b3": "1.15.0", @@ -77,7 +77,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 93cff0e7c..6ccbe2ddb 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -54,7 +54,7 @@ "@types/sinon": "10.0.15", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nock": "13.3.1", "nyc": "15.1.0", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 0555f0d70..6f28c3c06 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -50,7 +50,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index f85e67faf..0ce67e77d 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0", "@types/lodash.merge": "4.6.7", - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -69,7 +69,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.1", + "lerna": "7.1.3", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/template/package.json b/packages/template/package.json index 7d04d854a..890604127 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -80,7 +80,7 @@ "devDependencies": { "@types/node": "18.6.5", "cross-var": "1.1.0", - "lerna": "7.1.1", + "lerna": "7.1.3", "typescript": "4.4.4" }, "dependencies": { diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 5c0fe40da..16f2d6e9b 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -31,11 +31,11 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.22.8", + "@babel/core": "7.22.9", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.22.7", - "@babel/plugin-transform-runtime": "7.22.7", - "@babel/preset-env": "7.22.7", + "@babel/plugin-transform-runtime": "7.22.9", + "@babel/preset-env": "7.22.9", "@opentelemetry/api": "^1.0.0", "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", From 1195872a5c4cc9f38dd50704a55e0c06521b8127 Mon Sep 17 00:00:00 2001 From: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:17:50 +0300 Subject: [PATCH 52/94] fix(aws-xray): align aws xray to use contrib-test-utils v0.34.0 (#1582) --- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 0f1a62c51..95bb56ff5 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -52,7 +52,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.33.1", + "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", "@types/sinon": "10.0.6", From 87f21ef8aecaa1e52ff9200a99497276ffa2956b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 14 Jul 2023 12:49:00 +0200 Subject: [PATCH 53/94] chore(deps): update dependency nock to v13.3.2 (#3994) --- .../packages/opentelemetry-instrumentation-http/package.json | 2 +- packages/opentelemetry-exporter-jaeger/package.json | 2 +- packages/opentelemetry-exporter-zipkin/package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- packages/opentelemetry-semantic-conventions/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index d765adc52..2c5d28cd7 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -61,7 +61,7 @@ "cross-var": "1.1.0", "lerna": "7.1.3", "mocha": "10.2.0", - "nock": "13.3.1", + "nock": "13.3.2", "nyc": "15.1.0", "request": "2.88.2", "request-promise-native": "1.0.9", diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 9419fe104..2158bd306 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -53,7 +53,7 @@ "cross-var": "1.1.0", "lerna": "7.1.3", "mocha": "10.2.0", - "nock": "13.3.1", + "nock": "13.3.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index d4cdf4472..6ef32c8de 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -78,7 +78,7 @@ "karma-webpack": "4.0.2", "lerna": "7.1.3", "mocha": "10.2.0", - "nock": "13.3.1", + "nock": "13.3.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index a56531034..a121a1c4f 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -78,7 +78,7 @@ "karma-webpack": "4.0.2", "lerna": "7.1.3", "mocha": "10.2.0", - "nock": "13.3.1", + "nock": "13.3.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 6ccbe2ddb..29b28f22f 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -56,7 +56,7 @@ "cross-var": "1.1.0", "lerna": "7.1.3", "mocha": "10.2.0", - "nock": "13.3.1", + "nock": "13.3.2", "nyc": "15.1.0", "sinon": "15.1.2", "ts-mocha": "10.0.0", From 00f7404156350ef2dfe3b79e525265dbef359dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Th=C3=A9riault?= <113933910+raphael-theriault-swi@users.noreply.github.com> Date: Fri, 14 Jul 2023 23:51:46 -0700 Subject: [PATCH 54/94] fix(instrumentation-mysql2): sql-common should be a dependency (#1584) --- plugins/node/opentelemetry-instrumentation-mysql2/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index fd8feb541..c337b87a0 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -51,7 +51,6 @@ "@opentelemetry/context-async-hooks": "^1.8.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@opentelemetry/sql-common": "^0.40.0", "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", "@types/node": "18.11.7", @@ -68,6 +67,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", + "@opentelemetry/sql-common": "^0.40.0", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme" From ea865837f88121973ac30d9420f21be262b0a669 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Sat, 15 Jul 2023 23:14:31 +0700 Subject: [PATCH 55/94] chore: upgrade nock@13.3.1 and re-enable test in node@18 for resource-detector-alibaba-cloud (#1581) * chore: upgrade nock@13.3.1 and re-enable test in node@18 for resource-detector-alibaba-cloud * chore: remove --ignore @opentelemetry/resource-detector-alibaba-cloud in tav pipeline --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Co-authored-by: Amir Blum --- .github/workflows/test-all-versions.yml | 1 - .github/workflows/unit-test.yml | 1 - .../opentelemetry-resource-detector-alibaba-cloud/package.json | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index f272f039a..20f54df5c 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -24,7 +24,6 @@ jobs: lerna-extra-args: >- --ignore @opentelemetry/instrumentation-fastify --ignore @opentelemetry/instrumentation-restify - --ignore @opentelemetry/resource-detector-alibaba-cloud runs-on: ubuntu-latest services: mongo: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index fc0566c6c..4959b4d90 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,7 +13,6 @@ jobs: include: - node: "18" lerna-extra-args: >- - --ignore @opentelemetry/resource-detector-alibaba-cloud --ignore @opentelemetry/instrumentation-restify runs-on: ubuntu-latest services: diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index d1f0efdf3..066173f25 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -48,7 +48,7 @@ "@types/node": "18.11.7", "@types/sinon": "10.0.2", "mocha": "7.2.0", - "nock": "12.0.3", + "nock": "13.3.1", "nyc": "15.1.0", "rimraf": "5.0.0", "sinon": "15.0.1", From 6150def98b83714a480c2230f13cb3cfdb0fa787 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sat, 15 Jul 2023 19:45:33 +0200 Subject: [PATCH 56/94] chore(deps): update dependency semver to v7.5.4 (#1577) Co-authored-by: Amir Blum --- .../node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../node/opentelemetry-resource-detector-instana/package.json | 2 +- .../node/opentelemetry-instrumentation-cassandra/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- .../opentelemetry-instrumentation-generic-pool/package.json | 4 ++-- .../node/opentelemetry-instrumentation-mysql2/package.json | 4 ++-- .../opentelemetry-instrumentation-nestjs-core/package.json | 4 ++-- plugins/node/opentelemetry-instrumentation-pino/package.json | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index e932955f9..c216d6425 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -45,7 +45,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index aee9d5994..4b0d85f23 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -44,7 +44,7 @@ "@opentelemetry/sdk-node": "^0.41.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 21136a3b3..d65af8551 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "@types/sinon": "10.0.2", "cassandra-driver": "4.6.3", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 1b17d9d98..d6ee09bdf 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", "@types/sinon": "10.0.2", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index a63b3878e..dbc5629e8 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -51,12 +51,12 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "generic-pool": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", - "semver": "7.3.5", + "semver": "7.5.4", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index c337b87a0..f9ddc658b 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -54,12 +54,12 @@ "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "mocha": "7.2.0", "mysql2": "2.3.0", "nyc": "15.1.0", "rimraf": "5.0.0", - "semver": "7.3.5", + "semver": "7.5.4", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index dfee97d12..450f1a0d2 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -59,7 +59,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", @@ -67,7 +67,7 @@ "rimraf": "5.0.0", "rxjs": "7.3.0", "rxjs-compat": "6.6.7", - "semver": "7.3.5", + "semver": "7.5.4", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 6232bba6e..37ba1edc1 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -53,13 +53,13 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", "rimraf": "5.0.0", - "semver": "7.3.5", + "semver": "7.5.4", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", From 432d89e0408b8bdd829861720d6c894733b8a7a2 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Sun, 16 Jul 2023 15:16:09 +0700 Subject: [PATCH 57/94] chore(restify): update restify version to 11.1.0 and re-enable unit test in node@18 (#1576) * chore(restify): upgrade restify to 9.1.0 * chore(restify): upgrade restify to 10.0.0 && re-enable node@18 test * chore(restify): upgrade restify to 11.1.0 * chore(restify): re-enable test in tav * chore(restify): update tav with corrent node.js version range check * chore(restify): fix missing newline * chore(restify): update tav to version 9.1.0 instead of 9.0.0 * chore: upgrade document and tav for restify * chore: pin restify version --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .github/workflows/test-all-versions.yml | 5 ----- .github/workflows/unit-test.yml | 4 ---- .../node/opentelemetry-instrumentation-restify/.tav.yml | 9 +++++++-- .../node/opentelemetry-instrumentation-restify/README.md | 2 +- .../opentelemetry-instrumentation-restify/package.json | 2 +- .../src/constants.ts | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 20f54df5c..9fefec314 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -19,11 +19,6 @@ jobs: fail-fast: false matrix: node: ["14", "16", "18"] - include: - - node: "18" - lerna-extra-args: >- - --ignore @opentelemetry/instrumentation-fastify - --ignore @opentelemetry/instrumentation-restify runs-on: ubuntu-latest services: mongo: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 4959b4d90..9ffee4b82 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -10,10 +10,6 @@ jobs: fail-fast: false matrix: node: ["14", "16", "18"] - include: - - node: "18" - lerna-extra-args: >- - --ignore @opentelemetry/instrumentation-restify runs-on: ubuntu-latest services: memcached: diff --git a/plugins/node/opentelemetry-instrumentation-restify/.tav.yml b/plugins/node/opentelemetry-instrumentation-restify/.tav.yml index 62556552f..a1ef4c915 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-restify/.tav.yml @@ -1,3 +1,8 @@ restify: - versions: "4.3.4 || 5.2.0 || 6.4.0 || 7.7.0 || ^8.4.0" - commands: npm run test + - versions: "^10.0.0 || ^11.1.0" + node: ">=18" + commands: npm run test + + - versions: "4.3.4 || 5.2.0 || 6.4.0 || 7.7.0 || ^8.4.0 || 9.1.0 || ^10.0.0 || ^11.1.0" + node: "<18" + commands: npm run test diff --git a/plugins/node/opentelemetry-instrumentation-restify/README.md b/plugins/node/opentelemetry-instrumentation-restify/README.md index 719a042ab..2e16ea749 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/README.md +++ b/plugins/node/opentelemetry-instrumentation-restify/README.md @@ -17,7 +17,7 @@ npm install --save @opentelemetry/instrumentation-restify ### Supported Versions -- `>=4.0.0 <9` +- `>=4.0.0 <12` ## Usage diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index d5d9046c4..064646126 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -56,7 +56,7 @@ "@types/semver": "^7.3.12", "mocha": "7.2.0", "nyc": "15.1.0", - "restify": "8.6.1", + "restify": "11.1.0", "rimraf": "5.0.0", "semver": "^7.3.7", "test-all-versions": "^5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts b/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts index 0ba23dccf..ebd38f91c 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts +++ b/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts @@ -24,4 +24,4 @@ export const RESTIFY_METHODS = [ 'patch', ]; export const MODULE_NAME = 'restify'; -export const SUPPORTED_VERSIONS = ['>=4.0.0 <9']; +export const SUPPORTED_VERSIONS = ['>=4.0.0 <12']; From b77c282e47fae811d7c2727875b25541e92d3a86 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 17 Jul 2023 11:08:42 +0200 Subject: [PATCH 58/94] chore(deps): update dependency @types/node to v18.16.19 (#1585) Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 2 +- detectors/node/opentelemetry-resource-detector-aws/package.json | 2 +- detectors/node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../node/opentelemetry-resource-detector-github/package.json | 2 +- .../node/opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 2 +- packages/opentelemetry-host-metrics/package.json | 2 +- packages/opentelemetry-id-generator-aws-xray/package.json | 2 +- packages/opentelemetry-propagation-utils/package.json | 2 +- packages/opentelemetry-redis-common/package.json | 2 +- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- packages/opentelemetry-sql-common/package.json | 2 +- packages/opentelemetry-test-utils/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-dataloader/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-lambda/package.json | 2 +- plugins/node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- plugins/node/opentelemetry-instrumentation-bunyan/package.json | 2 +- .../node/opentelemetry-instrumentation-cassandra/package.json | 2 +- plugins/node/opentelemetry-instrumentation-connect/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- plugins/node/opentelemetry-instrumentation-express/package.json | 2 +- plugins/node/opentelemetry-instrumentation-fastify/package.json | 2 +- .../opentelemetry-instrumentation-generic-pool/package.json | 2 +- plugins/node/opentelemetry-instrumentation-graphql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-hapi/package.json | 2 +- plugins/node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-knex/package.json | 2 +- plugins/node/opentelemetry-instrumentation-koa/package.json | 2 +- .../node/opentelemetry-instrumentation-memcached/package.json | 2 +- plugins/node/opentelemetry-instrumentation-mongodb/package.json | 2 +- plugins/node/opentelemetry-instrumentation-mysql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-mysql2/package.json | 2 +- .../node/opentelemetry-instrumentation-nestjs-core/package.json | 2 +- plugins/node/opentelemetry-instrumentation-net/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pg/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pino/package.json | 2 +- plugins/node/opentelemetry-instrumentation-redis-4/package.json | 2 +- plugins/node/opentelemetry-instrumentation-redis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-restify/package.json | 2 +- plugins/node/opentelemetry-instrumentation-router/package.json | 2 +- plugins/node/opentelemetry-instrumentation-winston/package.json | 2 +- .../opentelemetry-instrumentation-document-load/package.json | 2 +- .../web/opentelemetry-instrumentation-long-task/package.json | 2 +- .../opentelemetry-instrumentation-user-interaction/package.json | 2 +- plugins/web/opentelemetry-plugin-react-load/package.json | 2 +- propagators/opentelemetry-propagator-aws-xray/package.json | 2 +- .../opentelemetry-propagator-grpc-census-binary/package.json | 2 +- propagators/opentelemetry-propagator-instana/package.json | 2 +- propagators/opentelemetry-propagator-ot-trace/package.json | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 066173f25..c1de5ba6f 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nock": "13.3.1", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 5149eadfb..9f2ae523e 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -44,7 +44,7 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nock": "12.0.3", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index c216d6425..c6ce4b404 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -44,7 +44,7 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", "nock": "12.0.3", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 25c802d46..88721d1d9 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 4b0d85f23..bbdf279ae 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -43,7 +43,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-node": "^0.41.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", "nock": "12.0.3", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index e8cc26df9..7e9502eeb 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index e50748e1c..c6a236337 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -36,7 +36,7 @@ "@babel/core": "7.15.0", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index b3ae7cd86..6227213cb 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index 5848c7683..fc15bd07a 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 76f94f229..954e0f4c8 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "^9.1.1", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "^10.0.11", "expect": "29.2.0", "mocha": "7.2.0", diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json index 536aa3997..13dc0ef7a 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/opentelemetry-redis-common/package.json @@ -40,7 +40,7 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/redis-common#readme", "devDependencies": { "@types/mocha": "^9.1.1", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 95bb56ff5..c4d9d91cd 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -54,7 +54,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.6", "eslint": "8.7.0", "expect": "29.2.0", diff --git a/packages/opentelemetry-sql-common/package.json b/packages/opentelemetry-sql-common/package.json index 1bdb924de..666efaf3b 100644 --- a/packages/opentelemetry-sql-common/package.json +++ b/packages/opentelemetry-sql-common/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@opentelemetry/api": "^1.1.0", "@types/mocha": "^7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index c164fbcad..4d5fb5de3 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "typescript": "4.4.4" }, "dependencies": { diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 2ba05fb24..0a29b68f0 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -58,7 +58,7 @@ "@types/lodash": "4.14.178", "@types/mocha": "8.2.3", "@types/sinon": "10.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "amqplib": "0.8.0", "expect": "29.2.0", "lodash": "4.17.21", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 96f298eea..0f5e49a48 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "dataloader": "2.2.1", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index f9f976e93..4e34834a9 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -48,7 +48,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "^10.0.11", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index ff540408f..a42fba711 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -46,7 +46,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/lru-cache": "7.10.9", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "expect": "29.2.0", "lru-memoizer": "2.1.4", "mocha": "7.2.0", diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 0d4c3996e..a682c9442 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -49,7 +49,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "expect": "29.2.0", "mocha": "7.2.0", "mongoose": "6.5.2", diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index cea3369e2..0a4c0ec55 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -46,7 +46,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "expect": "27.4.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 1fe2216fe..57ce08963 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -52,7 +52,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 3a8c4ad01..10cdbd975 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@opentelemetry/sdk-metrics": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 7c1f02d22..ae47c9d52 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -63,7 +63,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.6", "aws-sdk": "2.1008.0", "eslint": "8.7.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index c6c0e5559..658dd7694 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "bunyan": "1.8.15", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index d65af8551..a253da11a 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/sinon": "10.0.2", "cassandra-driver": "4.6.3", diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 9334e1af6..b08c52945 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -49,7 +49,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "connect": "3.7.0", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index d6ee09bdf..0e8228626 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -50,7 +50,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", "@types/sinon": "10.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index bf3060098..ff0cd4e8e 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.9", "express": "4.17.3", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 8fcc571c7..3cbd335d9 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/express": "4.17.13", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "fastify": "4.18.0", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index dbc5629e8..f40e35352 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -50,7 +50,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "generic-pool": "3.8.2", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index bc92d8df5..0543a22c7 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.3.1", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "graphql": "^16.5.0", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index cf4c02956..0dd7e3c5a 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index f450a8702..1eb171e07 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -57,7 +57,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/sinon": "10.0.9", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "cross-env": "7.0.3", "ioredis": "5.2.2", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index f73a782cf..8a52ab28e 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -50,7 +50,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "knex": "0.95.9", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index fe1fa47d6..5b22e19f5 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -55,7 +55,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.9", "koa": "2.13.1", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 1bfbc6c0c..a0a6ba3b9 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "cross-env": "7.0.3", "memcached": "2.2.2", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 4816bcf78..d7d96439e 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -60,7 +60,7 @@ "@types/bson": "4.0.5", "@types/mocha": "7.0.2", "@types/mongodb": "3.6.20", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "mongodb": "3.6.11", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 3d5f1d583..8e7603fe4 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -52,7 +52,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.13", "mocha": "7.2.0", "mysql": "2.18.1", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index f9ddc658b..86154e119 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/mysql2": "github:types/mysql2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", "mysql2": "2.3.0", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 450f1a0d2..a7ba86589 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -58,7 +58,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "cross-env": "7.0.3", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 54084e5d0..95f5029bb 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 89f1af9d8..6a429213f 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -59,7 +59,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "cross-env": "7.0.3", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 37ba1edc1..7922eba5e 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/sinon": "10.0.2", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 42b35b2d5..b30692e4e 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -58,7 +58,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index f396c4214..a2317c426 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -58,7 +58,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 064646126..0dec9903b 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/restify": "4.3.8", "@types/semver": "^7.3.12", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 174b72b10..c3c675865 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -50,7 +50,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 21118eaaa..918675935 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 1f7b50bab..b3a968ef7 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -53,7 +53,7 @@ "@babel/core": "7.15.0", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 68819e966..52ea08076 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.6", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 291487f50..4cbf6a79a 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -54,7 +54,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.6", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/sinon": "10.0.2", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index d334aeecd..98c0ed07f 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -51,7 +51,7 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/react": "17.0.16", "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index 427ebe670..f2fc438a1 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index c3c5693f7..0a57f4232 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@types/mocha": "7.0.2", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "grpc": "1.24.11", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index 713430252..c230506a5 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -52,7 +52,7 @@ "@jsdevtools/coverage-istanbul-loader": "3.0.5", "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/webpack-env": "1.16.2", "assert": "2.0.0", "karma": "6.3.17", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index ab74a191a..9daf99935 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", - "@types/node": "18.11.7", + "@types/node": "18.16.19", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", From b5fc0c41c168b028f0578ea39d4c2bff6e01b9fa Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Mon, 17 Jul 2023 12:48:48 +0300 Subject: [PATCH 59/94] chore(deps): update dependency nock to v13.3.2 (#1592) * chore(deps): update dependency nock to v13.3.2 * chore: lint --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .../node/opentelemetry-resource-detector-aws/package.json | 2 +- .../package.json | 2 +- .../node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../opentelemetry-resource-detector-instana/package.json | 2 +- .../test/InstanaAgentDetectorUnitTest.test.ts | 8 +++++--- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- .../opentelemetry-instrumentation-aws-sdk/package.json | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 9f2ae523e..585bd9d51 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -47,7 +47,7 @@ "@types/node": "18.16.19", "@types/sinon": "10.0.2", "mocha": "7.2.0", - "nock": "12.0.3", + "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.0", "sinon": "15.0.1", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 01aeebcdc..64f8d2291 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -42,7 +42,7 @@ "@types/sinon": "10.0.2", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", - "nock": "12.0.3", + "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.0", "sinon": "15.0.1", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index c6ce4b404..86c3929f0 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -47,7 +47,7 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", - "nock": "12.0.3", + "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.0", "ts-mocha": "10.0.0", diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index bbdf279ae..f2dd1daa4 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -46,7 +46,7 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", - "nock": "12.0.3", + "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.0", "ts-mocha": "10.0.0", diff --git a/detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts b/detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts index 6799d9601..abe4ef5a5 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts +++ b/detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts @@ -65,7 +65,7 @@ describe('[UNIT] instanaAgentDetector', () => { }); it('should return agent resource with env variables', async () => { - process.env.INSTANA_AGENT_PORT = '88866'; + process.env.INSTANA_AGENT_PORT = '56001'; process.env.INSTANA_AGENT_HOST = 'instanaagent'; const mockedReply = { @@ -108,12 +108,14 @@ describe('[UNIT] instanaAgentDetector', () => { }); it('agent timeout', async () => { - process.env.INSTANA_AGENT_PORT = '878787'; + process.env.INSTANA_AGENT_PORT = '56002'; process.env.INSTANA_AGENT_HOST = 'instanaagent'; process.env.INSTANA_AGENT_TIMEOUT_MS = '200'; const expectedError = new Error('Instana Agent request timed out.'); - nock('http://instanaagent:878787') + nock( + `http://${process.env.INSTANA_AGENT_HOST}:${process.env.INSTANA_AGENT_PORT}` + ) .persist() .put('/com.instana.plugin.nodejs.discovery') .delay(500) diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index c4d9d91cd..18d1eb0aa 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -59,7 +59,7 @@ "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", - "nock": "13.2.1", + "nock": "13.3.2", "sinon": "15.0.1", "ts-mocha": "10.0.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index ae47c9d52..b3ed81732 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -69,7 +69,7 @@ "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", - "nock": "13.2.1", + "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.0", "sinon": "15.0.1", From 82267ab02f8d9b27613b5926089c42d04d4a4a7e Mon Sep 17 00:00:00 2001 From: Jaryk Date: Tue, 18 Jul 2023 17:51:53 +0200 Subject: [PATCH 60/94] feat(cucumber): add instrumentation for @cucumber/cucumber (#1252) * feat(cucumber): add instrumentation for @cucumber/cucumber * fix(cucumber): rename plugin directory * chore(cucumber): add to release-please-config * chore(cucumber): add Ugzuzg to component_owners * fix(cucumber): add @opentelemetry/semantic-conventions to dependencies * fix(cucumber): only instrument ^8 * fix(cucumber): use bound diag logger * fix(cucumber): add tags as string[] to attributes * fix(cucumber): extract attribute names into enum * fix(cucumber): recordException as string for step statuses * docs(auto-instrumentation-node): add cucumber instrumentation to readme * fix(cucumber): remove unnecessary isEnabled checks * fix(cucumber): get rid of @cucumber/cucumber imports in compiled files * fix(cucumber): remove newline character from span name * fix(cucumber): set step status as an attribute * chore(cucumber): update homepage path Co-authored-by: Amir Blum * fix(cucumber): get status enum from cucumber module * fix(cucumber): mention why isEnabled is needed * chore(cucumber): add package to release-please-manifset * feat: wrap runAttempt * fix: match versions in package.json and auto * feat: instrument cucumber@9 * fix: wrap typeof in parens --------- Co-authored-by: Amir Blum --- .github/component_owners.yml | 2 + .release-please-manifest.json | 2 +- .../auto-instrumentations-node/README.md | 1 + .../auto-instrumentations-node/package.json | 1 + .../auto-instrumentations-node/src/utils.ts | 2 + .../instrumentation-cucumber/.eslintignore | 1 + .../instrumentation-cucumber/.eslintrc.js | 7 + .../node/instrumentation-cucumber/.npmignore | 4 + .../node/instrumentation-cucumber/.tav.yml | 3 + plugins/node/instrumentation-cucumber/LICENSE | 201 +++++++ .../node/instrumentation-cucumber/README.md | 60 ++ .../instrumentation-cucumber/package.json | 73 +++ .../instrumentation-cucumber/src/index.ts | 18 + .../src/instrumentation.ts | 400 +++++++++++++ .../instrumentation-cucumber/src/types.ts | 30 + .../instrumentation-cucumber/test/.gitignore | 1 + .../test/cucumber.test.ts | 559 ++++++++++++++++++ .../test/features/step_definitions/steps.ts | 31 + .../test/features/support/world.ts | 34 ++ .../instrumentation-cucumber/tsconfig.json | 9 + release-please-config.json | 1 + 21 files changed, 1439 insertions(+), 1 deletion(-) create mode 100644 plugins/node/instrumentation-cucumber/.eslintignore create mode 100644 plugins/node/instrumentation-cucumber/.eslintrc.js create mode 100644 plugins/node/instrumentation-cucumber/.npmignore create mode 100644 plugins/node/instrumentation-cucumber/.tav.yml create mode 100644 plugins/node/instrumentation-cucumber/LICENSE create mode 100644 plugins/node/instrumentation-cucumber/README.md create mode 100644 plugins/node/instrumentation-cucumber/package.json create mode 100644 plugins/node/instrumentation-cucumber/src/index.ts create mode 100644 plugins/node/instrumentation-cucumber/src/instrumentation.ts create mode 100644 plugins/node/instrumentation-cucumber/src/types.ts create mode 100644 plugins/node/instrumentation-cucumber/test/.gitignore create mode 100644 plugins/node/instrumentation-cucumber/test/cucumber.test.ts create mode 100644 plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts create mode 100644 plugins/node/instrumentation-cucumber/test/features/support/world.ts create mode 100644 plugins/node/instrumentation-cucumber/tsconfig.json diff --git a/.github/component_owners.yml b/.github/component_owners.yml index f04e7f200..a3ad46b40 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -38,6 +38,8 @@ components: - blumamir plugins/node/instrumentation-amqplib: - blumamir + plugins/node/instrumentation-cucumber: + - Ugzuzg plugins/node/instrumentation-dataloader: - henrinormak plugins/node/instrumentation-fs: diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d70e6b815..b56847c2f 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-cucumber":"0.0.1","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"} diff --git a/metapackages/auto-instrumentations-node/README.md b/metapackages/auto-instrumentations-node/README.md index 0795f15b7..cc45a14db 100644 --- a/metapackages/auto-instrumentations-node/README.md +++ b/metapackages/auto-instrumentations-node/README.md @@ -140,6 +140,7 @@ registerInstrumentations({ - [@opentelemetry/instrumentation-bunyan](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan) - [@opentelemetry/instrumentation-cassandra-driver](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra) - [@opentelemetry/instrumentation-connect](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect) +- [@opentelemetry/instrumentation-cucumber](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber) - [@opentelemetry/instrumentation-dataloader](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader) - [@opentelemetry/instrumentation-dns](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns) - [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express) diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 7e9502eeb..3902c6ee3 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -56,6 +56,7 @@ "@opentelemetry/instrumentation-bunyan": "^0.32.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.33.0", "@opentelemetry/instrumentation-connect": "^0.32.0", + "@opentelemetry/instrumentation-cucumber": "^0.0.1", "@opentelemetry/instrumentation-dataloader": "^0.5.0", "@opentelemetry/instrumentation-dns": "^0.32.0", "@opentelemetry/instrumentation-express": "^0.33.0", diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts index 0c194f7a3..ce9f6c896 100644 --- a/metapackages/auto-instrumentations-node/src/utils.ts +++ b/metapackages/auto-instrumentations-node/src/utils.ts @@ -23,6 +23,7 @@ import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk'; import { BunyanInstrumentation } from '@opentelemetry/instrumentation-bunyan'; import { CassandraDriverInstrumentation } from '@opentelemetry/instrumentation-cassandra-driver'; import { ConnectInstrumentation } from '@opentelemetry/instrumentation-connect'; +import { CucumberInstrumentation } from '@opentelemetry/instrumentation-cucumber'; import { DataloaderInstrumentation } from '@opentelemetry/instrumentation-dataloader'; import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns'; import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'; @@ -90,6 +91,7 @@ const InstrumentationMap = { '@opentelemetry/instrumentation-cassandra-driver': CassandraDriverInstrumentation, '@opentelemetry/instrumentation-connect': ConnectInstrumentation, + '@opentelemetry/instrumentation-cucumber': CucumberInstrumentation, '@opentelemetry/instrumentation-dataloader': DataloaderInstrumentation, '@opentelemetry/instrumentation-dns': DnsInstrumentation, '@opentelemetry/instrumentation-express': ExpressInstrumentation, diff --git a/plugins/node/instrumentation-cucumber/.eslintignore b/plugins/node/instrumentation-cucumber/.eslintignore new file mode 100644 index 000000000..378eac25d --- /dev/null +++ b/plugins/node/instrumentation-cucumber/.eslintignore @@ -0,0 +1 @@ +build diff --git a/plugins/node/instrumentation-cucumber/.eslintrc.js b/plugins/node/instrumentation-cucumber/.eslintrc.js new file mode 100644 index 000000000..f756f4488 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-cucumber/.npmignore b/plugins/node/instrumentation-cucumber/.npmignore new file mode 100644 index 000000000..9505ba945 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/.npmignore @@ -0,0 +1,4 @@ +/bin +/coverage +/doc +/test diff --git a/plugins/node/instrumentation-cucumber/.tav.yml b/plugins/node/instrumentation-cucumber/.tav.yml new file mode 100644 index 000000000..c1930c8cb --- /dev/null +++ b/plugins/node/instrumentation-cucumber/.tav.yml @@ -0,0 +1,3 @@ +'@cucumber/cucumber': + versions: '^8.0.0 || ^9.0.0' + commands: npm test diff --git a/plugins/node/instrumentation-cucumber/LICENSE b/plugins/node/instrumentation-cucumber/LICENSE new file mode 100644 index 000000000..e50e8c80f --- /dev/null +++ b/plugins/node/instrumentation-cucumber/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 [2022] 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 + + 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/plugins/node/instrumentation-cucumber/README.md b/plugins/node/instrumentation-cucumber/README.md new file mode 100644 index 000000000..c3fd43435 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/README.md @@ -0,0 +1,60 @@ +# OpenTelemetry Cucumber Instrumentation for Node.js + +[![NPM Published Version][npm-img]][npm-url] +[![Apache License][license-image]][license-image] + +This module provides automatic instrumentation for the [`@cucumber/cucumber`](https://www.npmjs.com/package/@cucumber/cucumber) module, which may be loaded using the [`@opentelemetry/sdk-trace-node`](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node) package and is included in the [`@opentelemetry/auto-instrumentations-node`](https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-node) bundle. + +If total installation size is not constrained, it is recommended to use the [`@opentelemetry/auto-instrumentations-node`](https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-node) bundle with [@opentelemetry/sdk-node](`https://www.npmjs.com/package/@opentelemetry/sdk-node`) for the most seamless instrumentation experience. + +Compatible with OpenTelemetry JS API and SDK `1.0+`. + +## Installation + +```bash +npm install --save @opentelemetry/instrumentation-cucumber +``` + +## Usage + +```js +const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node'); +const { + CucumberInstrumentation, +} = require('@opentelemetry/instrumentation-cucumber'); +const { registerInstrumentations } = require('@opentelemetry/instrumentation'); + +const provider = new NodeTracerProvider(); +provider.register(); + +registerInstrumentations({ + instrumentations: [ + new CucucmberInstrumentation({ + // see below for available configuration + }), + ], +}); +``` + +### Cucumber Instrumentation Options + +Cucumber instrumentation has currently no options. + +| Options | Type | Description | +| ------- | ---- | ----------- | + +## Useful links + +- For more information on OpenTelemetry, visit: +- For more about OpenTelemetry JavaScript: +- For help or feedback on this project, join us in [GitHub Discussions][discussions-url] + +## License + +Apache 2.0 - See [LICENSE][license-url] for more information. + +[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions +[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE +[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat +[npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-cucumber +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-cucumber.svg diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json new file mode 100644 index 000000000..01015203c --- /dev/null +++ b/plugins/node/instrumentation-cucumber/package.json @@ -0,0 +1,73 @@ +{ + "name": "@opentelemetry/instrumentation-cucumber", + "version": "0.0.1", + "description": "OpenTelemetry cucumber automatic instrumentation package.", + "main": "build/src/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "test-all-versions": "tav", + "tdd": "npm run test -- --watch-extensions ts --watch", + "clean": "rimraf build/*", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cucumber --include-dependencies", + "prewatch": "npm run precompile", + "prepare": "npm run compile", + "version:update": "node ../../../scripts/version-update.js", + "compile": "tsc -p ." + }, + "keywords": [ + "cucumber", + "instrumentation", + "nodejs", + "opentelemetry", + "profiling", + "tracing" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + }, + "devDependencies": { + "@cucumber/cucumber": "^8.8.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/core": "^1.3.1", + "@opentelemetry/sdk-trace-base": "^1.3.1", + "@opentelemetry/sdk-trace-node": "^1.3.1", + "@types/mocha": "7.0.2", + "@types/semver": "7.3.8", + "@types/shimmer": "1.0.2", + "@types/sinon": "10.0.2", + "gts": "3.1.0", + "mocha": "7.2.0", + "nyc": "15.1.0", + "rimraf": "3.0.2", + "semver": "^7.3.2", + "sinon": "14.0.0", + "test-all-versions": "5.0.1", + "ts-mocha": "10.0.0", + "typescript": "4.3.5" + }, + "dependencies": { + "@opentelemetry/instrumentation": "^0.36.0", + "@opentelemetry/semantic-conventions": "^1.0.0" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme" +} diff --git a/plugins/node/instrumentation-cucumber/src/index.ts b/plugins/node/instrumentation-cucumber/src/index.ts new file mode 100644 index 000000000..c26f998cf --- /dev/null +++ b/plugins/node/instrumentation-cucumber/src/index.ts @@ -0,0 +1,18 @@ +/* + * 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. + */ + +export * from './instrumentation'; +export * from './types'; diff --git a/plugins/node/instrumentation-cucumber/src/instrumentation.ts b/plugins/node/instrumentation-cucumber/src/instrumentation.ts new file mode 100644 index 000000000..cf759ddaa --- /dev/null +++ b/plugins/node/instrumentation-cucumber/src/instrumentation.ts @@ -0,0 +1,400 @@ +/* + * 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 { Span, SpanKind, SpanStatusCode } from '@opentelemetry/api'; +import { + InstrumentationBase, + InstrumentationNodeModuleDefinition, + InstrumentationNodeModuleFile, + isWrapped, +} from '@opentelemetry/instrumentation'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; + +import type * as cucumber from '@cucumber/cucumber'; +import type * as messages from '@cucumber/messages'; +import type TestCaseRunner from '@cucumber/cucumber/lib/runtime/test_case_runner'; +import type { + DefineStepPattern, + IDefineStepOptions, + IDefineTestRunHookOptions, +} from '@cucumber/cucumber/lib/support_code_library_builder/types'; + +import { AttributeNames, CucumberInstrumentationConfig } from './types'; +import { VERSION } from './version'; + +const hooks = ['Before', 'BeforeStep', 'AfterStep', 'After'] as const; +const steps = ['Given', 'When', 'Then'] as const; +type Cucumber = typeof cucumber; +type Hook = (typeof hooks)[number]; +type Step = (typeof steps)[number]; + +export class CucumberInstrumentation extends InstrumentationBase { + private module: Cucumber | undefined; + + constructor(config: CucumberInstrumentationConfig = {}) { + super('@opentelemetry/instrumentation-cucumber', VERSION, config); + } + + init(): InstrumentationNodeModuleDefinition[] { + return [ + new InstrumentationNodeModuleDefinition( + '@cucumber/cucumber', + ['^8.0.0', '^9.0.0'], + (moduleExports, moduleVersion) => { + this._diag.debug( + `Applying patch for @cucumber/cucumber@${moduleVersion}` + ); + this.module = moduleExports; + steps.forEach(step => { + if (isWrapped(moduleExports[step])) { + this._unwrap(moduleExports, step); + } + this._wrap(moduleExports, step, this._getStepPatch(step)); + }); + hooks.forEach(hook => { + if (isWrapped(moduleExports[hook])) { + this._unwrap(moduleExports, hook); + } + this._wrap(moduleExports, hook, this._getHookPatch(hook)); + }); + return moduleExports; + }, + (moduleExports, moduleVersion) => { + if (moduleExports === undefined) return; + this._diag.debug( + `Removing patch for @cucumber/cucumber@${moduleVersion}` + ); + [...hooks, ...steps].forEach(method => { + this._unwrap(moduleExports, method); + }); + }, + [ + new InstrumentationNodeModuleFile<{ + default: { new (): TestCaseRunner; prototype: TestCaseRunner }; + }>( + '@cucumber/cucumber/lib/runtime/test_case_runner.js', + ['^8.0.0', '^9.0.0'], + (moduleExports, moduleVersion) => { + this._diag.debug( + `Applying patch for @cucumber/cucumber/lib/runtime/test_case_runner.js@${moduleVersion}` + ); + if (isWrapped(moduleExports.default.prototype.run)) { + this._unwrap(moduleExports.default.prototype, 'run'); + this._unwrap(moduleExports.default.prototype, 'runStep'); + if ('runAttempt' in moduleExports.default.prototype) { + this._unwrap(moduleExports.default.prototype, 'runAttempt'); + } + } + this._wrap( + moduleExports.default.prototype, + 'run', + this._getTestCaseRunPatch() + ); + this._wrap( + moduleExports.default.prototype, + 'runStep', + this._getTestCaseRunStepPatch() + ); + if ('runAttempt' in moduleExports.default.prototype) { + this._wrap( + moduleExports.default.prototype, + 'runAttempt', + this._getTestCaseRunAttemptPatch() + ); + } + return moduleExports; + }, + (moduleExports, moduleVersion) => { + if (moduleExports === undefined) return; + this._diag.debug( + `Removing patch for @cucumber/cucumber/lib/runtime/test_case_runner.js@${moduleVersion}` + ); + this._unwrap(moduleExports.default.prototype, 'run'); + this._unwrap(moduleExports.default.prototype, 'runStep'); + if ('runAttempt' in moduleExports.default.prototype) { + this._unwrap(moduleExports.default.prototype, 'runAttempt'); + } + } + ), + ] + ), + ]; + } + + private static mapTags(tags: readonly messages.Tag[]): string[] { + return tags.map(tag => tag.name); + } + + private static setSpanToError(span: Span, error: any) { + span.recordException(error); + span.setStatus({ + code: SpanStatusCode.ERROR, + message: error?.message ?? error, + }); + } + + private setSpanToStepStatus( + span: Span, + status: messages.TestStepResultStatus, + context?: string + ) { + // if the telemetry is enabled, the module should be defined + if (!this.module) return; + + span.setAttribute(AttributeNames.STEP_STATUS, status); + if ( + [ + this.module.Status.UNDEFINED, + this.module.Status.AMBIGUOUS, + this.module.Status.FAILED, + ].includes(status) + ) { + span.recordException(status); + span.setStatus({ + code: SpanStatusCode.ERROR, + message: context || status, + }); + } + } + + private _getTestCaseRunPatch() { + const instrumentation = this; + return function (original: TestCaseRunner['run']): TestCaseRunner['run'] { + return async function (this: TestCaseRunner, ...args) { + const gherkinDocument = this[ + 'gherkinDocument' + ] as Required; + const { feature } = gherkinDocument; + const pickle = this['pickle'] as messages.Pickle; + const scenario = feature.children.find( + node => node?.scenario?.id === pickle.astNodeIds[0] + )?.scenario as messages.Scenario; + + return instrumentation.tracer.startActiveSpan( + `Feature: ${feature.name}. Scenario: ${pickle.name}`, + { + kind: SpanKind.CLIENT, + attributes: { + [SemanticAttributes.CODE_FILEPATH]: gherkinDocument.uri, + [SemanticAttributes.CODE_LINENO]: scenario.location.line, + [SemanticAttributes.CODE_FUNCTION]: scenario.name, + [SemanticAttributes.CODE_NAMESPACE]: feature.name, + [AttributeNames.FEATURE_TAGS]: CucumberInstrumentation.mapTags( + feature.tags + ), + [AttributeNames.FEATURE_LANGUAGE]: feature.language, + [AttributeNames.FEATURE_DESCRIPTION]: feature.description, + [AttributeNames.SCENARIO_TAGS]: CucumberInstrumentation.mapTags( + scenario.tags + ), + [AttributeNames.SCENARIO_DESCRIPTION]: scenario.description, + }, + }, + async span => { + try { + const status = await original.apply(this, args); + instrumentation.setSpanToStepStatus(span, status); + return status; + } catch (error: any) { + CucumberInstrumentation.setSpanToError(span, error); + throw error; + } finally { + span.end(); + } + } + ); + }; + }; + } + + private _getTestCaseRunStepPatch() { + const instrumentation = this; + return function ( + original: TestCaseRunner['runStep'] + ): TestCaseRunner['runStep'] { + return async function ( + this: TestCaseRunner, + ...args + ): Promise { + const [pickleStep] = args; + return instrumentation.tracer.startActiveSpan( + pickleStep.text, + { + kind: SpanKind.CLIENT, + attributes: { + [AttributeNames.STEP_TYPE]: pickleStep.type, + }, + }, + async span => { + try { + const result = await original.apply(this, args); + instrumentation.setSpanToStepStatus( + span, + result.status, + result.message + ); + return result; + } catch (error) { + CucumberInstrumentation.setSpanToError(span, error); + throw error; + } finally { + span.end(); + } + } + ); + }; + }; + } + + private _getTestCaseRunAttemptPatch() { + const instrumentation = this; + return function ( + original: TestCaseRunner['runAttempt'] + ): TestCaseRunner['runAttempt'] { + return async function (this: TestCaseRunner, ...args): Promise { + const [attempt] = args; + return instrumentation.tracer.startActiveSpan( + `Attempt #${attempt}`, + { + kind: SpanKind.CLIENT, + attributes: {}, + }, + async span => { + try { + const result = await original.apply(this, args); + const worstResult = this.getWorstStepResult(); + instrumentation.setSpanToStepStatus( + span, + worstResult.status, + worstResult.message + ); + return result; + } catch (error) { + CucumberInstrumentation.setSpanToError(span, error); + throw error; + } finally { + span.end(); + } + } + ); + }; + }; + } + + private _getHookPatch(name: H) { + const instrumentation = this; + return function (original: Cucumber[H]): Cucumber[H] { + return function ( + this: {}, + tagsOrOptions: string | IDefineTestRunHookOptions | Function, + code?: Function + ) { + if (typeof tagsOrOptions === 'function') { + code = tagsOrOptions; + tagsOrOptions = {}; + } + + function traceableCode( + this: cucumber.IWorld, + arg: cucumber.ITestCaseHookParameter + ) { + // because we're wrapping the function that was passed to the hook, + // it will stay wrapped in cucumber's internal state + // even if we disable the instrumentation + if (!instrumentation.isEnabled()) return code?.call(this, arg); + + return instrumentation.tracer.startActiveSpan( + name, + { + kind: SpanKind.CLIENT, + }, + async span => { + try { + return await code?.call(this, arg); + } catch (error: any) { + this.attach?.(JSON.stringify(span.spanContext())); + CucumberInstrumentation.setSpanToError(span, error); + throw error; + } finally { + span.end(); + } + } + ); + } + return original.call(this, tagsOrOptions as any, traceableCode as any); + }; + }; + } + + private _getStepPatch(name: S) { + const instrumentation = this; + return function (original: Cucumber[S]): Cucumber[S] { + return function ( + this: {}, + pattern: DefineStepPattern, + options: IDefineStepOptions | Function, + code?: Function + ): void { + if (typeof options === 'function') { + code = options; + options = {}; + } + + function traceableCode(this: cucumber.IWorld, ...args: any[]) { + // because we're wrapping the function that was passed to the hook, + // it will stay wrapped in cucumber's internal state + // even if we disable the instrumentation + if (!instrumentation.isEnabled()) return code?.apply(this, args); + + return instrumentation.tracer.startActiveSpan( + `${name}(${pattern.toString()})`, + { + kind: SpanKind.CLIENT, + // ignore the last argument because it's a callback + attributes: args.slice(0, -1).reduce( + (attrs, arg, index) => ({ + ...attrs, + [`${AttributeNames.STEP_ARGS}[${index}]`]: + arg?.raw instanceof Function + ? JSON.stringify(arg.raw()) + : arg, + }), + {} + ), + }, + async span => { + try { + return await code?.apply(this, args); + } catch (error: any) { + this.attach?.(JSON.stringify(span.spanContext())); + CucumberInstrumentation.setSpanToError(span, error); + throw error; + } finally { + span.end(); + } + } + ); + } + // cucumber asks for the number of arguments to match the specified pattern + // copy the value from the original function + Object.defineProperty(traceableCode, 'length', { + value: code?.length, + }); + return original.call(this, pattern, options, traceableCode as any); + }; + }; + } +} diff --git a/plugins/node/instrumentation-cucumber/src/types.ts b/plugins/node/instrumentation-cucumber/src/types.ts new file mode 100644 index 000000000..3cd7e5674 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/src/types.ts @@ -0,0 +1,30 @@ +/* + * 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 { InstrumentationConfig } from '@opentelemetry/instrumentation'; + +export type CucumberInstrumentationConfig = InstrumentationConfig; + +export enum AttributeNames { + FEATURE_TAGS = 'cucumber.feature.tags', + FEATURE_LANGUAGE = 'cucumber.feature.language', + FEATURE_DESCRIPTION = 'cucumber.feature.description', + SCENARIO_TAGS = 'cucumber.scenario.tags', + SCENARIO_DESCRIPTION = 'cucumber.scenario.description', + STEP_TYPE = 'cucumber.step.type', + STEP_STATUS = 'cucumber.step.status', + STEP_ARGS = 'cucumber.step.args', +} diff --git a/plugins/node/instrumentation-cucumber/test/.gitignore b/plugins/node/instrumentation-cucumber/test/.gitignore new file mode 100644 index 000000000..f9e3307dd --- /dev/null +++ b/plugins/node/instrumentation-cucumber/test/.gitignore @@ -0,0 +1 @@ +*.feature diff --git a/plugins/node/instrumentation-cucumber/test/cucumber.test.ts b/plugins/node/instrumentation-cucumber/test/cucumber.test.ts new file mode 100644 index 000000000..182038085 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/test/cucumber.test.ts @@ -0,0 +1,559 @@ +/* + * 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 { context, SpanStatusCode } from '@opentelemetry/api'; +import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; +import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; +import { + InMemorySpanExporter, + SimpleSpanProcessor, +} from '@opentelemetry/sdk-trace-base'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { Resource } from '@opentelemetry/resources'; +import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; + +import * as path from 'path'; +import * as assert from 'assert'; +import * as fs from 'fs'; +import * as semver from 'semver'; + +import { CucumberInstrumentation, AttributeNames } from '../src'; + +const LIB_VERSION = require('@cucumber/cucumber/package.json').version; +const hasRunAttempt = semver.gte(LIB_VERSION, '8.8.0'); + +const instrumentation = new CucumberInstrumentation(); +instrumentation.enable(); +instrumentation.disable(); + +import { + IConfiguration, + loadConfiguration, + loadSupport, + runCucumber, +} from '@cucumber/cucumber/api'; +import { PassThrough } from 'stream'; + +describe('CucumberInstrumentation', () => { + const provider = new NodeTracerProvider({ + resource: new Resource({ + [SemanticResourceAttributes.SERVICE_NAME]: 'CucumberInstrumentation', + }), + }); + const memoryExporter = new InMemorySpanExporter(); + const spanProcessor = new SimpleSpanProcessor(memoryExporter); + provider.addSpanProcessor(spanProcessor); + const contextManager = new AsyncHooksContextManager().enable(); + + before(() => { + instrumentation.setTracerProvider(provider); + context.setGlobalContextManager(contextManager); + instrumentation.enable(); + }); + + afterEach(() => { + contextManager.disable(); + contextManager.enable(); + memoryExporter.reset(); + }); + + after(async () => { + await provider.shutdown(); + }); + + const init = async ( + feature: string, + providedConfiguration?: Partial + ) => { + // clean-up require cache to re-register cucumber hooks for a new run + ['features/support/world', 'features/step_definitions/steps'].forEach( + search => { + const key = Object.keys(require.cache).find(key => + key.includes(search) + ); + if (key == null) return; + delete require.cache[key]; + } + ); + const featurePath = path.join(__dirname, 'current.feature'); + await fs.promises.writeFile(featurePath, feature, 'utf-8'); + const { runConfiguration } = await loadConfiguration({ + provided: { + ...providedConfiguration, + paths: [featurePath], + require: [ + path.join(__dirname, 'features/support/world.ts'), + path.join(__dirname, 'features/step_definitions/steps.ts'), + ], + }, + }); + const support = await loadSupport(runConfiguration); + const merged = { ...runConfiguration, support }; + await runCucumber(merged, { + // mute cucumber's output + stderr: new PassThrough(), + stdout: new PassThrough(), + }); + }; + + describe('enabled instrumentation', () => { + describe('basic.feature', () => { + beforeEach(async () => { + await init(` + @feature-tag + Feature: Basic + A very basic feature file with a single scenario + + @scenario-tag @tag + Scenario: Button pushing + Mostly pushing buttons + but also tables + When I push the button + Then it is pushed to "limit" + And does something with the table + | Cucumber | Cucumis sativus | + | Burr Gherkin | Cucumis anguria | + `); + }); + + it('generates spans for cucumber execution', () => { + const spans = memoryExporter.getFinishedSpans(); + // should have Feature span + const parent = spans.find(span => span.name.startsWith('Feature')); + assert(parent, 'Expected a parent span'); + + assert.deepEqual( + spans.map(span => span.name), + [ + 'Before', + 'BeforeStep', + 'When(/I push the button/)', + 'AfterStep', + 'I push the button', + 'BeforeStep', + 'Then(it is pushed to {string})', + 'AfterStep', + 'it is pushed to "limit"', + 'BeforeStep', + 'Then(does something with the table)', + 'AfterStep', + 'does something with the table', + 'After', + hasRunAttempt && 'Attempt #0', + 'Feature: Basic. Scenario: Button pushing', + ].filter(Boolean), + 'Expected all hooks to be patched' + ); + }); + + it('adds scenario attributes to parent span', () => { + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.startsWith('Feature')); + assert(parent, 'Expected a parent span'); + + assert.deepEqual(parent.attributes, { + [SemanticAttributes.CODE_FILEPATH]: 'test/current.feature', + [SemanticAttributes.CODE_LINENO]: 7, + [SemanticAttributes.CODE_FUNCTION]: 'Button pushing', + [SemanticAttributes.CODE_NAMESPACE]: 'Basic', + [AttributeNames.FEATURE_DESCRIPTION]: + ' A very basic feature file with a single scenario', + [AttributeNames.FEATURE_LANGUAGE]: 'en', + [AttributeNames.FEATURE_TAGS]: ['@feature-tag'], + [AttributeNames.SCENARIO_DESCRIPTION]: + ' Mostly pushing buttons\n but also tables', + [AttributeNames.SCENARIO_TAGS]: ['@scenario-tag', '@tag'], + [AttributeNames.STEP_STATUS]: 'PASSED', + }); + }); + + it('adds step args to span attributes', () => { + const spans = memoryExporter.getFinishedSpans(); + const parametrisedSpan = spans.find(span => + span.name.startsWith('Then(it is pushed') + ); + assert(parametrisedSpan); + + assert.deepEqual(parametrisedSpan.attributes, { + [`${AttributeNames.STEP_ARGS}[0]`]: 'limit', + }); + }); + + it('adds step table to span attributes', () => { + const spans = memoryExporter.getFinishedSpans(); + const tableSpan = spans.find(span => + span.name.startsWith('Then(does something') + ); + assert(tableSpan); + + assert.deepEqual(tableSpan.attributes, { + [`${AttributeNames.STEP_ARGS}[0]`]: JSON.stringify([ + ['Cucumber', 'Cucumis sativus'], + ['Burr Gherkin', 'Cucumis anguria'], + ]), + }); + }); + }); + + describe('examples.feature', () => { + beforeEach(async () => { + await init(` + Feature: Examples + + Scenario: button pushing + Given a step + When I push the button + Then it is pushed to "limit" + And does something with the table + | Cucumber | Cucumis sativus | + | Burr Gherkin | Cucumis anguria | + + Examples: + | type | + | passing | + | failing | + `); + }); + + it('has a scenario for every example', () => { + const spans = memoryExporter.getFinishedSpans(); + const scenarios = spans.filter(span => span.name.startsWith('Feature')); + assert.equal(scenarios.length, 2); + + assert.deepEqual( + scenarios.map(span => span.name), + [ + 'Feature: Examples. Scenario: passing button pushing', + 'Feature: Examples. Scenario: failing button pushing', + ] + ); + }); + + it('sets a span of a failing step to error', () => { + const spans = memoryExporter.getFinishedSpans(); + const span = spans.find(span => span.name === 'Given(a failing step)'); + assert(span); + + assert.equal(span.status.code, SpanStatusCode.ERROR); + }); + }); + + if (hasRunAttempt) { + describe('attempts.feature', () => { + beforeEach(async () => { + await init( + ` + Feature: Attempts + + Scenario: fail button pushing + Given a failing step + When I push the button + `, + { retry: 2 } + ); + }); + + it('generates spans for each attempt', () => { + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + + const attemptSpans = spans.filter(span => + span.name.startsWith('Attempt') + ); + assert.equal(attemptSpans.length, 3); + + assert.deepEqual( + attemptSpans.map(span => span.parentSpanId), + Array(3).fill(parent.spanContext().spanId) + ); + }); + + it('creates scanario spans as children of attempts', () => { + const spans = memoryExporter.getFinishedSpans(); + const attemptSpans = spans.filter(span => + span.name.startsWith('Attempt') + ); + assert.equal(attemptSpans.length, 3); + + attemptSpans.forEach(attempt => { + assert.equal( + spans.filter( + span => span.parentSpanId === attempt.spanContext().spanId + ).length, + 4 + ); + }); + }); + }); + } + + describe('doc-string.feature', () => { + beforeEach(async () => { + await init(` + Feature: a feature + Scenario: a scenario + Given a doc string step + """ + The cucumber (Cucumis sativus) is a widely cultivated plant in the gourd family Cucurbitaceae. + """ + When I push the button + `); + }); + + it('adds doc strings as arg to span attributes', () => { + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + + const span = spans.find(span => span.name.startsWith('Given(a doc')); + assert(span); + assert.deepEqual(span.attributes, { + [`${AttributeNames.STEP_ARGS}[0]`]: + 'The cucumber (Cucumis sativus) is a widely cultivated plant in the gourd family Cucurbitaceae.', + }); + }); + }); + + describe('background.feature', () => { + beforeEach(async () => { + await init(` + Feature: a feature + Background: + Given a doc string step + """ + This is a background + """ + + Scenario: a scenario + When I push the button + `); + }); + + it('adds spans for background steps', () => { + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + + const span = spans.find(span => span.name.startsWith('Given(a doc')); + assert(span); + assert.deepEqual(span.attributes, { + [`${AttributeNames.STEP_ARGS}[0]`]: 'This is a background', + }); + }); + }); + + describe('hook-failures.feature', () => { + ['Before', 'BeforeStep', 'After', 'AfterStep'].forEach(hook => { + it(`sets ${hook} hook to error`, async () => { + await init(` + Feature: Hook failure spans + + Scenario: Fails ${hook} Hook + When I push the button + `); + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => + span.name.includes(`Fails ${hook}`) + ); + assert(parent); + assert.equal(parent.status.code, SpanStatusCode.ERROR); + assert.equal(parent.status.message, 'FAILED'); + assert.equal(parent.attributes[AttributeNames.STEP_STATUS], 'FAILED'); + + const span = spans.find( + span => + span.spanContext().traceId === parent.spanContext().traceId && + span.name === hook + ); + assert(span); + + assert.equal(span.status.code, SpanStatusCode.ERROR); + }); + }); + }); + + describe('undefined.feature', () => { + beforeEach(async () => { + await init(` + Feature: Undefined steps + + Scenario: + When an undefined step is encountered + Then does nothing + `); + }); + + it('sets undefined steps to error', () => { + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + assert.equal(parent.status.code, SpanStatusCode.ERROR); + assert.equal(parent.status.message, 'UNDEFINED'); + assert.equal( + parent.attributes[AttributeNames.STEP_STATUS], + 'UNDEFINED' + ); + + const span = spans.find(span => span.name.startsWith('an undefined')); + assert(span); + assert.equal(span.status.code, SpanStatusCode.ERROR); + assert.equal(span.status.message, 'UNDEFINED'); + assert.equal(span.attributes[AttributeNames.STEP_STATUS], 'UNDEFINED'); + + const skippedSpan = spans.find(span => span.name === 'does nothing'); + assert(skippedSpan); + assert.equal( + skippedSpan.attributes[AttributeNames.STEP_STATUS], + 'SKIPPED' + ); + }); + }); + + describe('ambiguous.feature', () => { + beforeEach(async () => { + await init(` + Feature: Ambiguous step + + Scenario: + When an ambiguous step is encountered + `); + }); + + it('sets ambiguous steps to error', () => { + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + assert.equal(parent.status.code, SpanStatusCode.ERROR); + assert.equal(parent.status.message, 'AMBIGUOUS'); + assert.equal( + parent.attributes[AttributeNames.STEP_STATUS], + 'AMBIGUOUS' + ); + + const span = spans.find(span => span.name.startsWith('an ambiguous')); + assert(span); + + assert.equal(span.status.code, SpanStatusCode.ERROR); + assert.equal( + span.status.message?.split('\n')[0], + 'Multiple step definitions match:' + ); + }); + }); + + describe('skipped.feature', () => { + it('adds skipped event to skipped steps', async () => { + await init(` + Feature: Skipping a step + + Scenario: + Given a skipped step + Then it is pushed to "limit" + `); + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + assert.equal(parent.attributes[AttributeNames.STEP_STATUS], 'SKIPPED'); + + const span = spans.find(span => span.name.startsWith('a skipped step')); + assert(span); + assert.equal(span.attributes[AttributeNames.STEP_STATUS], 'SKIPPED'); + }); + + it('adds skipped event to skipped steps in before hook', async () => { + await init(` + Feature: Skipping a step + + @skip + Scenario: + When I push the button + `); + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find( + span => + span.name.includes('Feature') && + ( + span.attributes[AttributeNames.SCENARIO_TAGS] as string[] + )?.includes?.('@skip') + ); + assert(parent); + assert.equal(parent.attributes[AttributeNames.STEP_STATUS], 'SKIPPED'); + }); + }); + + describe('pending.feature', () => { + it('adds pending event to pending steps', async () => { + await init(` + Feature: pending + + Scenario: pending scenario + Given a pending step + When I push the button + `); + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + assert.equal(parent.attributes[AttributeNames.STEP_STATUS], 'PENDING'); + + const span = spans.find(span => span.name.startsWith('a pending step')); + assert(span); + assert.equal(span.attributes[AttributeNames.STEP_STATUS], 'PENDING'); + }); + + it('adds pending event to pending steps in before hook', async () => { + await init(` + Feature: pending + + @pending + Scenario: pending scenario + When I push the button + `); + const spans = memoryExporter.getFinishedSpans(); + const parent = spans.find(span => span.name.includes('Feature')); + assert(parent); + assert.equal(parent.attributes[AttributeNames.STEP_STATUS], 'PENDING'); + + const span = spans.find(span => + span.name.startsWith('I push the button') + ); + assert(span); + assert.equal(span.attributes[AttributeNames.STEP_STATUS], 'SKIPPED'); + }); + }); + }); + + describe('disabled instrumentation', () => { + before(() => { + instrumentation.disable(); + }); + + after(() => { + instrumentation.enable(); + }); + + it('does not create spans', async () => { + await init(` + Feature: a feature + Scenario: a scenario + When I do anything at all + Then no spans are recorded + `); + const spans = memoryExporter.getFinishedSpans(); + assert.equal(spans.length, 0); + }); + }); +}); diff --git a/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts b/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts new file mode 100644 index 000000000..82978a2d7 --- /dev/null +++ b/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts @@ -0,0 +1,31 @@ +/* eslint-disable */ +import { When, Then, Given } from '@cucumber/cucumber'; + +Given('a failing step', async function () { + throw new Error('failing'); +}); + +Given('a passing step', function () {}); + +When(/I push the button/, async function () { + await new Promise(resolve => setTimeout(resolve, 10)); +}); + +Then('it is pushed to {string}', function (to) {}); + +Then('does nothing', function () {}); + +Then('does something with the table', function (table) {}); + +When('an ambiguous step is encountered', function () {}); +When(/an ambig(.*) step is encountered/, function () {}); + +Given('a skipped step', function () { + return 'skipped'; +}); + +Given('a pending step', function () { + return 'pending'; +}); + +Given('a doc string step', function (docString) {}); diff --git a/plugins/node/instrumentation-cucumber/test/features/support/world.ts b/plugins/node/instrumentation-cucumber/test/features/support/world.ts new file mode 100644 index 000000000..29bab018b --- /dev/null +++ b/plugins/node/instrumentation-cucumber/test/features/support/world.ts @@ -0,0 +1,34 @@ +/* eslint-disable */ +import { BeforeStep, AfterStep, After, Before } from '@cucumber/cucumber'; + +Before('@skip', function () { + return 'skipped'; +}); + +Before('@pending', function () { + return 'pending'; +}); + +Before(async gherkinDocument => { + if (gherkinDocument.pickle.name === 'Fails Before Hook') { + throw new Error('error'); + } +}); + +BeforeStep(async gherkinDocument => { + if (gherkinDocument.pickle.name === 'Fails BeforeStep Hook') { + throw new Error('error'); + } +}); + +AfterStep(async gherkinDocument => { + if (gherkinDocument.pickle.name === 'Fails AfterStep Hook') { + throw new Error('error'); + } +}); + +After(async gherkinDocument => { + if (gherkinDocument.pickle.name === 'Fails After Hook') { + throw new Error('error'); + } +}); diff --git a/plugins/node/instrumentation-cucumber/tsconfig.json b/plugins/node/instrumentation-cucumber/tsconfig.json new file mode 100644 index 000000000..568e7bb7c --- /dev/null +++ b/plugins/node/instrumentation-cucumber/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/release-please-config.json b/release-please-config.json index c92ac926d..be9ea170a 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -21,6 +21,7 @@ "packages/opentelemetry-sql-common": {}, "packages/opentelemetry-test-utils": {}, "plugins/node/instrumentation-amqplib": {}, + "plugins/node/instrumentation-cucumber": {}, "plugins/node/instrumentation-dataloader": {}, "plugins/node/instrumentation-fs": {}, "plugins/node/instrumentation-lru-memoizer": {}, From 0a6608bfe9c9a19cd68eca68d1597982d4b128e5 Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:46:11 +0000 Subject: [PATCH 61/94] [AutoMerge] Identifying and fixing merge issues from staged repos Processing otel-js - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.npmignore - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.tav.yml - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/LICENSE - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/README.md - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/src/instrumentation.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/src/types.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/.gitignore - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/cucumber.test.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/support/world.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/tsconfig.json - Re-Copying master file --- .../contrib/plugins}/node/instrumentation-cucumber/.eslintignore | 0 .../contrib/plugins}/node/instrumentation-cucumber/.eslintrc.js | 0 .../contrib/plugins}/node/instrumentation-cucumber/.npmignore | 0 .../contrib/plugins}/node/instrumentation-cucumber/.tav.yml | 0 .../contrib/plugins}/node/instrumentation-cucumber/LICENSE | 0 .../contrib/plugins}/node/instrumentation-cucumber/README.md | 0 .../contrib/plugins}/node/instrumentation-cucumber/package.json | 0 .../contrib/plugins}/node/instrumentation-cucumber/src/index.ts | 0 .../plugins}/node/instrumentation-cucumber/src/instrumentation.ts | 0 .../contrib/plugins}/node/instrumentation-cucumber/src/types.ts | 0 .../plugins}/node/instrumentation-cucumber/test/.gitignore | 0 .../plugins}/node/instrumentation-cucumber/test/cucumber.test.ts | 0 .../test/features/step_definitions/steps.ts | 0 .../node/instrumentation-cucumber/test/features/support/world.ts | 0 .../contrib/plugins}/node/instrumentation-cucumber/tsconfig.json | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/.eslintignore (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/.eslintrc.js (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/.npmignore (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/.tav.yml (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/LICENSE (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/README.md (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/package.json (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/src/index.ts (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/src/instrumentation.ts (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/src/types.ts (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/test/.gitignore (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/test/cucumber.test.ts (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/test/features/step_definitions/steps.ts (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/test/features/support/world.ts (100%) rename {plugins => auto-merge/contrib/plugins}/node/instrumentation-cucumber/tsconfig.json (100%) diff --git a/plugins/node/instrumentation-cucumber/.eslintignore b/auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore similarity index 100% rename from plugins/node/instrumentation-cucumber/.eslintignore rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore diff --git a/plugins/node/instrumentation-cucumber/.eslintrc.js b/auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js similarity index 100% rename from plugins/node/instrumentation-cucumber/.eslintrc.js rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js diff --git a/plugins/node/instrumentation-cucumber/.npmignore b/auto-merge/contrib/plugins/node/instrumentation-cucumber/.npmignore similarity index 100% rename from plugins/node/instrumentation-cucumber/.npmignore rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/.npmignore diff --git a/plugins/node/instrumentation-cucumber/.tav.yml b/auto-merge/contrib/plugins/node/instrumentation-cucumber/.tav.yml similarity index 100% rename from plugins/node/instrumentation-cucumber/.tav.yml rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/.tav.yml diff --git a/plugins/node/instrumentation-cucumber/LICENSE b/auto-merge/contrib/plugins/node/instrumentation-cucumber/LICENSE similarity index 100% rename from plugins/node/instrumentation-cucumber/LICENSE rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/LICENSE diff --git a/plugins/node/instrumentation-cucumber/README.md b/auto-merge/contrib/plugins/node/instrumentation-cucumber/README.md similarity index 100% rename from plugins/node/instrumentation-cucumber/README.md rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/README.md diff --git a/plugins/node/instrumentation-cucumber/package.json b/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json similarity index 100% rename from plugins/node/instrumentation-cucumber/package.json rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json diff --git a/plugins/node/instrumentation-cucumber/src/index.ts b/auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/src/index.ts rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts diff --git a/plugins/node/instrumentation-cucumber/src/instrumentation.ts b/auto-merge/contrib/plugins/node/instrumentation-cucumber/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/src/instrumentation.ts rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/src/instrumentation.ts diff --git a/plugins/node/instrumentation-cucumber/src/types.ts b/auto-merge/contrib/plugins/node/instrumentation-cucumber/src/types.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/src/types.ts rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/src/types.ts diff --git a/plugins/node/instrumentation-cucumber/test/.gitignore b/auto-merge/contrib/plugins/node/instrumentation-cucumber/test/.gitignore similarity index 100% rename from plugins/node/instrumentation-cucumber/test/.gitignore rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/test/.gitignore diff --git a/plugins/node/instrumentation-cucumber/test/cucumber.test.ts b/auto-merge/contrib/plugins/node/instrumentation-cucumber/test/cucumber.test.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/test/cucumber.test.ts rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/test/cucumber.test.ts diff --git a/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts b/auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts diff --git a/plugins/node/instrumentation-cucumber/test/features/support/world.ts b/auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/support/world.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/test/features/support/world.ts rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/support/world.ts diff --git a/plugins/node/instrumentation-cucumber/tsconfig.json b/auto-merge/contrib/plugins/node/instrumentation-cucumber/tsconfig.json similarity index 100% rename from plugins/node/instrumentation-cucumber/tsconfig.json rename to auto-merge/contrib/plugins/node/instrumentation-cucumber/tsconfig.json From 0f20b2a974f7830929cd690affe0d9055304f1df Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Fri, 21 Jul 2023 09:41:09 -0400 Subject: [PATCH 62/94] Revert tslib #3914 (#4011) * Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)" This reverts commit 74393ac6397dcb130b9d5dae35354a2bf9a0d2c3. * Changelog * Update CHANGELOG.md --- CHANGELOG.md | 3 +++ api/package.json | 3 --- examples/esm-http-ts/tsconfig.json | 3 +-- examples/opentelemetry-web/package.json | 3 +-- .../backwards-compatibility/node14/package.json | 3 +-- .../backwards-compatibility/node16/package.json | 3 +-- experimental/packages/api-events/package.json | 3 +-- experimental/packages/api-logs/package.json | 3 +-- .../packages/exporter-logs-otlp-grpc/package.json | 3 +-- .../packages/exporter-logs-otlp-http/package.json | 3 +-- .../packages/exporter-logs-otlp-proto/package.json | 3 +-- .../packages/exporter-trace-otlp-grpc/package.json | 3 +-- .../packages/exporter-trace-otlp-http/package.json | 3 +-- .../packages/exporter-trace-otlp-proto/package.json | 3 +-- .../opentelemetry-browser-detector/package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../opentelemetry-exporter-prometheus/package.json | 3 +-- .../opentelemetry-instrumentation-fetch/package.json | 3 +-- .../opentelemetry-instrumentation-grpc/package.json | 3 +-- .../opentelemetry-instrumentation-http/package.json | 3 +-- .../package.json | 3 +-- .../opentelemetry-instrumentation/package.json | 3 +-- .../src/platform/browser/index.ts | 2 +- .../src/platform/index.ts | 8 +------- .../src/platform/node/index.ts | 11 ++++------- .../test/node/EsmInstrumentation.test.mjs | 2 +- .../packages/opentelemetry-sdk-node/package.json | 3 +-- experimental/packages/otlp-exporter-base/package.json | 3 +-- .../packages/otlp-grpc-exporter-base/package.json | 3 +-- .../packages/otlp-proto-exporter-base/package.json | 3 +-- experimental/packages/otlp-transformer/package.json | 3 +-- experimental/packages/sdk-logs/package.json | 3 +-- experimental/packages/shim-opencensus/package.json | 3 +-- .../propagation-validation-server/package.json | 3 +-- package.json | 3 +-- .../opentelemetry-context-async-hooks/package.json | 3 --- .../opentelemetry-context-zone-peer-dep/package.json | 3 --- packages/opentelemetry-context-zone/package.json | 1 - packages/opentelemetry-core/package.json | 3 +-- packages/opentelemetry-exporter-jaeger/package.json | 3 +-- packages/opentelemetry-exporter-zipkin/package.json | 3 +-- packages/opentelemetry-propagator-b3/package.json | 3 +-- packages/opentelemetry-propagator-jaeger/package.json | 3 +-- packages/opentelemetry-resources/package.json | 3 +-- packages/opentelemetry-sdk-trace-base/package.json | 3 +-- packages/opentelemetry-sdk-trace-node/package.json | 3 +-- packages/opentelemetry-sdk-trace-web/package.json | 3 +-- .../opentelemetry-semantic-conventions/package.json | 3 --- packages/opentelemetry-shim-opentracing/package.json | 3 +-- packages/sdk-metrics/package.json | 3 +-- packages/template/package.json | 3 --- tsconfig.base.json | 3 +-- 54 files changed, 53 insertions(+), 118 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f7294606..b30dce039 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) +* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)" + [#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan + ### :books: (Refine Doc) ### :house: (Internal) diff --git a/api/package.json b/api/package.json index d78638160..d857ae33f 100644 --- a/api/package.json +++ b/api/package.json @@ -87,9 +87,6 @@ "unionfs": "4.5.1", "webpack": "4.46.0" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api", "sideEffects": false } diff --git a/examples/esm-http-ts/tsconfig.json b/examples/esm-http-ts/tsconfig.json index f7c20de0d..5f821d66c 100644 --- a/examples/esm-http-ts/tsconfig.json +++ b/examples/esm-http-ts/tsconfig.json @@ -18,8 +18,7 @@ "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, /* Completeness */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */, - "importHelpers": true + "skipLibCheck": true /* Skip type checking all .d.ts files. */ }, "include": ["**/*.ts", "**/*.js", "*.config.js"], "exclude": ["node_modules"] diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index 762f17d65..e57cc764a 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -56,8 +56,7 @@ "@opentelemetry/sdk-metrics": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", "@opentelemetry/sdk-trace-web": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json index 1fc32b91f..9414b949f 100644 --- a/experimental/backwards-compatibility/node14/package.json +++ b/experimental/backwards-compatibility/node14/package.json @@ -10,8 +10,7 @@ }, "dependencies": { "@opentelemetry/sdk-node": "0.41.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "devDependencies": { "@types/node": "14.18.25", diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json index 136ff5ff0..ed473eae2 100644 --- a/experimental/backwards-compatibility/node16/package.json +++ b/experimental/backwards-compatibility/node16/package.json @@ -10,8 +10,7 @@ }, "dependencies": { "@opentelemetry/sdk-node": "0.41.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "devDependencies": { "@types/node": "16.11.52", diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index e2fed0e67..dd4111bb3 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -61,8 +61,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { "@types/mocha": "10.0.1", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 15f4d1c86..9bddeaa79 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -61,8 +61,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { "@types/mocha": "10.0.1", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 643ab186f..6a6190873 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -76,8 +76,7 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/sdk-logs": "0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-logs": "0.41.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index b77b63df2..428d2ed87 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -107,7 +107,6 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/otlp-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/sdk-logs": "0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-logs": "0.41.0" } } diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 355e5333d..6047b0bd6 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -100,8 +100,7 @@ "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", "@opentelemetry/sdk-logs": "0.41.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 22a4eae70..4c89ede04 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -74,8 +74,7 @@ "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 56e01988a..631b0ac6d 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -99,8 +99,7 @@ "@opentelemetry/otlp-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 96c327b60..84a44cb05 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -97,8 +97,7 @@ "@opentelemetry/otlp-proto-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 357f63061..9c90b945e 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -83,8 +83,7 @@ }, "dependencies": { "@opentelemetry/resources": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 4c239a6e2..414dae935 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -74,8 +74,7 @@ "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-metrics": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 89017dfb0..6f83683c8 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -99,8 +99,7 @@ "@opentelemetry/otlp-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-metrics": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index d98c421bc..c92aaae08 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -73,8 +73,7 @@ "@opentelemetry/otlp-proto-exporter-base": "0.41.0", "@opentelemetry/otlp-transformer": "0.41.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-metrics": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index 5b44a67c3..b87439eb4 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -63,8 +63,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-metrics": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index b36c60a67..bbb989e09 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -91,8 +91,7 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/instrumentation": "0.41.0", "@opentelemetry/sdk-trace-web": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index ac047252e..8a7d6af1f 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -71,8 +71,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 2c5d28cd7..50f9c5ea8 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -77,8 +77,7 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/instrumentation": "0.41.0", "@opentelemetry/semantic-conventions": "1.15.0", - "semver": "^7.5.1", - "tslib": "^2.3.1" + "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 71585b4e0..d823392ac 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -91,8 +91,7 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/instrumentation": "0.41.0", "@opentelemetry/sdk-trace-web": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 46ba9af64..b3e1a2aad 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -75,8 +75,7 @@ "import-in-the-middle": "1.4.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1", - "shimmer": "^1.2.1", - "tslib": "^2.3.1" + "shimmer": "^1.2.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts index 0b238b42b..24c76056a 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export { InstrumentationBase } from './instrumentation'; +export * from './instrumentation'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts index 1fc5f5e14..cdaf8858c 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts @@ -14,10 +14,4 @@ * limitations under the License. */ -export { - InstrumentationBase, - InstrumentationModuleDefinition, - InstrumentationModuleFile, - InstrumentationNodeModuleDefinition, - InstrumentationNodeModuleFile, -} from './node'; +export * from './node'; diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts index d3df10491..842797c34 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts @@ -13,10 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -export { InstrumentationBase } from './instrumentation'; -export { InstrumentationNodeModuleDefinition } from './instrumentationNodeModuleDefinition'; -export { InstrumentationNodeModuleFile } from './instrumentationNodeModuleFile'; -export { - InstrumentationModuleDefinition, - InstrumentationModuleFile, -} from './types'; +export * from './instrumentation'; +export * from './instrumentationNodeModuleDefinition'; +export * from './instrumentationNodeModuleFile'; +export * from './types'; diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs b/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs index 715dbdbff..f09097cd7 100644 --- a/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs +++ b/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs @@ -18,7 +18,7 @@ import * as assert from 'assert'; import { InstrumentationBase, InstrumentationNodeModuleDefinition, -} from '../../build/src/platform/index.js'; +} from '../../build/src/index.js'; import * as exported from 'test-esm-module'; class TestInstrumentationWrapFn extends InstrumentationBase { diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 8e6f97f27..acaad73e0 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -57,8 +57,7 @@ "@opentelemetry/sdk-metrics": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", "@opentelemetry/sdk-trace-node": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0" diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 687fcdf50..1b37716be 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -61,8 +61,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/core": "1.15.0" }, "devDependencies": { "@babel/core": "7.22.9", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 232b83bf6..4db399497 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -75,8 +75,7 @@ "@grpc/grpc-js": "^1.7.1", "@opentelemetry/core": "1.15.0", "@opentelemetry/otlp-exporter-base": "0.41.0", - "protobufjs": "^7.2.3", - "tslib": "^2.3.1" + "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", "sideEffects": false diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index f1fd58623..5480ef6ce 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -81,8 +81,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "@opentelemetry/otlp-exporter-base": "0.41.0", - "protobufjs": "^7.2.3", - "tslib": "^2.3.1" + "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", "sideEffects": false diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 3a53906d5..66e424429 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -83,8 +83,7 @@ "@opentelemetry/resources": "1.15.0", "@opentelemetry/sdk-logs": "0.41.0", "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-base": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", "sideEffects": false diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 14a18889e..54d9063d6 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -100,7 +100,6 @@ }, "dependencies": { "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/resources": "1.15.0" } } diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index d5ebb224d..cf637d1a8 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -71,8 +71,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "require-in-the-middle": "^7.1.1", - "semver": "^7.5.1", - "tslib": "^2.3.1" + "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus", "sideEffects": false diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 8d577ea65..0158a21f6 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -17,8 +17,7 @@ "@opentelemetry/sdk-trace-base": "1.15.0", "axios": "1.4.0", "body-parser": "1.19.0", - "express": "4.17.3", - "tslib": "^2.3.1" + "express": "4.17.3" }, "devDependencies": { "typescript": "4.4.4" diff --git a/package.json b/package.json index 867154052..2a6cffca3 100644 --- a/package.json +++ b/package.json @@ -80,8 +80,7 @@ "typedoc": "0.22.18", "typedoc-plugin-missing-exports": "1.0.0", "typedoc-plugin-resolve-crossmodule-references": "0.2.2", - "typescript": "4.4.4", - "tslib": "^2.3.1" + "typescript": "4.4.4" }, "changelog": { "repo": "open-telemetry/opentelemetry-js", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index a1073523b..01439b30f 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -43,9 +43,6 @@ "publishConfig": { "access": "public" }, - "dependencies": { - "tslib": "^2.3.1" - }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 515059557..0a7cab2c0 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -85,9 +85,6 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0", "zone.js": "^0.10.2 || ^0.11.0" }, - "dependencies": { - "tslib": "^2.3.1" - }, "sideEffects": false, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep" } diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 342c580ff..01fafc419 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -76,7 +76,6 @@ }, "dependencies": { "@opentelemetry/context-zone-peer-dep": "1.15.0", - "tslib": "^2.3.1", "zone.js": "^0.11.0" }, "sideEffects": true, diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index c8ba0b364..5340df951 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -91,8 +91,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 2158bd306..a595bf3e4 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -66,8 +66,7 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", "@opentelemetry/semantic-conventions": "1.15.0", - "jaeger-client": "^3.15.0", - "tslib": "^2.3.1" + "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", "sideEffects": false diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 6ef32c8de..0de3f4a5d 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -95,8 +95,7 @@ "@opentelemetry/core": "1.15.0", "@opentelemetry/resources": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 69fce8a12..2d0bbb4c5 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -51,8 +51,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/core": "1.15.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0" diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index ef8d9915a..a9b2e1561 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -81,8 +81,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/core": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", "sideEffects": false diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index a121a1c4f..dac50ecec 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -92,8 +92,7 @@ }, "dependencies": { "@opentelemetry/core": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index d220f8cae..c0285dd5f 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -95,8 +95,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "@opentelemetry/resources": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 7afeef5bc..fe776628b 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -70,8 +70,7 @@ "@opentelemetry/propagator-b3": "1.15.0", "@opentelemetry/propagator-jaeger": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", - "semver": "^7.5.1", - "tslib": "^2.3.1" + "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 4c1c347cd..e19b365b2 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -94,8 +94,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "1.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 29b28f22f..367416299 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -62,9 +62,6 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions", "sideEffects": false } diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 6f28c3c06..fbbb58096 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -62,8 +62,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "@opentelemetry/semantic-conventions": "1.15.0", - "opentracing": "^0.14.4", - "tslib": "^2.3.1" + "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", "sideEffects": false diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 0ce67e77d..7aaf05fd6 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -86,8 +86,7 @@ "dependencies": { "@opentelemetry/core": "1.15.0", "@opentelemetry/resources": "1.15.0", - "lodash.merge": "^4.6.2", - "tslib": "^2.3.1" + "lodash.merge": "^4.6.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", "sideEffects": false diff --git a/packages/template/package.json b/packages/template/package.json index 890604127..3949c871f 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -83,9 +83,6 @@ "lerna": "7.1.3", "typescript": "4.4.4" }, - "dependencies": { - "tslib": "^2.3.1" - }, "Add these to devDependencies for testing": { "@types/mocha": "9.1.1", "@types/sinon": "10.0.13", diff --git a/tsconfig.base.json b/tsconfig.base.json index 84e684c8a..cbafb6767 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -21,8 +21,7 @@ "strict": true, "strictNullChecks": true, "target": "es2017", - "useUnknownInCatchVariables": false, - "importHelpers": true + "useUnknownInCatchVariables": false }, "exclude": [ "node_modules" From 9f71800fdc2a5ee5055684037a12498af71955f2 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Mon, 24 Jul 2023 09:44:44 -0400 Subject: [PATCH 63/94] chore: prepare release 1.15.1/0.41.1 (#4016) --- CHANGELOG.md | 10 ++++-- examples/esm-http-ts/package.json | 16 +++++----- examples/http/package.json | 18 +++++------ examples/https/package.json | 18 +++++------ examples/opentelemetry-web/package.json | 30 ++++++++--------- examples/otlp-exporter-node/package.json | 24 +++++++------- experimental/CHANGELOG.md | 19 +++++++++-- .../node14/package.json | 6 ++-- .../node16/package.json | 6 ++-- .../examples/opencensus-shim/package.json | 12 +++---- experimental/examples/prometheus/package.json | 6 ++-- experimental/packages/api-events/package.json | 4 +-- experimental/packages/api-logs/package.json | 4 +-- .../exporter-logs-otlp-grpc/package.json | 16 +++++----- .../exporter-logs-otlp-http/package.json | 16 +++++----- .../exporter-logs-otlp-proto/package.json | 20 ++++++------ .../exporter-trace-otlp-grpc/package.json | 14 ++++---- .../exporter-trace-otlp-http/package.json | 14 ++++---- .../exporter-trace-otlp-proto/package.json | 16 +++++----- .../package.json | 8 ++--- .../package.json | 14 ++++---- .../package.json | 14 ++++---- .../package.json | 16 +++++----- .../package.json | 10 +++--- .../package.json | 18 +++++------ .../package.json | 14 ++++---- .../package.json | 16 +++++----- .../package.json | 18 +++++------ .../package.json | 6 ++-- .../opentelemetry-sdk-node/package.json | 32 +++++++++---------- .../packages/otlp-exporter-base/package.json | 6 ++-- .../otlp-grpc-exporter-base/package.json | 12 +++---- .../otlp-proto-exporter-base/package.json | 6 ++-- .../packages/otlp-transformer/package.json | 16 +++++----- experimental/packages/sdk-logs/package.json | 12 +++---- .../packages/shim-opencensus/package.json | 8 ++--- .../package.json | 8 ++--- .../package.json | 2 +- .../package.json | 4 +-- .../opentelemetry-context-zone/package.json | 4 +-- packages/opentelemetry-core/package.json | 6 ++-- .../package.json | 10 +++--- .../package.json | 12 +++---- .../opentelemetry-propagator-b3/package.json | 4 +-- .../package.json | 6 ++-- packages/opentelemetry-resources/package.json | 6 ++-- .../opentelemetry-sdk-trace-base/package.json | 10 +++--- .../opentelemetry-sdk-trace-node/package.json | 16 +++++----- .../opentelemetry-sdk-trace-web/package.json | 16 +++++----- .../package.json | 2 +- .../package.json | 12 +++---- packages/sdk-metrics/package.json | 10 +++--- packages/template/package.json | 2 +- selenium-tests/package.json | 22 ++++++------- 54 files changed, 332 insertions(+), 315 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b30dce039..ea4e3c0ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,13 +13,17 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) -* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)" - [#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan - ### :books: (Refine Doc) ### :house: (Internal) +## 1.15.1 + +### :bug: (Bug Fix) + +* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)" + [#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan + ## 1.15.0 ### :bug: (Bug Fix) diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json index 4dcbbf600..a36bbf722 100644 --- a/examples/esm-http-ts/package.json +++ b/examples/esm-http-ts/package.json @@ -1,7 +1,7 @@ { "name": "esm-http-ts", "private": true, - "version": "0.41.0", + "version": "0.41.1", "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript", "main": "build/index.js", "type": "module", @@ -31,12 +31,12 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/", "dependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/instrumentation-http": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/instrumentation-http": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" } } diff --git a/examples/http/package.json b/examples/http/package.json index 22d3d29d9..1452ccbd8 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.41.0", + "version": "0.41.1", "description": "Example of HTTP integration with OpenTelemetry", "main": "index.js", "scripts": { @@ -29,14 +29,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.15.0", - "@opentelemetry/exporter-zipkin": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/instrumentation-http": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/exporter-jaeger": "1.15.1", + "@opentelemetry/exporter-zipkin": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/instrumentation-http": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/examples/https/package.json b/examples/https/package.json index 15b3ac513..224178299 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.41.0", + "version": "0.41.1", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -33,14 +33,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.15.0", - "@opentelemetry/exporter-zipkin": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/instrumentation-http": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/exporter-jaeger": "1.15.1", + "@opentelemetry/exporter-zipkin": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/instrumentation-http": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index e57cc764a..6f70a428a 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -1,7 +1,7 @@ { "name": "web-opentelemetry-example", "private": true, - "version": "0.41.0", + "version": "0.41.1", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", "main": "index.js", "scripts": { @@ -43,20 +43,20 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.15.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", - "@opentelemetry/exporter-trace-otlp-http": "0.41.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", - "@opentelemetry/exporter-zipkin": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/instrumentation-fetch": "0.41.0", - "@opentelemetry/instrumentation-xml-http-request": "0.41.0", - "@opentelemetry/propagator-b3": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-web": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/context-zone": "1.15.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", + "@opentelemetry/exporter-trace-otlp-http": "0.41.1", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", + "@opentelemetry/exporter-zipkin": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/instrumentation-fetch": "0.41.1", + "@opentelemetry/instrumentation-xml-http-request": "0.41.1", + "@opentelemetry/propagator-b3": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-web": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index 888a0b1be..c16a341a2 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.41.0", + "version": "0.41.1", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -29,17 +29,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", - "@opentelemetry/exporter-metrics-otlp-proto": "0.41.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", - "@opentelemetry/exporter-trace-otlp-http": "0.41.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.1", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", + "@opentelemetry/exporter-metrics-otlp-proto": "0.41.1", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1", + "@opentelemetry/exporter-trace-otlp-http": "0.41.1", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index c62993188..38d9b8397 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,13 +6,11 @@ All notable changes to experimental packages in this project will be documented ### :books: (Refine Doc) -* docs(sdk-metrics): add example of exponential histogram metric [#3855](https://github.com/open-telemetry/opentelemetry-js/pull/3855) @JamieDanielson - ### :boom: Breaking Change ### :rocket: (Enhancement) -* feat(sdk-node): logs support added [#3969](https://github.com/open-telemetry/opentelemetry-js/pull/3969) @psk001 +### :bug: (Bug Fix) ### :bug: (Bug Fix) @@ -20,6 +18,21 @@ All notable changes to experimental packages in this project will be documented ### :house: (Internal) +## 0.41.1 + +### :books: (Refine Doc) + +* docs(sdk-metrics): add example of exponential histogram metric [#3855](https://github.com/open-telemetry/opentelemetry-js/pull/3855) @JamieDanielson + +### :rocket: (Enhancement) + +* feat(sdk-node): logs support added [#3969](https://github.com/open-telemetry/opentelemetry-js/pull/3969) @psk001 + +### :bug: (Bug Fix) + +* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)" + [#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan + ## 0.41.0 ### :boom: Breaking Change diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json index 9414b949f..cf9cc50be 100644 --- a/experimental/backwards-compatibility/node14/package.json +++ b/experimental/backwards-compatibility/node14/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node14", - "version": "0.41.0", + "version": "0.41.1", "private": true, "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.41.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/sdk-node": "0.41.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "devDependencies": { "@types/node": "14.18.25", diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json index ed473eae2..92f16e43e 100644 --- a/experimental/backwards-compatibility/node16/package.json +++ b/experimental/backwards-compatibility/node16/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node16", - "version": "0.41.0", + "version": "0.41.1", "private": true, "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.41.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/sdk-node": "0.41.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "devDependencies": { "@types/node": "16.11.52", diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index ee201e117..ee2bb6e08 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -1,7 +1,7 @@ { "name": "opencensus-shim", "private": true, - "version": "0.41.0", + "version": "0.41.1", "description": "Example of using @opentelemetry/shim-opencensus in Node.js", "main": "index.js", "scripts": { @@ -30,11 +30,11 @@ "@opencensus/core": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.4.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", - "@opentelemetry/shim-opencensus": "0.41.0" + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1", + "@opentelemetry/shim-opencensus": "0.41.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" } diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json index 45c9f661d..9b51db4a9 100644 --- a/experimental/examples/prometheus/package.json +++ b/experimental/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.41.0", + "version": "0.41.1", "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.41.0", - "@opentelemetry/sdk-metrics": "1.15.0" + "@opentelemetry/exporter-prometheus": "0.41.1", + "@opentelemetry/sdk-metrics": "1.15.1" } } diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index dd4111bb3..94c3ce510 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-events", - "version": "0.41.0", + "version": "0.41.1", "description": "Public events API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -67,9 +67,9 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 9bddeaa79..e99c9fd65 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-logs", - "version": "0.41.0", + "version": "0.41.1", "description": "Public logs API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -67,9 +67,9 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 6a6190873..bbd94bea1 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -51,9 +51,9 @@ "@babel/core": "7.22.9", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/api-logs": "0.41.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/resources": "1.15.0", + "@opentelemetry/api-logs": "0.41.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -73,10 +73,10 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/sdk-logs": "0.41.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/sdk-logs": "0.41.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 428d2ed87..49e2f2eab 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.41.0", + "version": "0.41.1", "publishConfig": { "access": "public" }, @@ -72,17 +72,17 @@ "sideEffects": false, "devDependencies": { "@babel/core": "7.22.9", - "@opentelemetry/api-logs": "0.41.0", - "@opentelemetry/resources": "1.15.0", + "@opentelemetry/api-logs": "0.41.1", + "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -104,9 +104,9 @@ "@opentelemetry/api-logs": ">=0.38.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/sdk-logs": "0.41.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/sdk-logs": "0.41.1" } } diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 6047b0bd6..f24ffbaac 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.41.0", + "version": "0.41.1", "description": "An OTLP exporter to send logs using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -68,10 +68,10 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -93,14 +93,14 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.41.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/otlp-proto-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-logs": "0.41.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/api-logs": "0.41.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-proto-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-logs": "0.41.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 4c89ede04..1a6a0114e 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ "@babel/core": "7.22.9", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/otlp-exporter-base": "0.41.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -70,11 +70,11 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 631b0ac6d..0b51ceb78 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -70,10 +70,10 @@ "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -95,11 +95,11 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 84a44cb05..bf01be8e5 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -67,10 +67,10 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -92,12 +92,12 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/otlp-proto-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-proto-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 9c90b945e..bdf856692 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Resource Detector for Browser", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -58,9 +58,9 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -82,8 +82,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 414dae935..c5fffbadb 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -69,12 +69,12 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", - "@opentelemetry/otlp-grpc-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 6f83683c8..6adc7387e 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -70,10 +70,10 @@ "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -95,11 +95,11 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index c92aaae08..59b19416e 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -67,13 +67,13 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", - "@opentelemetry/otlp-proto-exporter-base": "0.41.0", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-proto-exporter-base": "0.41.1", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index b87439eb4..8b9a7251f 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/semantic-conventions": "1.15.0", + "@opentelemetry/semantic-conventions": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -61,9 +61,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index bbb989e09..55b7b3565 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,17 +56,17 @@ "devDependencies": { "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.15.0", - "@opentelemetry/propagator-b3": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/context-zone": "1.15.1", + "@opentelemetry/propagator-b3": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -88,10 +88,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/sdk-trace-web": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/sdk-trace-web": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 8a7d6af1f..51b635875 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,10 +48,10 @@ "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/context-async-hooks": "1.15.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", @@ -70,8 +70,8 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 50f9c5ea8..f945fbefc 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,10 +46,10 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", + "@opentelemetry/context-async-hooks": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.18", @@ -74,9 +74,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/semantic-conventions": "1.15.0", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/semantic-conventions": "1.15.1", "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index d823392ac..3c729d400 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,17 +56,17 @@ "devDependencies": { "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.15.0", - "@opentelemetry/propagator-b3": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/context-zone": "1.15.1", + "@opentelemetry/propagator-b3": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -88,10 +88,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/sdk-trace-web": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/sdk-trace-web": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index b3e1a2aad..faa4b5a88 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.41.0", + "version": "0.41.1", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation", @@ -83,17 +83,17 @@ "devDependencies": { "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", - "@opentelemetry/sdk-metrics": "1.15.0", + "@opentelemetry/sdk-metrics": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index acaad73e0..a00499ab7 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,27 +44,27 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-logs":"0.41.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/exporter-jaeger": "1.15.0", - "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0", - "@opentelemetry/exporter-trace-otlp-http": "0.41.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.0", - "@opentelemetry/exporter-zipkin": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-logs":"0.41.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-node": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/api-logs": "0.41.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/exporter-jaeger": "1.15.1", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1", + "@opentelemetry/exporter-trace-otlp-http": "0.41.1", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", + "@opentelemetry/exporter-zipkin": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-logs": "0.41.1", + "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0" }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.0", + "@opentelemetry/context-async-hooks": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 1b37716be..2d3a61a5b 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry OTLP Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,7 +61,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.15.0" + "@opentelemetry/core": "1.15.1" }, "devDependencies": { "@babel/core": "7.22.9", @@ -69,9 +69,9 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 4db399497..67330ada1 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry OTLP-gRPC Exporter base (for internal use only)", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,9 +50,9 @@ "devDependencies": { "@babel/core": "7.22.9", "@opentelemetry/api": "1.4.1", - "@opentelemetry/otlp-transformer": "0.41.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/otlp-transformer": "0.41.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -73,8 +73,8 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 5480ef6ce..a411fb4a9 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-proto-exporter-base", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -79,8 +79,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/otlp-exporter-base": "0.41.0", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/otlp-exporter-base": "0.41.1", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 66e424429..1ea9fa0db 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "0.41.0", + "version": "0.41.1", "description": "Transform OpenTelemetry SDK data into OTLP", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", @@ -60,9 +60,9 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -78,12 +78,12 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.41.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-logs": "0.41.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0" + "@opentelemetry/api-logs": "0.41.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-logs": "0.41.1", + "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", "sideEffects": false diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 54d9063d6..3ac1aba87 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-logs", - "version": "0.41.0", + "version": "0.41.1", "publishConfig": { "access": "public" }, @@ -72,15 +72,15 @@ "@opentelemetry/api-logs": ">=0.39.1" }, "devDependencies": { - "@opentelemetry/api": ">=1.4.0 <1.5.0", - "@opentelemetry/api-logs": "0.41.0", "@babel/core": "7.22.9", + "@opentelemetry/api": ">=1.4.0 <1.5.0", + "@opentelemetry/api-logs": "0.41.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -99,7 +99,7 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/resources": "1.15.1" } } diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index cf637d1a8..b1724c988 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opencensus", - "version": "0.41.0", + "version": "0.41.1", "description": "OpenCensus to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,8 +50,8 @@ "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/context-async-hooks": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -69,7 +69,7 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", + "@opentelemetry/core": "1.15.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1" }, diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 0158a21f6..c027ea34c 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "1.15.0", + "version": "1.15.1", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,9 +12,9 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.15.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/context-async-hooks": "1.15.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "axios": "1.4.0", "body-parser": "1.19.0", "express": "4.17.3" diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 01439b30f..a75321170 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 0a7cab2c0..b375a49f9 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,9 +61,9 @@ "@types/webpack-env": "1.16.3", "@types/zone.js": "0.5.12", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 01fafc419..ee7ba2406 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -75,7 +75,7 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.0", + "@opentelemetry/context-zone-peer-dep": "1.15.1", "zone.js": "^0.11.0" }, "sideEffects": true, diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 5340df951..974185bdf 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/core", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -69,9 +69,9 @@ "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -91,7 +91,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index a595bf3e4..437b2b191 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.15.0", + "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", @@ -63,9 +63,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1", "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 0de3f4a5d..ff789993a 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -67,9 +67,9 @@ "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -92,10 +92,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 2d0bbb4c5..dc771041f 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -51,7 +51,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.15.0" + "@opentelemetry/core": "1.15.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0" diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index a9b2e1561..487e6efa2 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -59,9 +59,9 @@ "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -81,7 +81,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0" + "@opentelemetry/core": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", "sideEffects": false diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index dac50ecec..8889e298c 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -91,8 +91,8 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index c0285dd5f..7f9cdfe0a 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-base", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -70,9 +70,9 @@ "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -93,9 +93,9 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index fe776628b..97b12571b 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,8 +46,8 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/resources": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", + "@opentelemetry/resources": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", @@ -65,11 +65,11 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "1.15.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/propagator-b3": "1.15.0", - "@opentelemetry/propagator-jaeger": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/context-async-hooks": "1.15.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/propagator-b3": "1.15.1", + "@opentelemetry/propagator-jaeger": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index e19b365b2..bcc00574f 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-web", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,18 +57,18 @@ "devDependencies": { "@babel/core": "7.22.9", "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/context-zone": "1.15.0", - "@opentelemetry/propagator-b3": "1.15.0", - "@opentelemetry/resources": "1.15.0", + "@opentelemetry/context-zone": "1.15.1", + "@opentelemetry/propagator-b3": "1.15.1", + "@opentelemetry/resources": "1.15.1", "@types/jquery": "3.5.16", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -92,9 +92,9 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0" + "@opentelemetry/core": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 367416299..59473df70 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index fbbb58096..26a8ba076 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,9 +43,9 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/propagator-b3": "1.15.0", - "@opentelemetry/propagator-jaeger": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", + "@opentelemetry/propagator-b3": "1.15.1", + "@opentelemetry/propagator-jaeger": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -60,8 +60,8 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/semantic-conventions": "1.15.0", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.1", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 7aaf05fd6..f0abbe927 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-metrics", - "version": "1.15.0", + "version": "1.15.1", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -54,15 +54,15 @@ "access": "public" }, "devDependencies": { + "@babel/core": "7.22.9", "@opentelemetry/api": ">=1.3.0 <1.5.0", "@types/lodash.merge": "4.6.7", - "@babel/core": "7.22.9", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.15", + "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", - "babel-plugin-istanbul": "6.1.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -84,8 +84,8 @@ "@opentelemetry/api": ">=1.3.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.0", - "@opentelemetry/resources": "1.15.0", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/resources": "1.15.1", "lodash.merge": "^4.6.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", diff --git a/packages/template/package.json b/packages/template/package.json index 3949c871f..4cbc426dd 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "1.15.0", + "version": "1.15.1", "private": true, "publishConfig": { "access": "restricted" diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 16f2d6e9b..04d420abe 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/selenium-tests", - "version": "1.15.0", + "version": "1.15.1", "private": true, "description": "OpenTelemetry Selenium Tests", "main": "index.js", @@ -56,16 +56,16 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.0", - "@opentelemetry/core": "1.15.0", - "@opentelemetry/exporter-trace-otlp-http": "0.41.0", - "@opentelemetry/exporter-zipkin": "1.15.0", - "@opentelemetry/instrumentation": "0.41.0", - "@opentelemetry/instrumentation-fetch": "0.41.0", - "@opentelemetry/instrumentation-xml-http-request": "0.41.0", - "@opentelemetry/sdk-metrics": "1.15.0", - "@opentelemetry/sdk-trace-base": "1.15.0", - "@opentelemetry/sdk-trace-web": "1.15.0", + "@opentelemetry/context-zone-peer-dep": "1.15.1", + "@opentelemetry/core": "1.15.1", + "@opentelemetry/exporter-trace-otlp-http": "0.41.1", + "@opentelemetry/exporter-zipkin": "1.15.1", + "@opentelemetry/instrumentation": "0.41.1", + "@opentelemetry/instrumentation-fetch": "0.41.1", + "@opentelemetry/instrumentation-xml-http-request": "0.41.1", + "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/sdk-trace-web": "1.15.1", "zone.js": "0.11.4" } } From 2b20565d105d4267de5e19a730c2401eacad43a4 Mon Sep 17 00:00:00 2001 From: Nev <54870357+MSNev@users.noreply.github.com> Date: Wed, 26 Jul 2023 09:43:54 -0700 Subject: [PATCH 64/94] fix: Add otel-api as dev dep for sandbox tests (#4020) * fix: Add otel-api as dev dep for sandbox tests * fix changelog formatting --- CHANGELOG.md | 2 ++ experimental/packages/exporter-logs-otlp-http/package.json | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4e3c0ca..b7b8a06ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) +* fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup + ### :books: (Refine Doc) ### :house: (Internal) diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 49e2f2eab..8d2c4c2e9 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -72,6 +72,7 @@ "sideEffects": false, "devDependencies": { "@babel/core": "7.22.9", + "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.1", "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", From c021b10b142a3ea924fa29c5becea08f33443695 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Mon, 31 Jul 2023 06:14:12 +0000 Subject: [PATCH 65/94] fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions (#4014) --- CHANGELOG.md | 1 + packages/opentelemetry-core/src/common/time.ts | 4 ++-- packages/opentelemetry-shim-opentracing/test/Shim.test.ts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7b8a06ef..c5f1569a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) * fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup +* fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions [#4014](https://github.com/open-telemetry/opentelemetry-js/pull/4014/) @aabmass ### :books: (Refine Doc) diff --git a/packages/opentelemetry-core/src/common/time.ts b/packages/opentelemetry-core/src/common/time.ts index 8dd650a99..8d3051b00 100644 --- a/packages/opentelemetry-core/src/common/time.ts +++ b/packages/opentelemetry-core/src/common/time.ts @@ -129,7 +129,7 @@ export function hrTimeToNanoseconds(time: api.HrTime): number { * @param time */ export function hrTimeToMilliseconds(time: api.HrTime): number { - return Math.round(time[0] * 1e3 + time[1] / 1e6); + return time[0] * 1e3 + time[1] / 1e6; } /** @@ -137,7 +137,7 @@ export function hrTimeToMilliseconds(time: api.HrTime): number { * @param time */ export function hrTimeToMicroseconds(time: api.HrTime): number { - return Math.round(time[0] * 1e6 + time[1] / 1e3); + return time[0] * 1e6 + time[1] / 1e3; } /** diff --git a/packages/opentelemetry-shim-opentracing/test/Shim.test.ts b/packages/opentelemetry-shim-opentracing/test/Shim.test.ts index cd3749a68..2da2f8000 100644 --- a/packages/opentelemetry-shim-opentracing/test/Shim.test.ts +++ b/packages/opentelemetry-shim-opentracing/test/Shim.test.ts @@ -261,7 +261,7 @@ describe('OpenTracing Shim', () => { assert.strictEqual(otSpan.links.length, 1); assert.deepStrictEqual( hrTimeToMilliseconds(otSpan.startTime), - Math.round(now + adjustment + performance.timeOrigin) + now + adjustment + performance.timeOrigin ); assert.deepStrictEqual(otSpan.attributes, opentracingOptions.tags); }); @@ -495,7 +495,7 @@ describe('OpenTracing Shim', () => { const adjustment = otSpan['_performanceOffset']; assert.deepStrictEqual( hrTimeToMilliseconds(otSpan.endTime), - Math.round(now + adjustment + performance.timeOrigin) + now + adjustment + performance.timeOrigin ); }); From 0755a5c076726f839b2d6bee66a4889ef1fc8d48 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 1 Aug 2023 14:20:02 +0200 Subject: [PATCH 66/94] fix(ci): don't collect coverage for eol tests (#4030) --- .github/workflows/unit-test.yml | 7 ++++++- api/package.json | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index e326aa822..241e487ce 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -201,4 +201,9 @@ jobs: - name: Test working-directory: ./api - run: npm test + # running test:eol as node 8 is not supported anymore by the version of nyc we use, as we don't report coverage + # for this step we leave it out. + # Details: nyc requires istanbul-lib-report, which silently dropped support for Node.js v8 when going from + # 3.0.0 to 3.0.1 by requiring make-dir@^4.0.0 to fix https://github.com/advisories/GHSA-c2qf-rxjj-qqgw. + # make-dir does not support Node.js v8 anymore. + run: npm run test:eol diff --git a/api/package.json b/api/package.json index d857ae33f..f73aef244 100644 --- a/api/package.json +++ b/api/package.json @@ -25,6 +25,7 @@ "lint": "eslint . --ext .ts", "test:browser": "karma start --single-run", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "test:eol": "ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test:webworker": "karma start karma.worker.js --single-run", "cycle-check": "dpdm --exit-code circular:1 src/index.ts", "version": "node ../scripts/version-update.js", From 1a7488ecdd1b43c5df2b9524b5592160a9023cee Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Tue, 1 Aug 2023 13:21:01 +0000 Subject: [PATCH 67/94] chore(exporter-logs-otlp-http): commit missing generated changes to tsconfig.json (#4032) Co-authored-by: Marc Pichler --- .../packages/exporter-logs-otlp-http/tsconfig.esm.json | 3 +++ .../packages/exporter-logs-otlp-http/tsconfig.esnext.json | 3 +++ experimental/packages/exporter-logs-otlp-http/tsconfig.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json index f7353a3e8..0edcb89fa 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json @@ -9,6 +9,9 @@ "src/**/*.ts" ], "references": [ + { + "path": "../../../api" + }, { "path": "../../../packages/opentelemetry-core" }, diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json index 7a3b4e394..0c19aa0aa 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json @@ -9,6 +9,9 @@ "src/**/*.ts" ], "references": [ + { + "path": "../../../api" + }, { "path": "../../../packages/opentelemetry-core" }, diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.json index e347a2eef..96f229bb8 100644 --- a/experimental/packages/exporter-logs-otlp-http/tsconfig.json +++ b/experimental/packages/exporter-logs-otlp-http/tsconfig.json @@ -9,6 +9,9 @@ "test/**/*.ts" ], "references": [ + { + "path": "../../../api" + }, { "path": "../../../packages/opentelemetry-core" }, From 87fff2ece4d1d502699dc0f20c9bf951393fb7cb Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 1 Aug 2023 16:12:40 +0200 Subject: [PATCH 68/94] fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods (#3804) --- experimental/CHANGELOG.md | 1 + .../.eslintignore | 1 + .../package.json | 9 +- .../src/grpc-js/clientUtils.ts | 224 ++--- .../src/grpc-js/index.ts | 202 ++++- .../src/grpc-js/types.ts | 4 + .../test/.gitignore | 1 + .../test/fixtures/buf.gen.yaml | 9 + .../test/fixtures/buf.lock | 8 + .../test/fixtures/buf.yaml | 9 + .../test/grpc-protobuf-ts.test.ts | 831 ++++++++++++++++++ .../test/helper.ts | 296 +++---- .../test/protobuf-ts-utils.ts | 111 +++ 13 files changed, 1440 insertions(+), 266 deletions(-) create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/.gitignore create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts create mode 100644 experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 38d9b8397..fa0d69b50 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -81,6 +81,7 @@ All notable changes to experimental packages in this project will be documented * fix(sdk-node): use resource interface instead of concrete class [#3803](https://github.com/open-telemetry/opentelemetry-js/pull/3803) @blumamir * fix(sdk-logs): remove includeTraceContext configuration and use LogRecord context when available [#3817](https://github.com/open-telemetry/opentelemetry-js/pull/3817) @hectorhdzg +* fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods [#3804](https://github.com/open-telemetry/opentelemetry-js/pull/3804) @pichlermarc ## 0.39.1 diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore index 378eac25d..cd163f08b 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore +++ b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore @@ -1 +1,2 @@ build +test/proto diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 51b635875..f3e705dd6 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -9,7 +9,7 @@ "prepublishOnly": "npm run compile", "compile": "tsc --build", "clean": "tsc --build --clean", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", + "test": "npm run protos:generate && nyc ts-mocha -p tsconfig.json test/**/*.test.ts", "tdd": "npm run test -- --watch-extensions ts --watch", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", @@ -18,7 +18,8 @@ "watch": "tsc --build --watch", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", - "peer-api-check": "node ../../../scripts/peer-api-check.js" + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "protos:generate": "cd test/fixtures && buf generate" }, "keywords": [ "opentelemetry", @@ -45,6 +46,10 @@ "access": "public" }, "devDependencies": { + "@bufbuild/buf": "1.21.0-1", + "@protobuf-ts/grpc-transport": "2.9.0", + "@protobuf-ts/runtime-rpc": "2.9.0", + "@protobuf-ts/runtime": "2.9.0", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts index c61edf771..9e26062d1 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts @@ -22,9 +22,8 @@ import type { GrpcJsInstrumentation } from './'; import type { GrpcClientFunc, SendUnaryDataCallback } from './types'; import type { metadataCaptureType } from '../internal-types'; -import { SpanStatusCode, propagation, context } from '@opentelemetry/api'; +import { propagation, context } from '@opentelemetry/api'; import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import { CALL_SPAN_ENDED } from './serverUtils'; import { AttributeNames } from '../enums/AttributeNames'; import { GRPC_STATUS_CODE_OK } from '../status-code'; import { @@ -32,6 +31,7 @@ import { _grpcStatusCodeToOpenTelemetryStatusCode, _methodIsIgnored, } from '../utils'; +import { errorMonitor } from 'events'; /** * Parse a package method list and return a list of methods to patch @@ -63,6 +63,91 @@ export function getMethodsToWrap( return methodList; } +/** + * Patches a callback so that the current span for this trace is also ended + * when the callback is invoked. + */ +export function patchedCallback( + span: Span, + callback: SendUnaryDataCallback +) { + const wrappedFn: SendUnaryDataCallback = ( + err: grpcJs.ServiceError | null, + res?: ResponseType + ) => { + if (err) { + if (err.code) { + span.setStatus(_grpcStatusCodeToSpanStatus(err.code)); + span.setAttribute(SemanticAttributes.RPC_GRPC_STATUS_CODE, err.code); + } + span.setAttributes({ + [AttributeNames.GRPC_ERROR_NAME]: err.name, + [AttributeNames.GRPC_ERROR_MESSAGE]: err.message, + }); + } else { + span.setAttribute( + SemanticAttributes.RPC_GRPC_STATUS_CODE, + GRPC_STATUS_CODE_OK + ); + } + + span.end(); + callback(err, res); + }; + return context.bind(context.active(), wrappedFn); +} + +export function patchResponseMetadataEvent( + span: Span, + call: EventEmitter, + metadataCapture: metadataCaptureType +) { + call.on('metadata', (responseMetadata: any) => { + metadataCapture.client.captureResponseMetadata(span, responseMetadata); + }); +} + +export function patchResponseStreamEvents(span: Span, call: EventEmitter) { + // Both error and status events can be emitted + // the first one emitted set spanEnded to true + let spanEnded = false; + const endSpan = () => { + if (!spanEnded) { + span.end(); + spanEnded = true; + } + }; + context.bind(context.active(), call); + call.on(errorMonitor, (err: ServiceError) => { + if (spanEnded) { + return; + } + + span.setStatus({ + code: _grpcStatusCodeToOpenTelemetryStatusCode(err.code), + message: err.message, + }); + span.setAttributes({ + [AttributeNames.GRPC_ERROR_NAME]: err.name, + [AttributeNames.GRPC_ERROR_MESSAGE]: err.message, + [SemanticAttributes.RPC_GRPC_STATUS_CODE]: err.code, + }); + + endSpan(); + }); + + call.on('status', (status: SpanStatus) => { + if (spanEnded) { + return; + } + + span.setStatus(_grpcStatusCodeToSpanStatus(status.code)); + span.setAttribute(SemanticAttributes.RPC_GRPC_STATUS_CODE, status.code); + + endSpan(); + }); +} + /** * Execute grpc client call. Apply completitionspan properties and end the * span on callback or receiving an emitted event. @@ -71,44 +156,9 @@ export function makeGrpcClientRemoteCall( metadataCapture: metadataCaptureType, original: GrpcClientFunc, args: unknown[], - metadata: Metadata, - self: Client + metadata: grpcJs.Metadata, + self: grpcJs.Client ): (span: Span) => EventEmitter { - /** - * Patches a callback so that the current span for this trace is also ended - * when the callback is invoked. - */ - function patchedCallback( - span: Span, - callback: SendUnaryDataCallback - ) { - const wrappedFn: SendUnaryDataCallback = ( - err: ServiceError | null, - res?: ResponseType - ) => { - if (err) { - if (err.code) { - span.setStatus(_grpcStatusCodeToSpanStatus(err.code)); - span.setAttribute(SemanticAttributes.RPC_GRPC_STATUS_CODE, err.code); - } - span.setAttributes({ - [AttributeNames.GRPC_ERROR_NAME]: err.name, - [AttributeNames.GRPC_ERROR_MESSAGE]: err.message, - }); - } else { - span.setStatus({ code: SpanStatusCode.UNSET }); - span.setAttribute( - SemanticAttributes.RPC_GRPC_STATUS_CODE, - GRPC_STATUS_CODE_OK - ); - } - - span.end(); - callback(err, res); - }; - return context.bind(context.active(), wrappedFn); - } - return (span: Span) => { // if unary or clientStream if (!original.responseStream) { @@ -132,67 +182,18 @@ export function makeGrpcClientRemoteCall( // if server stream or bidi if (original.responseStream) { - // Both error and status events can be emitted - // the first one emitted set spanEnded to true - let spanEnded = false; - const endSpan = () => { - if (!spanEnded) { - span.end(); - spanEnded = true; - } - }; - context.bind(context.active(), call); - call.on('error', (err: ServiceError) => { - if (call[CALL_SPAN_ENDED]) { - return; - } - call[CALL_SPAN_ENDED] = true; - - span.setStatus({ - code: _grpcStatusCodeToOpenTelemetryStatusCode(err.code), - message: err.message, - }); - span.setAttributes({ - [AttributeNames.GRPC_ERROR_NAME]: err.name, - [AttributeNames.GRPC_ERROR_MESSAGE]: err.message, - [SemanticAttributes.RPC_GRPC_STATUS_CODE]: err.code, - }); - - endSpan(); - }); - - call.on('status', (status: SpanStatus) => { - if (call[CALL_SPAN_ENDED]) { - return; - } - call[CALL_SPAN_ENDED] = true; - - span.setStatus(_grpcStatusCodeToSpanStatus(status.code)); - span.setAttribute(SemanticAttributes.RPC_GRPC_STATUS_CODE, status.code); - - endSpan(); - }); + patchResponseStreamEvents(span, call); } return call; }; } -/** - * Returns the metadata argument from user provided arguments (`args`) - */ -export function getMetadata( - this: GrpcJsInstrumentation, - original: GrpcClientFunc, - grpcClient: typeof grpcJs, - args: Array -): Metadata { - let metadata: Metadata; - +export function getMetadataIndex(args: Array): number { // This finds an instance of Metadata among the arguments. // A possible issue that could occur is if the 'options' parameter from // the user contains an '_internal_repr' as well as a 'getMap' function, // but this is an extremely rare case. - let metadataIndex = args.findIndex((arg: unknown | Metadata) => { + return args.findIndex((arg: unknown | Metadata) => { return ( arg && typeof arg === 'object' && @@ -200,22 +201,45 @@ export function getMetadata( typeof (arg as Metadata).getMap === 'function' ); }); +} + +/** + * Returns the metadata argument from user provided arguments (`args`) + * If no metadata is provided in `args`: adds empty metadata to `args` and returns that empty metadata + */ +export function extractMetadataOrSplice( + grpcLib: typeof grpcJs, + args: Array, + spliceIndex: number +) { + let metadata: grpcJs.Metadata; + const metadataIndex = getMetadataIndex(args); if (metadataIndex === -1) { - metadata = new grpcClient.Metadata(); - if (!original.requestStream) { - // unary or server stream - metadataIndex = 1; - } else { - // client stream or bidi - metadataIndex = 0; - } - args.splice(metadataIndex, 0, metadata); + // Create metadata if it does not exist + metadata = new grpcLib.Metadata(); + args.splice(spliceIndex, 0, metadata); } else { metadata = args[metadataIndex] as Metadata; } return metadata; } +/** + * Returns the metadata argument from user provided arguments (`args`) + * Adds empty metadata to arguments if the default is used. + */ +export function extractMetadataOrSpliceDefault( + grpcClient: typeof grpcJs, + original: GrpcClientFunc, + args: Array +): grpcJs.Metadata { + return extractMetadataOrSplice( + grpcClient, + args, + original.requestStream ? 0 : 1 + ); +} + /** * Inject opentelemetry trace context into `metadata` for use by another * grpc receiver diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts index 72ad45e3b..36be79fd0 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts @@ -26,6 +26,7 @@ import type { loadPackageDefinition, GrpcObject, } from '@grpc/grpc-js'; + import type * as grpcJs from '@grpc/grpc-js'; import type { @@ -36,6 +37,7 @@ import type { MakeClientConstructorFunction, PackageDefinition, GrpcClientFunc, + ClientRequestFunction, } from './types'; import type { GrpcInstrumentationConfig } from '../types'; import type { metadataCaptureType } from '../internal-types'; @@ -47,6 +49,7 @@ import { SpanOptions, SpanKind, trace, + Span, } from '@opentelemetry/api'; import { InstrumentationNodeModuleDefinition, @@ -63,9 +66,19 @@ import { import { getMethodsToWrap, makeGrpcClientRemoteCall, - getMetadata, + extractMetadataOrSpliceDefault, + setSpanContext, + patchedCallback, + patchResponseStreamEvents, + patchResponseMetadataEvent, + extractMetadataOrSplice, } from './clientUtils'; -import { _extractMethodAndService, metadataCapture, URI_REGEX } from '../utils'; +import { + _extractMethodAndService, + metadataCapture, + URI_REGEX, + _methodIsIgnored, +} from '../utils'; import { AttributeValues } from '../enums/AttributeValues'; export class GrpcJsInstrumentation extends InstrumentationBase { @@ -121,6 +134,41 @@ export class GrpcJsInstrumentation extends InstrumentationBase { 'loadPackageDefinition', this._patchLoadPackageDefinition(moduleExports) ); + if (isWrapped(moduleExports.Client.prototype)) { + this._unwrap(moduleExports.Client.prototype, 'makeUnaryRequest'); + this._unwrap( + moduleExports.Client.prototype, + 'makeClientStreamRequest' + ); + this._unwrap( + moduleExports.Client.prototype, + 'makeServerStreamRequest' + ); + this._unwrap( + moduleExports.Client.prototype, + 'makeBidiStreamRequest' + ); + } + this._wrap( + moduleExports.Client.prototype, + 'makeUnaryRequest', + this._patchClientRequestMethod(moduleExports, false) as any + ); + this._wrap( + moduleExports.Client.prototype, + 'makeClientStreamRequest', + this._patchClientRequestMethod(moduleExports, false) as any + ); + this._wrap( + moduleExports.Client.prototype, + 'makeServerStreamRequest', + this._patchClientRequestMethod(moduleExports, true) as any + ); + this._wrap( + moduleExports.Client.prototype, + 'makeBidiStreamRequest', + this._patchClientRequestMethod(moduleExports, true) as any + ); return moduleExports; }, (moduleExports, version) => { @@ -131,6 +179,16 @@ export class GrpcJsInstrumentation extends InstrumentationBase { this._unwrap(moduleExports, 'makeClientConstructor'); this._unwrap(moduleExports, 'makeGenericClientConstructor'); this._unwrap(moduleExports, 'loadPackageDefinition'); + this._unwrap(moduleExports.Client.prototype, 'makeUnaryRequest'); + this._unwrap( + moduleExports.Client.prototype, + 'makeClientStreamRequest' + ); + this._unwrap( + moduleExports.Client.prototype, + 'makeServerStreamRequest' + ); + this._unwrap(moduleExports.Client.prototype, 'makeBidiStreamRequest'); } ), ]; @@ -257,6 +315,84 @@ export class GrpcJsInstrumentation extends InstrumentationBase { }; } + /** + * Patch for grpc.Client.make*Request(...) functions. + * Provides auto-instrumentation for client requests when using a Client without + * makeGenericClientConstructor/makeClientConstructor + */ + private _patchClientRequestMethod( + grpcLib: typeof grpcJs, + hasResponseStream: boolean + ): ( + original: ClientRequestFunction + ) => ClientRequestFunction { + const instrumentation = this; + return (original: ClientRequestFunction) => { + instrumentation._diag.debug( + 'patched makeClientStreamRequest on grpc client' + ); + + return function makeClientStreamRequest(this: grpcJs.Client) { + // method must always be at first position + const method = arguments[0]; + const { name, service, methodAttributeValue } = + instrumentation._splitMethodString(method); + + // Do not attempt to trace/inject context if method is ignored + if ( + method != null && + _methodIsIgnored( + methodAttributeValue, + instrumentation.getConfig().ignoreGrpcMethods + ) + ) { + return original.apply(this, [...arguments]); + } + + const modifiedArgs = [...arguments]; + const metadata = extractMetadataOrSplice(grpcLib, modifiedArgs, 4); + + const span = instrumentation.createClientSpan( + name, + methodAttributeValue, + service, + metadata + ); + instrumentation.extractNetMetadata(this, span); + + // Callback is only present when there is no responseStream + if (!hasResponseStream) { + // Replace the callback with the patched one if it is there. + // If the callback arg is not a function on the last position then the client will throw + // and never call the callback -> so there's nothing to patch + const lastArgIndex = modifiedArgs.length - 1; + const callback = modifiedArgs[lastArgIndex]; + if (typeof callback === 'function') { + modifiedArgs[lastArgIndex] = patchedCallback(span, callback); + } + } + + return context.with(trace.setSpan(context.active(), span), () => { + setSpanContext(metadata); + + const call = original.apply(this, [...modifiedArgs]); + patchResponseMetadataEvent( + span, + call, + instrumentation._metadataCapture + ); + + // Subscribe to response stream events when there's a response stream. + if (hasResponseStream) { + patchResponseStreamEvents(span, call); + } + + return call; + }); + }; + }; + } + /** * Entry point for applying client patches to `grpc.makeClientConstructor(...)` equivalents * @param this GrpcJsPlugin @@ -320,10 +456,10 @@ export class GrpcJsInstrumentation extends InstrumentationBase { function clientMethodTrace(this: Client) { const name = `grpc.${original.path.replace('/', '')}`; const args = [...arguments]; - const metadata = getMetadata.call( + const metadata = extractMetadataOrSpliceDefault.call( instrumentation, - original, grpcClient, + original, args ); const { service, method } = _extractMethodAndService(original.path); @@ -335,18 +471,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { [SemanticAttributes.RPC_METHOD]: method, [SemanticAttributes.RPC_SERVICE]: service, }); - // set net.peer.* from target (e.g., "dns:otel-productcatalogservice:8080") as a hint to APMs - const parsedUri = URI_REGEX.exec(this.getChannel().getTarget()); - if (parsedUri != null && parsedUri.groups != null) { - span.setAttribute( - SemanticAttributes.NET_PEER_NAME, - parsedUri.groups['name'] - ); - span.setAttribute( - SemanticAttributes.NET_PEER_PORT, - parseInt(parsedUri.groups['port']) - ); - } + instrumentation.extractNetMetadata(this, span); instrumentation._metadataCapture.client.captureRequestMetadata( span, @@ -368,6 +493,51 @@ export class GrpcJsInstrumentation extends InstrumentationBase { }; } + private _splitMethodString(method: string) { + if (method == null) { + return { name: '', service: '', methodAttributeValue: '' }; + } + const name = `grpc.${method.replace('/', '')}`; + const { service, method: methodAttributeValue } = + _extractMethodAndService(method); + return { name, service, methodAttributeValue }; + } + + private createClientSpan( + name: string, + methodAttributeValue: string, + service: string, + metadata?: grpcJs.Metadata + ) { + const span = this.tracer + .startSpan(name, { kind: SpanKind.CLIENT }) + .setAttributes({ + [SemanticAttributes.RPC_SYSTEM]: 'grpc', + [SemanticAttributes.RPC_METHOD]: methodAttributeValue, + [SemanticAttributes.RPC_SERVICE]: service, + }); + + if (metadata != null) { + this._metadataCapture.client.captureRequestMetadata(span, metadata); + } + return span; + } + + private extractNetMetadata(client: grpcJs.Client, span: Span) { + // set net.peer.* from target (e.g., "dns:otel-productcatalogservice:8080") as a hint to APMs + const parsedUri = URI_REGEX.exec(client.getChannel().getTarget()); + if (parsedUri != null && parsedUri.groups != null) { + span.setAttribute( + SemanticAttributes.NET_PEER_NAME, + parsedUri.groups['name'] + ); + span.setAttribute( + SemanticAttributes.NET_PEER_PORT, + parseInt(parsedUri.groups['port']) + ); + } + } + /** * Utility function to patch *all* functions loaded through a proto file. * Recursively searches for Client classes and patches all methods, reversing the diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts index e9f15b45a..06ca7c0b6 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts @@ -64,6 +64,10 @@ export type GrpcClientFunc = ((...args: unknown[]) => GrpcEmitter) & { export type ServerRegisterFunction = typeof Server.prototype.register; +export type ClientRequestFunction = ( + ...args: unknown[] +) => ReturnType; + export type MakeClientConstructorFunction = typeof makeGenericClientConstructor; export type { HandleCall } from '@grpc/grpc-js/build/src/server-call'; diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/.gitignore b/experimental/packages/opentelemetry-instrumentation-grpc/test/.gitignore new file mode 100644 index 000000000..c9438a302 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/.gitignore @@ -0,0 +1 @@ +/proto diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml new file mode 100644 index 000000000..a0aba044f --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.gen.yaml @@ -0,0 +1,9 @@ +version: v1 +plugins: + - plugin: buf.build/community/timostamm-protobuf-ts:v2.9.0 + out: ../../test/proto/ts/fixtures + opt: + - long_type_string + - generate_dependencies + - ts_nocheck + diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock new file mode 100644 index 000000000..65d8f1f75 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.lock @@ -0,0 +1,8 @@ +# Generated by buf. DO NOT EDIT. +version: v1 +deps: + - remote: buf.build + owner: googleapis + repository: googleapis + commit: cc916c31859748a68fd229a3c8d7a2e8 + digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8 diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml new file mode 100644 index 000000000..dc977e439 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/buf.yaml @@ -0,0 +1,9 @@ +version: v1 +lint: + use: + - DEFAULT +breaking: + use: + - FILE +deps: + - buf.build/googleapis/googleapis diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts new file mode 100644 index 000000000..8e238a6ac --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-protobuf-ts.test.ts @@ -0,0 +1,831 @@ +/* + * 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 { GrpcInstrumentation } from '../src'; + +const instrumentation = new GrpcInstrumentation(); +instrumentation.enable(); +instrumentation.disable(); + +import { GrpcTransport } from '@protobuf-ts/grpc-transport'; +import * as grpc from '@grpc/grpc-js'; +import { GrpcTesterClient } from './proto/ts/fixtures/grpc-test.client'; +import { + InMemorySpanExporter, + NodeTracerProvider, + SimpleSpanProcessor, +} from '@opentelemetry/sdk-trace-node'; +import * as protoLoader from '@grpc/proto-loader'; +import * as path from 'path'; +import * as assert from 'assert'; +import { + context, + ContextManager, + propagation, + SpanKind, + trace, +} from '@opentelemetry/api'; +import { W3CTraceContextPropagator } from '@opentelemetry/core'; +import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; +import { startServer } from './helper'; +import { + assertExportedSpans, + assertNoSpansExported, + SpanAssertionFunction, + TestFunction, +} from './protobuf-ts-utils'; + +const memoryExporter = new InMemorySpanExporter(); +const PROTO_PATH = path.resolve(__dirname, './fixtures/grpc-test.proto'); +const NO_ERROR = grpc.status.UNAUTHENTICATED + 1; + +/** + * Creates a client generated via protobuf-ts that is using the {@link grpc.Client} class + * directly. + */ +function createClient() { + return new GrpcTesterClient( + new GrpcTransport({ + host: 'localhost:3333', + channelCredentials: grpc.credentials.createInsecure(), + }) + ); +} + +/** + * Loads the server from proto and starts it on port 3333. + */ +async function loadAndStartServer() { + const options = { + keepCase: true, + longs: String, + enums: String, + defaults: true, + oneofs: true, + }; + + // Reloading from proto is needed as only servers loaded after the + // instrumentation is enabled will be instrumented. + const packageDefinition = await protoLoader.load(PROTO_PATH, options); + const proto = grpc.loadPackageDefinition(packageDefinition).pkg_test; + return startServer(proto, 3333); +} + +/** + * Creates a list of test data that includes all possible cases of status codes + * returned by the server, the input for the server to provoke the status codes, + * and the expected result code that should be present on the span. + */ +function getStatusCodeTestData(): { + // Name of the key used in the test (OK, UNAUTHENTICATED, DATA_LOSS, ...) + key: string; + // Input for the server implementation that will provoke the status code from 'key' + input: number; + // The result code that should be present on the created span + expectedResultCode: number; +}[] { + const codes = Object.keys(grpc.status) + .filter(key => !isNaN(Number(grpc.status[key as any]))) + // Remove 'OK' as the test server has special behavior to provoke an 'OK' response + .filter(key => key !== 'OK') + // Create the test data + .map(key => { + return { + key: key, + input: Number(grpc.status[key as any]), + expectedResultCode: Number(grpc.status[key as any]), + }; + }); + + // Push 'OK' with special input to provoke 'OK' response from test-server + codes.push({ + key: 'OK', + input: NO_ERROR, + expectedResultCode: grpc.status.OK, + }); + + return codes; +} + +/** + * Creates tests that assert that no spans are created. + * @param statusCodeTestWithRootSpan function that creates tests that include a root span + * @param statusCodeTestNoRootSpan function that creates tests that do not include a root span + */ +function shouldNotCreateSpans( + statusCodeTestWithRootSpan: TestFunction, + statusCodeTestNoRootSpan: TestFunction +) { + describe('with root span', () => { + getStatusCodeTestData().forEach(({ key, input, expectedResultCode }) => { + statusCodeTestWithRootSpan( + input, + key, + expectedResultCode, + assertNoSpansExported + ); + }); + }); + + describe('without root span', () => { + getStatusCodeTestData().forEach(({ key, input, expectedResultCode }) => { + statusCodeTestNoRootSpan( + input, + key, + expectedResultCode, + assertNoSpansExported + ); + }); + }); +} + +describe('#grpc-protobuf', () => { + let client: GrpcTesterClient; + let server: grpc.Server; + const provider = new NodeTracerProvider(); + let contextManager: ContextManager; + provider.addSpanProcessor(new SimpleSpanProcessor(memoryExporter)); + + before(() => { + propagation.setGlobalPropagator(new W3CTraceContextPropagator()); + instrumentation.setTracerProvider(provider); + }); + + beforeEach(() => { + memoryExporter.reset(); + contextManager = new AsyncHooksContextManager().enable(); + context.setGlobalContextManager(contextManager); + }); + + describe('client', async () => { + beforeEach(async () => { + instrumentation.enable(); + client = createClient(); + + server = await loadAndStartServer(); + }); + + afterEach(done => { + context.disable(); + server.tryShutdown(() => { + instrumentation.disable(); + done(); + }); + }); + + describe('makeUnaryRequest()', async () => { + async function act(status: number) { + return client.unaryMethod({ + num: status, + }); + } + + function statusCodeTestNoRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, async () => { + // Act + try { + const request = await act(input); + // Assert success results + assert.strictEqual(request.response.num, input); + } catch (e) { + // Assert failure results + assert.strictEqual(e.code, key); + } + // Assert span data + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'UnaryMethod', + expectedSpanStatus + ); + }); + } + + function statusCodeTestWithRootSpan( + input: number, + key: string, + expectedResultCode: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, async () => { + // Arrange + const span = provider + .getTracer('default') + .startSpan('TestSpan', { kind: SpanKind.PRODUCER }); + return context.with( + trace.setSpan(context.active(), span), + async () => { + const rootSpan = trace.getSpan(context.active()); + assert.ok(rootSpan != null); + assert.deepStrictEqual(rootSpan, span); + + // Act + try { + const request = await act(input); + // Assert success results + assert.strictEqual(request.response.num, input); + } catch (e) { + // Assert failure results + assert.strictEqual(e.code, key); + } + + // Assert + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'UnaryMethod', + expectedResultCode, + rootSpan + ); + } + ); + }); + } + + describe('should create root client span and server child span', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestNoRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should create child client span when parent span exists', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestWithRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should not create any spans when disabled', () => { + beforeEach(done => { + instrumentation.disable(); + server.tryShutdown(() => { + loadAndStartServer().then(loadedServer => { + server = loadedServer; + done(); + }); + }); + }); + + afterEach(() => { + instrumentation.enable(); + }); + + shouldNotCreateSpans( + statusCodeTestWithRootSpan, + statusCodeTestNoRootSpan + ); + }); + }); + + describe('makeClientStreamRequest()', () => { + async function act(input: number) { + const call = client.clientStreamMethod({ + num: input, + }); + + await call.requests.send({ num: input }); + await call.requests.send({ num: input }); + await call.requests.complete(); + + return await call.response; + } + + async function statusCodeTestNoRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, async () => { + // Act + try { + const response = await act(input); + // Assert success results + assert.strictEqual(response.num, input * 2); + } catch (e) { + // Assert failure results + assert.strictEqual(e.code, key); + } + + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'ClientStreamMethod', + expectedSpanStatus + ); + }); + } + + async function statusCodeTestWithRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, async () => { + // Arrange + const span = provider + .getTracer('default') + .startSpan('TestSpan', { kind: SpanKind.PRODUCER }); + return context.with( + trace.setSpan(context.active(), span), + async () => { + const rootSpan = trace.getSpan(context.active()); + assert.ok(rootSpan != null); + assert.deepStrictEqual(rootSpan, span); + + // Act + try { + const response = await act(input); + // Assert success results + assert.strictEqual(response.num, input * 2); + } catch (e) { + // Assert failure results + assert.strictEqual(e.code, key); + } + + // Assert + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'ClientStreamMethod', + expectedSpanStatus, + rootSpan + ); + } + ); + }); + } + + describe('should create root client span and server child span', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestNoRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should create child client span when parent span exists', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestWithRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should not create any spans when disabled', () => { + beforeEach(done => { + instrumentation.disable(); + server.tryShutdown(() => { + loadAndStartServer().then(loadedServer => { + server = loadedServer; + done(); + }); + }); + }); + + afterEach(() => { + instrumentation.enable(); + }); + + shouldNotCreateSpans( + statusCodeTestWithRootSpan, + statusCodeTestNoRootSpan + ); + }); + }); + + describe('makeServerStreamRequest()', () => { + function statusCodeTestNoRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, done => { + const serverStream = client.serverStreamMethod({ + num: input, + }); + + serverStream.responses.onMessage(message => { + assert.strictEqual(message.num, input); + }); + + function completeCallback() { + try { + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'ServerStreamMethod', + expectedSpanStatus + ); + } catch (err) { + // catch error and call done() to ensure an error message + // is shown in the test results instead of a test timeout + done(err); + return; + } + done(); + } + + serverStream.responses.onError(completeCallback); + serverStream.responses.onComplete(completeCallback); + }); + } + + function statusCodeTestWithRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, done => { + // Arrange + const span = provider + .getTracer('default') + .startSpan('TestSpan', { kind: SpanKind.PRODUCER }); + context.with(trace.setSpan(context.active(), span), async () => { + const rootSpan = trace.getSpan(context.active()); + assert.ok(rootSpan != null); + assert.deepStrictEqual(rootSpan, span); + + // Act + const serverStream = client.serverStreamMethod({ + num: input, + }); + + serverStream.responses.onMessage(message => { + assert.strictEqual(message.num, input); + }); + + function completeCallback() { + try { + // Assert + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'ServerStreamMethod', + expectedSpanStatus, + rootSpan + ); + } catch (err) { + // catch error and call done() to ensure an error message + // is shown in the test results instead of a test timeout + done(err); + return; + } + done(); + } + + serverStream.responses.onError(completeCallback); + serverStream.responses.onComplete(completeCallback); + }); + }); + } + + describe('should create root client span and server child span', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestNoRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should create child client span when parent span exists', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestWithRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should not create any spans when disabled', () => { + beforeEach(done => { + instrumentation.disable(); + server.tryShutdown(() => { + loadAndStartServer().then(loadedServer => { + server = loadedServer; + done(); + }); + }); + }); + + afterEach(() => { + instrumentation.enable(); + }); + + shouldNotCreateSpans( + statusCodeTestWithRootSpan, + statusCodeTestNoRootSpan + ); + }); + }); + + describe('makeBidiStreamRequest()', () => { + function statusCodeTestNoRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, done => { + const bidiStream = client.bidiStreamMethod(); + + bidiStream.responses.onMessage(message => { + assert.strictEqual(message.num, input); + }); + + function completeHandler() { + try { + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'BidiStreamMethod', + expectedSpanStatus + ); + } catch (err) { + // catch error and call done() to ensure an error message + // is shown in the test results instead of a test timeout + done(err); + return; + } + done(); + } + + bidiStream.responses.onError(completeHandler); + bidiStream.responses.onComplete(completeHandler); + + bidiStream.requests.send({ + num: input, + }); + bidiStream.requests.send({ + num: input, + }); + bidiStream.requests.complete(); + }); + } + + function statusCodeTestWithRootSpan( + input: number, + key: string, + expectedSpanStatus: number, + assertSpans: SpanAssertionFunction + ) { + it('with status code: ' + key, done => { + // Arrange + const span = provider + .getTracer('default') + .startSpan('TestSpan', { kind: SpanKind.PRODUCER }); + context.with(trace.setSpan(context.active(), span), () => { + const rootSpan = trace.getSpan(context.active()); + assert.ok(rootSpan != null); + assert.deepStrictEqual(rootSpan, span); + + // Act + const bidiStream = client.bidiStreamMethod(); + + function completeHandler() { + try { + assertSpans( + memoryExporter, + 'pkg_test.GrpcTester', + 'BidiStreamMethod', + expectedSpanStatus, + rootSpan + ); + } catch (err) { + // catch error and call done() to ensure an error message + // is shown in the test results instead of a test timeout + done(err); + return; + } + done(); + } + + bidiStream.responses.onMessage(message => { + assert.strictEqual(message.num, input); + }); + + bidiStream.responses.onError(completeHandler); + bidiStream.responses.onComplete(completeHandler); + + bidiStream.requests.send({ + num: input, + }); + bidiStream.requests.send({ + num: input, + }); + bidiStream.requests.complete(); + }); + }); + } + + describe('should create root client span and server child span', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestNoRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should create child client span when parent span exists', () => { + getStatusCodeTestData().forEach( + ({ key, input, expectedResultCode }) => { + statusCodeTestWithRootSpan( + input, + key, + expectedResultCode, + assertExportedSpans + ); + } + ); + }); + + describe('should not create any spans when disabled', () => { + beforeEach(done => { + instrumentation.disable(); + server.tryShutdown(() => { + loadAndStartServer().then(loadedServer => { + server = loadedServer; + done(); + }); + }); + }); + + afterEach(() => { + instrumentation.enable(); + }); + + shouldNotCreateSpans( + statusCodeTestWithRootSpan, + statusCodeTestNoRootSpan + ); + }); + }); + }); + + describe('should not produce telemetry when ignored via config', () => { + beforeEach(async () => { + instrumentation.disable(); + instrumentation.setConfig({ + ignoreGrpcMethods: [ + 'UnaryMethod', + new RegExp(/^camel.*Method$/), + (str: string) => str === 'BidiStreamMethod', + ], + }); + instrumentation.enable(); + client = createClient(); + + server = await loadAndStartServer(); + }); + + it('when filtered by exact string', async () => { + await client.unaryMethod({ num: NO_ERROR }); + assertNoSpansExported( + memoryExporter, + 'pkg_test.GrpcTester', + 'UnaryMethod', + grpc.status.OK + ); + }); + + it('when filtered by RegExp', async () => { + await client.camelCaseMethod({ num: NO_ERROR }); + assertNoSpansExported( + memoryExporter, + 'pkg_test.GrpcTester', + 'UnaryMethod', + grpc.status.OK + ); + }); + + it('when filtered by predicate', done => { + const stream = client.bidiStreamMethod({ num: NO_ERROR }); + stream.requests.send({ + num: NO_ERROR, + }); + stream.requests.complete(); + + stream.responses.onComplete(() => { + assertNoSpansExported( + memoryExporter, + 'pkg_test.GrpcTester', + 'UnaryMethod', + grpc.status.OK + ); + done(); + }); + }); + + afterEach(done => { + instrumentation.setConfig({}); + context.disable(); + server.tryShutdown(() => { + instrumentation.disable(); + done(); + }); + }); + }); + + describe('should capture metadata when set up in config', () => { + beforeEach(async () => { + instrumentation.setConfig({ + metadataToSpanAttributes: { + client: { + requestMetadata: ['client_metadata_key'], + responseMetadata: ['server_metadata_key'], + }, + server: { + requestMetadata: ['client_metadata_key'], + responseMetadata: ['server_metadata_key'], + }, + }, + }); + instrumentation.enable(); + client = createClient(); + + server = await loadAndStartServer(); + }); + + it('should capture client metadata', async () => { + await client.unaryMethod( + { num: NO_ERROR }, + { + meta: { + client_metadata_key: 'client_metadata_value', + }, + } + ); + const spans = memoryExporter.getFinishedSpans(); + assert.equal( + spans[0].attributes['rpc.request.metadata.client_metadata_key'], + 'client_metadata_value' + ); + }); + + afterEach(done => { + instrumentation.setConfig({}); + context.disable(); + server.tryShutdown(() => { + instrumentation.disable(); + done(); + }); + }); + }); +}); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index 693cdeab4..9d861fd65 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -34,18 +34,18 @@ import * as assert from 'assert'; import * as protoLoader from '@grpc/proto-loader'; import { status as GrpcStatus, - requestCallback, ServerUnaryCall, + requestCallback, ServerReadableStream, - ServerWritableStream, ServerDuplexStream, + ServerWritableStream, Client, Metadata, ServiceError, Server, - ServerCredentials, credentials, loadPackageDefinition, + ServerCredentials, } from '@grpc/grpc-js'; import { assertPropagation, assertSpan } from './utils/assertionUtils'; import { promisify } from 'util'; @@ -109,13 +109,149 @@ const checkEqual = ? requestEqual(x)(y) : false; +const replicate = (request: TestRequestResponse) => { + const result: TestRequestResponse[] = []; + for (let i = 0; i < request.num; i++) { + result.push(request); + } + return result; +}; + +export async function startServer(proto: any, port: number) { + const MAX_ERROR_STATUS = GrpcStatus.UNAUTHENTICATED; + const server = new Server(); + + function getError(msg: string, code: number): ServiceError | null { + const err: ServiceError = { + ...new Error(msg), + name: msg, + message: msg, + code, + details: msg, + metadata: new Metadata(), + }; + return err; + } + + server.addService(proto.GrpcTester.service, { + // An error is emitted every time + // request.num <= MAX_ERROR_STATUS = (status.UNAUTHENTICATED) + // in those cases, erro.code = request.num + + // This method returns the request + // This method returns the request + unaryMethodWithMetadata( + call: ServerUnaryCall, + callback: requestCallback + ) { + const serverMetadata: any = new Metadata(); + serverMetadata.add('server_metadata_key', 'server_metadata_value'); + + call.sendMetadata(serverMetadata); + + call.request.num <= MAX_ERROR_STATUS + ? callback( + getError( + 'Unary Method with Metadata Error', + call.request.num + ) as ServiceError + ) + : callback(null, { num: call.request.num }); + }, + + // This method returns the request + unaryMethod( + call: ServerUnaryCall, + callback: requestCallback + ) { + call.request.num <= MAX_ERROR_STATUS + ? callback( + getError('Unary Method Error', call.request.num) as ServiceError + ) + : callback(null, { num: call.request.num }); + }, + + // This method returns the request + camelCaseMethod( + call: ServerUnaryCall, + callback: requestCallback + ) { + call.request.num <= MAX_ERROR_STATUS + ? callback( + getError('Unary Method Error', call.request.num) as ServiceError + ) + : callback(null, { num: call.request.num }); + }, + + // This method sums the requests + clientStreamMethod( + call: ServerReadableStream, + callback: requestCallback + ) { + let sum = 0; + let hasError = false; + let code = GrpcStatus.OK; + call.on('data', (data: TestRequestResponse) => { + sum += data.num; + if (data.num <= MAX_ERROR_STATUS) { + hasError = true; + code = data.num; + } + }); + call.on('end', () => { + hasError + ? callback(getError('Client Stream Method Error', code) as any) + : callback(null, { num: sum }); + }); + }, + + // This method returns an array that replicates the request, request.num of + // times + serverStreamMethod: (call: ServerWritableStream) => { + const result = replicate(call.request); + + if (call.request.num <= MAX_ERROR_STATUS) { + call.emit( + 'error', + getError('Server Stream Method Error', call.request.num) + ); + } else { + result.forEach(element => { + call.write(element); + }); + } + call.end(); + }, + + // This method returns the request + bidiStreamMethod: (call: ServerDuplexStream) => { + call.on('data', (data: TestRequestResponse) => { + if (data.num <= MAX_ERROR_STATUS) { + call.emit('error', getError('Server Stream Method Error', data.num)); + } else { + call.write(data); + } + }); + call.on('end', () => { + call.end(); + }); + }, + }); + const bindAwait = promisify(server.bindAsync); + await bindAwait.call( + server, + 'localhost:' + port, + ServerCredentials.createInsecure() + ); + server.start(); + return server; +} + export const runTests = ( plugin: GrpcInstrumentation, moduleName: string, grpcPort: number ) => { - const MAX_ERROR_STATUS = GrpcStatus.UNAUTHENTICATED; - const grpcClient = { unaryMethodWithMetadata: ( client: TestGrpcClient, @@ -275,138 +411,6 @@ export const runTests = ( let server: Server; let client: Client; - const replicate = (request: TestRequestResponse) => { - const result: TestRequestResponse[] = []; - for (let i = 0; i < request.num; i++) { - result.push(request); - } - return result; - }; - - async function startServer(proto: any) { - const server = new Server(); - - function getError(msg: string, code: number): ServiceError | null { - const err: ServiceError = { - ...new Error(msg), - name: msg, - message: msg, - code, - details: msg, - metadata: new Metadata(), - }; - return err; - } - - server.addService(proto.GrpcTester.service, { - // An error is emitted every time - // request.num <= MAX_ERROR_STATUS = (status.UNAUTHENTICATED) - // in those cases, erro.code = request.num - - // This method returns the request - unaryMethodWithMetadata( - call: ServerUnaryCall, - callback: requestCallback - ) { - const serverMetadata = new Metadata(); - serverMetadata.add('server_metadata_key', 'server_metadata_value'); - - call.sendMetadata(serverMetadata); - - call.request.num <= MAX_ERROR_STATUS - ? callback( - getError('Unary Method with Metadata Error', call.request.num) - ) - : callback(null, { num: call.request.num }); - }, - - // This method returns the request - unaryMethod( - call: ServerUnaryCall, - callback: requestCallback - ) { - call.request.num <= MAX_ERROR_STATUS - ? callback(getError('Unary Method Error', call.request.num)) - : callback(null, { num: call.request.num }); - }, - - // This method returns the request - camelCaseMethod( - call: ServerUnaryCall, - callback: requestCallback - ) { - call.request.num <= MAX_ERROR_STATUS - ? callback(getError('Unary Method Error', call.request.num)) - : callback(null, { num: call.request.num }); - }, - - // This method sums the requests - clientStreamMethod( - call: ServerReadableStream, - callback: requestCallback - ) { - let sum = 0; - let hasError = false; - let code = GrpcStatus.OK; - call.on('data', (data: TestRequestResponse) => { - sum += data.num; - if (data.num <= MAX_ERROR_STATUS) { - hasError = true; - code = data.num; - } - }); - call.on('end', () => { - hasError - ? callback(getError('Client Stream Method Error', code) as any) - : callback(null, { num: sum }); - }); - }, - - // This method returns an array that replicates the request, request.num of - // times - serverStreamMethod: (call: ServerWritableStream) => { - const result = replicate(call.request); - - if (call.request.num <= MAX_ERROR_STATUS) { - call.emit( - 'error', - getError('Server Stream Method Error', call.request.num) - ); - } else { - result.forEach(element => { - call.write(element); - }); - } - call.end(); - }, - - // This method returns the request - bidiStreamMethod: (call: ServerDuplexStream) => { - call.on('data', (data: TestRequestResponse) => { - if (data.num <= MAX_ERROR_STATUS) { - call.emit( - 'error', - getError('Server Stream Method Error', data.num) - ); - } else { - call.write(data); - } - }); - call.on('end', () => { - call.end(); - }); - }, - }); - const bindAwait = promisify(server.bindAsync); - await bindAwait.call( - server, - 'localhost:' + grpcPort, - ServerCredentials.createInsecure() - ); - server.start(); - return server; - } - function createClient(proto: any) { return new proto.GrpcTester( 'localhost:' + grpcPort, @@ -590,9 +594,7 @@ export const runTests = ( .startSpan('TestSpan', { kind: SpanKind.PRODUCER }); return context.with(trace.setSpan(context.active(), span), async () => { const rootSpan = trace.getSpan(context.active()); - if (!rootSpan) { - return assert.ok(false); - } + assert.ok(rootSpan != null); assert.deepStrictEqual(rootSpan, span); const args = [client, method.request, method.metadata]; @@ -706,9 +708,7 @@ export const runTests = ( .startSpan('TestSpan', { kind: SpanKind.PRODUCER }); return context.with(trace.setSpan(context.active(), span), async () => { const rootSpan = trace.getSpan(context.active()); - if (!rootSpan) { - return assert.ok(false); - } + assert.ok(rootSpan != null); assert.deepStrictEqual(rootSpan, span); const args = [client, insertError(method.request)(errorCode)]; @@ -768,7 +768,7 @@ export const runTests = ( const packageDefinition = await protoLoader.load(PROTO_PATH, options); const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(proto); + server = await startServer(proto, grpcPort); client = createClient(proto); }); @@ -811,7 +811,7 @@ export const runTests = ( const packageDefinition = await protoLoader.load(PROTO_PATH, options); const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(proto); + server = await startServer(proto, grpcPort); client = createClient(proto); }); @@ -845,7 +845,7 @@ export const runTests = ( const packageDefinition = await protoLoader.load(PROTO_PATH, options); const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(proto); + server = await startServer(proto, grpcPort); client = createClient(proto); }); @@ -889,7 +889,7 @@ export const runTests = ( const packageDefinition = await protoLoader.load(PROTO_PATH, options); const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(proto); + server = await startServer(proto, grpcPort); client = createClient(proto); }); @@ -976,7 +976,7 @@ export const runTests = ( const packageDefinition = await protoLoader.load(PROTO_PATH, options); const proto = loadPackageDefinition(packageDefinition).pkg_test; - server = await startServer(proto); + server = await startServer(proto, grpcPort); client = createClient(proto); }); diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts new file mode 100644 index 000000000..2fc2a3d1b --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts @@ -0,0 +1,111 @@ +/* + * 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 { Span, SpanKind } from '@opentelemetry/api'; +import * as assert from 'assert'; + +import { + InMemorySpanExporter, + ReadableSpan, +} from '@opentelemetry/sdk-trace-base'; +import { assertPropagation, assertSpan } from './utils/assertionUtils'; +import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; + +export type SpanAssertionFunction = ( + exporter: InMemorySpanExporter, + rpcService: string, + rpcMethod: string, + expectedSpanStatus: number, + rootSpan?: Span +) => void; + +export type TestFunction = ( + input: number, + errorKey: string, + expectedResultCode: number, + assertSpans: SpanAssertionFunction +) => void; + +function validateSpans( + clientSpan: ReadableSpan, + serverSpan: ReadableSpan, + rpcService: string, + rpcMethod: string, + status: number +) { + const validations = { + name: `grpc.${rpcService}/${rpcMethod}`, + netPeerName: 'localhost', + status: status, + netPeerPort: 3333, + }; + + assert.strictEqual( + clientSpan.spanContext().traceId, + serverSpan.spanContext().traceId + ); + assertPropagation(serverSpan, clientSpan); + + assertSpan('grpc', serverSpan, SpanKind.SERVER, validations); + assertSpan('grpc', clientSpan, SpanKind.CLIENT, validations); + assert.strictEqual( + clientSpan.attributes[SemanticAttributes.RPC_METHOD], + rpcMethod + ); + assert.strictEqual( + clientSpan.attributes[SemanticAttributes.RPC_SERVICE], + rpcService + ); +} + +export function assertNoSpansExported( + exporter: InMemorySpanExporter, + _rpcService: string, + _rpcMethod: string, + _expectedSpanStatus: number, + _rootSpan?: Span +) { + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 0); +} + +export function assertExportedSpans( + exporter: InMemorySpanExporter, + rpcService: string, + rpcMethod: string, + expectedSpanStatus: number, + rootSpan?: Span +) { + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 2); + const serverSpan = spans[0]; + const clientSpan = spans[1]; + + validateSpans( + clientSpan, + serverSpan, + rpcService, + rpcMethod, + expectedSpanStatus + ); + + if (rootSpan) { + assert.strictEqual( + rootSpan?.spanContext().traceId, + serverSpan.spanContext().traceId + ); + assert.strictEqual(rootSpan?.spanContext().spanId, clientSpan.parentSpanId); + } +} From 4cffe5dfeff93071e0489f4bcdf1ec8f972753d9 Mon Sep 17 00:00:00 2001 From: Chengzhong Wu Date: Tue, 1 Aug 2023 23:16:07 +0800 Subject: [PATCH 69/94] fix(sdk-metrics): ignore invalid metric values (#3988) Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- CHANGELOG.md | 1 + packages/sdk-metrics/src/Instruments.ts | 10 ++++ packages/sdk-metrics/src/ObservableResult.ts | 20 ++++++++ packages/sdk-metrics/test/Instruments.test.ts | 34 ++++++++++++-- .../sdk-metrics/test/ObservableResult.test.ts | 46 +++++++++++++++++++ 5 files changed, 107 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5f1569a8..0266669bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup * fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions [#4014](https://github.com/open-telemetry/opentelemetry-js/pull/4014/) @aabmass +* fix(sdk-metrics): ignore invalid metric values [#3988](https://github.com/open-telemetry/opentelemetry-js/pull/3988) @legendecas ### :books: (Refine Doc) diff --git a/packages/sdk-metrics/src/Instruments.ts b/packages/sdk-metrics/src/Instruments.ts index d99c621c0..f665952f0 100644 --- a/packages/sdk-metrics/src/Instruments.ts +++ b/packages/sdk-metrics/src/Instruments.ts @@ -48,6 +48,12 @@ export class SyncInstrument { attributes: MetricAttributes = {}, context: Context = contextApi.active() ) { + if (typeof value !== 'number') { + diag.warn( + `non-number value provided to metric ${this._descriptor.name}: ${value}` + ); + return; + } if ( this._descriptor.valueType === ValueType.INT && !Number.isInteger(value) @@ -56,6 +62,10 @@ export class SyncInstrument { `INT value type cannot accept a floating-point value for ${this._descriptor.name}, ignoring the fractional digits.` ); value = Math.trunc(value); + // ignore non-finite values. + if (!Number.isInteger(value)) { + return; + } } this._writableMetricStorage.record( value, diff --git a/packages/sdk-metrics/src/ObservableResult.ts b/packages/sdk-metrics/src/ObservableResult.ts index 31e194290..9298a46d9 100644 --- a/packages/sdk-metrics/src/ObservableResult.ts +++ b/packages/sdk-metrics/src/ObservableResult.ts @@ -41,6 +41,12 @@ export class ObservableResultImpl implements ObservableResult { * Observe a measurement of the value associated with the given attributes. */ observe(value: number, attributes: MetricAttributes = {}): void { + if (typeof value !== 'number') { + diag.warn( + `non-number value provided to metric ${this._descriptor.name}: ${value}` + ); + return; + } if ( this._descriptor.valueType === ValueType.INT && !Number.isInteger(value) @@ -49,6 +55,10 @@ export class ObservableResultImpl implements ObservableResult { `INT value type cannot accept a floating-point value for ${this._descriptor.name}, ignoring the fractional digits.` ); value = Math.trunc(value); + // ignore non-finite values. + if (!Number.isInteger(value)) { + return; + } } this._buffer.set(attributes, value); } @@ -79,6 +89,12 @@ export class BatchObservableResultImpl implements BatchObservableResult { map = new AttributeHashMap(); this._buffer.set(metric, map); } + if (typeof value !== 'number') { + diag.warn( + `non-number value provided to metric ${metric._descriptor.name}: ${value}` + ); + return; + } if ( metric._descriptor.valueType === ValueType.INT && !Number.isInteger(value) @@ -87,6 +103,10 @@ export class BatchObservableResultImpl implements BatchObservableResult { `INT value type cannot accept a floating-point value for ${metric._descriptor.name}, ignoring the fractional digits.` ); value = Math.trunc(value); + // ignore non-finite values. + if (!Number.isInteger(value)) { + return; + } } map.set(attributes, value); } diff --git a/packages/sdk-metrics/test/Instruments.test.ts b/packages/sdk-metrics/test/Instruments.test.ts index 8651643fa..80f834f30 100644 --- a/packages/sdk-metrics/test/Instruments.test.ts +++ b/packages/sdk-metrics/test/Instruments.test.ts @@ -74,9 +74,14 @@ describe('Instruments', () => { }); counter.add(1); - // floating-point value should be trunc-ed. - counter.add(1.1); counter.add(1, { foo: 'bar' }); + // floating-point values should be trunc-ed. + counter.add(1.1); + // non-finite/non-number values should be ignored. + counter.add(Infinity); + counter.add(-Infinity); + counter.add(NaN); + counter.add('1' as any); await validateExport(cumulativeReader, { descriptor: { name: 'test', @@ -124,10 +129,13 @@ describe('Instruments', () => { }); counter.add(1); - // add floating-point value. - counter.add(1.1); counter.add(1, { foo: 'bar' }); + // add floating-point values. + counter.add(1.1); counter.add(1.2, { foo: 'bar' }); + // non-number values should be ignored. + counter.add('1' as any); + await validateExport(cumulativeReader, { dataPointType: DataPointType.SUM, isMonotonic: true, @@ -197,6 +205,13 @@ describe('Instruments', () => { upDownCounter.add(-1.1); upDownCounter.add(4, { foo: 'bar' }); upDownCounter.add(1.1, { foo: 'bar' }); + + // non-finite/non-number values should be ignored. + upDownCounter.add(Infinity); + upDownCounter.add(-Infinity); + upDownCounter.add(NaN); + upDownCounter.add('1' as any); + await validateExport(deltaReader, { descriptor: { name: 'test', @@ -230,6 +245,8 @@ describe('Instruments', () => { upDownCounter.add(-1.1); upDownCounter.add(4, { foo: 'bar' }); upDownCounter.add(1.1, { foo: 'bar' }); + // non-number values should be ignored. + upDownCounter.add('1' as any); await validateExport(deltaReader, { dataPointType: DataPointType.SUM, isMonotonic: false, @@ -283,6 +300,12 @@ describe('Instruments', () => { histogram.record(0.1); histogram.record(100, { foo: 'bar' }); histogram.record(0.1, { foo: 'bar' }); + // non-finite/non-number values should be ignored. + histogram.record(Infinity); + histogram.record(-Infinity); + histogram.record(NaN); + histogram.record('1' as any); + await validateExport(deltaReader, { descriptor: { name: 'test', @@ -427,6 +450,9 @@ describe('Instruments', () => { histogram.record(0.1); histogram.record(100, { foo: 'bar' }); histogram.record(0.1, { foo: 'bar' }); + // non-number values should be ignored. + histogram.record('1' as any); + await validateExport(deltaReader, { dataPointType: DataPointType.HISTOGRAM, dataPoints: [ diff --git a/packages/sdk-metrics/test/ObservableResult.test.ts b/packages/sdk-metrics/test/ObservableResult.test.ts index f07b3f9f2..9aacc4606 100644 --- a/packages/sdk-metrics/test/ObservableResult.test.ts +++ b/packages/sdk-metrics/test/ObservableResult.test.ts @@ -63,8 +63,27 @@ describe('ObservableResultImpl', () => { valueType: ValueType.INT, }); observableResult.observe(1.1, {}); + // should ignore non-finite/non-number values. + observableResult.observe(Infinity, {}); + observableResult.observe(-Infinity, {}); + observableResult.observe(NaN, {}); + assert.strictEqual(observableResult._buffer.get({}), 1); }); + + it('should ignore non-number values', () => { + const observableResult = new ObservableResultImpl({ + name: 'test', + description: '', + type: InstrumentType.COUNTER, + unit: '', + valueType: ValueType.INT, + }); + + observableResult.observe('1' as any, {}); + + assert.strictEqual(observableResult._buffer.get({}), undefined); + }); }); }); @@ -126,7 +145,34 @@ describe('BatchObservableResultImpl', () => { ); observableResult.observe(observable, 1.1, {}); + // should ignore non-finite/non-number values. + observableResult.observe(observable, Infinity, {}); + observableResult.observe(observable, -Infinity, {}); + observableResult.observe(observable, NaN, {}); assert.strictEqual(observableResult._buffer.get(observable)?.get({}), 1); }); + + it('should ignore invalid values', () => { + const observableResult = new BatchObservableResultImpl(); + const observable = new ObservableInstrument( + { + name: 'test', + description: '', + type: InstrumentType.COUNTER, + unit: '', + valueType: ValueType.INT, + }, + [], + new ObservableRegistry() + ); + + observableResult.observe(observable, '1' as any, {}); + observableResult.observe(/** invalid observable */ {} as any, 1, {}); + assert.strictEqual( + observableResult._buffer.get(observable)!.get({}), + undefined + ); + assert.strictEqual(observableResult._buffer.size, 1); + }); }); }); From 6214ca5815393c671c7933b00fe7f8ad685c22b7 Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:16:09 +0000 Subject: [PATCH 70/94] [AutoMerge] Identifying and fixing merge issues from staged repos Processing otel-js - (xS) /auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore - Re-Copying master file as size mismatch 6 !== 17 Processing otel-js-contrib - (xS) /auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.eslintignore - Re-Copying master file as size mismatch 17 !== 6 --- .../node/opentelemetry-resource-detector-container/.eslintignore | 1 - .../packages/opentelemetry-instrumentation-grpc/.eslintignore | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.eslintignore b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.eslintignore index cd163f08b..378eac25d 100644 --- a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.eslintignore +++ b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.eslintignore @@ -1,2 +1 @@ build -test/proto diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore index 378eac25d..cd163f08b 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore +++ b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore @@ -1 +1,2 @@ build +test/proto From db50d0058f2444617192706f8b50c839c8b02be5 Mon Sep 17 00:00:00 2001 From: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Date: Wed, 2 Aug 2023 09:29:58 +0300 Subject: [PATCH 71/94] chore: update patch dependencies (#1595) * fix(deps): update all patch versions * fix(hapi): fix hapi test with new @types * fix(hapi): lint --------- Co-authored-by: Mend Renovate --- .github/workflows/unit-test.yml | 2 +- .../package.json | 6 +++--- .../node/opentelemetry-resource-detector-aws/package.json | 4 ++-- .../package.json | 4 ++-- .../node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../opentelemetry-resource-detector-github/package.json | 4 ++-- .../opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 4 ++-- metapackages/auto-instrumentations-web/package.json | 6 +++--- packages/opentelemetry-host-metrics/package.json | 4 ++-- packages/opentelemetry-id-generator-aws-xray/package.json | 6 +++--- packages/opentelemetry-sampler-aws-xray/package.json | 4 ++-- plugins/node/instrumentation-amqplib/package.json | 4 ++-- plugins/node/instrumentation-dataloader/package.json | 4 ++-- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../opentelemetry-instrumentation-aws-lambda/package.json | 4 ++-- .../opentelemetry-instrumentation-aws-sdk/package.json | 4 ++-- .../opentelemetry-instrumentation-bunyan/package.json | 6 +++--- .../opentelemetry-instrumentation-cassandra/package.json | 6 +++--- .../opentelemetry-instrumentation-connect/package.json | 2 +- .../node/opentelemetry-instrumentation-dns/package.json | 4 ++-- .../opentelemetry-instrumentation-express/package.json | 6 +++--- .../opentelemetry-instrumentation-fastify/package.json | 4 ++-- .../package.json | 2 +- .../opentelemetry-instrumentation-graphql/package.json | 2 +- .../node/opentelemetry-instrumentation-hapi/package.json | 4 ++-- .../src/instrumentation.ts | 3 ++- .../src/internal-types.ts | 2 +- .../opentelemetry-instrumentation-ioredis/package.json | 4 ++-- .../node/opentelemetry-instrumentation-knex/package.json | 4 ++-- .../node/opentelemetry-instrumentation-koa/package.json | 6 +++--- .../opentelemetry-instrumentation-memcached/package.json | 2 +- .../opentelemetry-instrumentation-mongodb/package.json | 2 +- .../node/opentelemetry-instrumentation-mysql/package.json | 6 +++--- .../opentelemetry-instrumentation-mysql2/package.json | 4 ++-- .../package.json | 2 +- .../node/opentelemetry-instrumentation-net/package.json | 4 ++-- .../node/opentelemetry-instrumentation-pg/package.json | 4 ++-- .../node/opentelemetry-instrumentation-pino/package.json | 4 ++-- .../opentelemetry-instrumentation-redis-4/package.json | 2 +- .../node/opentelemetry-instrumentation-redis/package.json | 4 ++-- .../opentelemetry-instrumentation-restify/package.json | 4 ++-- .../opentelemetry-instrumentation-router/package.json | 4 ++-- .../opentelemetry-instrumentation-winston/package.json | 6 +++--- .../package.json | 6 +++--- .../opentelemetry-instrumentation-long-task/package.json | 8 ++++---- .../package.json | 8 ++++---- plugins/web/opentelemetry-plugin-react-load/package.json | 8 ++++---- .../opentelemetry-propagator-aws-xray/package.json | 4 ++-- .../package.json | 2 +- propagators/opentelemetry-propagator-instana/package.json | 2 +- .../opentelemetry-propagator-ot-trace/package.json | 2 +- 56 files changed, 109 insertions(+), 108 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 9ffee4b82..89bc0eb04 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest services: memcached: - image: memcached:1.6.9-alpine + image: memcached:1.6.21-alpine ports: - 11211:11211 mongo: diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index c1de5ba6f..38ec49da9 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -46,11 +46,11 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", - "nock": "13.3.1", + "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 585bd9d51..a1021951a 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -45,11 +45,11 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 64f8d2291..af04fbce2 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -39,12 +39,12 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "^18.0.0", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index 86c3929f0..a24d9d20b 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -49,7 +49,7 @@ "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 88721d1d9..c8d4aca6e 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -48,10 +48,10 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index f2dd1daa4..640eaf264 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -48,7 +48,7 @@ "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 3902c6ee3..2eca48794 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -40,10 +40,10 @@ "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index c6a236337..96ad3d5ee 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -37,7 +37,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -45,11 +45,11 @@ "karma-chrome-launcher": "^3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 6227213cb..d8ba6ba93 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -49,10 +49,10 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index fc15bd07a..68d6ab680 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -57,18 +57,18 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", "karma-chrome-launcher": "^3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 18d1eb0aa..5717cc577 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -55,7 +55,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.6", + "@types/sinon": "10.0.15", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", @@ -64,7 +64,7 @@ "ts-mocha": "10.0.0", "nyc": "15.1.0", "typescript": "4.4.4", - "gts": "3.1.0", + "gts": "3.1.1", "@typescript-eslint/eslint-plugin": "5.8.1", "@typescript-eslint/parser": "5.8.1" }, diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 0a29b68f0..591dafdf3 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -55,9 +55,9 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/amqplib": "^0.5.17", - "@types/lodash": "4.14.178", + "@types/lodash": "4.14.195", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/node": "18.16.19", "amqplib": "0.8.0", "expect": "29.2.0", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 0f5e49a48..450b9e1c7 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -52,10 +52,10 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "dataloader": "2.2.1", + "dataloader": "2.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 4e34834a9..dadd93de3 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -52,7 +52,7 @@ "@types/sinon": "^10.0.11", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index a42fba711..58d275ecb 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -51,7 +51,7 @@ "lru-memoizer": "2.1.4", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index a682c9442..f8a6da4e9 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -54,7 +54,7 @@ "mocha": "7.2.0", "mongoose": "6.5.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 0a4c0ec55..257251b81 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -50,7 +50,7 @@ "expect": "27.4.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "socket.io": "^4.1.3", "socket.io-client": "^4.1.3", "test-all-versions": "5.0.1", diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 57ce08963..c283f6e16 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -55,7 +55,7 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "tedious": "14.1.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 10cdbd975..8a0f54c75 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -54,7 +54,7 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, @@ -63,7 +63,7 @@ "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/aws-lambda": "8.10.81", + "@types/aws-lambda": "8.10.119", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme" diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index b3ed81732..0652d6e99 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -64,14 +64,14 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.6", + "@types/sinon": "10.0.15", "aws-sdk": "2.1008.0", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 658dd7694..2b3ea4fd9 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -53,11 +53,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "bunyan": "1.8.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -65,7 +65,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@types/bunyan": "1.8.7", + "@types/bunyan": "1.8.8", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index a253da11a..9754f9bee 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -54,11 +54,11 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.2", - "cassandra-driver": "4.6.3", + "@types/sinon": "10.0.15", + "cassandra-driver": "4.6.4", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index b08c52945..c73aad27e 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -53,7 +53,7 @@ "connect": "3.7.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 0e8228626..3dcf28fb2 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -53,10 +53,10 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index ff0cd4e8e..62e0a3ee3 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -54,11 +54,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.15", "express": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -68,7 +68,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/express": "4.17.13", + "@types/express": "4.17.17", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#readme" diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 3cbd335d9..bbbcafa0d 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -51,13 +51,13 @@ "@opentelemetry/instrumentation-http": "0.41.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", - "@types/express": "4.17.13", + "@types/express": "4.17.17", "@types/mocha": "7.0.2", "@types/node": "18.16.19", "fastify": "4.18.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index f40e35352..7d5990616 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -55,7 +55,7 @@ "generic-pool": "3.8.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "7.5.4", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 0543a22c7..9ec53dd37 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -55,7 +55,7 @@ "graphql": "^16.5.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 0dd7e3c5a..1f6de1882 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -54,7 +54,7 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, @@ -62,7 +62,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/hapi__hapi": "20.0.9", + "@types/hapi__hapi": "20.0.13", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi#readme" diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts index e671041b5..af3fa98a1 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts @@ -276,6 +276,7 @@ export class HapiInstrumentation extends InstrumentationBase { const oldHandler = plugin.register; const self = this; const newRegisterHandler = function (server: Hapi.Server, options: T) { + server.route; self._wrap(server, 'route', original => { return instrumentation._getServerRoutePatch.bind(instrumentation)( original, @@ -332,7 +333,7 @@ export class HapiInstrumentation extends InstrumentationBase { ...params: Parameters ) { if (api.trace.getSpan(api.context.active()) === undefined) { - return await method(...params); + return await method.apply(this, params); } const metadata = getExtMetadata(extPoint, pluginName); const span = instrumentation.tracer.startSpan(metadata.name, { diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts index 4e4b86483..8586d272d 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts +++ b/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts @@ -33,7 +33,7 @@ export type HapiServerRouteInput = | PatchableServerRoute | PatchableServerRoute[]; -export type PatchableServerRoute = Hapi.ServerRoute & { +export type PatchableServerRoute = Hapi.ServerRoute & { [handlerPatched]?: boolean; options?: { handler?: Hapi.Lifecycle.Method; diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 1eb171e07..0cea9985f 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -56,13 +56,13 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.15", "@types/node": "18.16.19", "cross-env": "7.0.3", "ioredis": "5.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 8a52ab28e..4950347ce 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -54,8 +54,8 @@ "knex": "0.95.9", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", - "sqlite3": "5.1.5", + "rimraf": "5.0.1", + "sqlite3": "5.1.6", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 5b22e19f5..bc7f3de3a 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -56,11 +56,11 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.15", "koa": "2.13.1", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", @@ -71,7 +71,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.6", - "@types/koa__router": "8.0.7", + "@types/koa__router": "8.0.11", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa#readme" diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index a0a6ba3b9..76310c051 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -58,7 +58,7 @@ "memcached": "2.2.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index d7d96439e..6a01a728d 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -64,7 +64,7 @@ "mocha": "7.2.0", "mongodb": "3.6.11", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 8e7603fe4..a451bc175 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -53,11 +53,11 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.13", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "mysql": "2.18.1", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" @@ -65,7 +65,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.19", + "@types/mysql": "2.15.21", "tslib": "^2.3.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql#readme" diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 86154e119..f4664e43f 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -56,9 +56,9 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "mocha": "7.2.0", - "mysql2": "2.3.0", + "mysql2": "2.3.3", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "7.5.4", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index a7ba86589..50a0681a4 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -64,7 +64,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "reflect-metadata": "0.1.13", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "rxjs": "7.3.0", "rxjs-compat": "6.6.7", "semver": "7.5.4", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 95f5029bb..8b291bb03 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -52,10 +52,10 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 6a429213f..efc34eb03 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -60,13 +60,13 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", "pg": "8.7.1", "pg-pool": "3.4.1", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "safe-stable-stringify": "^2.4.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 7922eba5e..10f380221 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -54,11 +54,11 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "7.5.4", "sinon": "15.0.1", "test-all-versions": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index b30692e4e..0eb238062 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -63,7 +63,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "redis": "4.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index a2317c426..41c8c14c5 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -63,11 +63,11 @@ "mocha": "7.2.0", "nyc": "15.1.0", "redis": "3.1.2", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4", - "@types/redis": "2.8.31" + "@types/redis": "2.8.32" }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 0dec9903b..ee28b9ea2 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -52,12 +52,12 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/restify": "4.3.8", + "@types/restify": "4.3.9", "@types/semver": "^7.3.12", "mocha": "7.2.0", "nyc": "15.1.0", "restify": "11.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "semver": "^7.3.7", "test-all-versions": "^5.0.1", "ts-mocha": "10.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index c3c675865..7eba20567 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -53,8 +53,8 @@ "@types/node": "18.16.19", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", - "router": "1.3.5", + "rimraf": "5.0.1", + "router": "1.3.8", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 918675935..5b7dfd428 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -53,17 +53,17 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4", "winston": "3.3.3", - "winston2": "npm:winston@2.4.5" + "winston2": "npm:winston@2.4.7" }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index b3a968ef7..76bdda887 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -54,7 +54,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -62,11 +62,11 @@ "karma-chrome-launcher": "^3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 52ea08076..a5e6f8d8f 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -50,10 +50,10 @@ "@babel/core": "7.15.0", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.6", + "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -62,11 +62,11 @@ "karma-coverage-istanbul-reporter": "3.0.3", "karma-jquery": "0.2.4", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 4cbf6a79a..a4cd971a1 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -52,10 +52,10 @@ "@opentelemetry/context-zone-peer-dep": "^1.8.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.6", + "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -64,11 +64,11 @@ "karma-coverage-istanbul-reporter": "3.0.3", "karma-jquery": "0.2.4", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 98c0ed07f..cedd4252d 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -52,11 +52,11 @@ "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/react": "17.0.16", + "@types/react": "17.0.62", "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -64,13 +64,13 @@ "karma-chrome-launcher": "^3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", "react": "17.0.2", "react-dom": "17.0.2", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "sinon": "15.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index f2fc438a1..d6945e6d3 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -57,11 +57,11 @@ "karma-chrome-launcher": "^3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0a57f4232..88f07eeff 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -51,7 +51,7 @@ "grpc": "1.24.11", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "5.0.0", + "rimraf": "5.0.1", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index c230506a5..b620fac54 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -59,7 +59,7 @@ "karma-chrome-launcher": "3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.33", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 9daf99935..91d77e37a 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -58,7 +58,7 @@ "karma-chrome-launcher": "^3.1.1", "karma-coverage-istanbul-reporter": "3.0.3", "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.32", + "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", From a53f6438d616a6e07b35ff98d063e520adfda5d0 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Wed, 2 Aug 2023 15:38:11 +0700 Subject: [PATCH 72/94] chore: bump typescripts to 4.4.4 to fix compile issue with @types/koa (#1616) Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 01015203c..da30bb803 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -63,7 +63,7 @@ "sinon": "14.0.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", - "typescript": "4.3.5" + "typescript": "4.4.4" }, "dependencies": { "@opentelemetry/instrumentation": "^0.36.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 0652d6e99..14c2769c8 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -75,7 +75,7 @@ "sinon": "15.0.1", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", - "typescript": "4.3.4" + "typescript": "4.4.4" }, "engines": { "node": ">=14" From 3d6c7beffd7c1cc0ef99c7560bc21e01db28b431 Mon Sep 17 00:00:00 2001 From: Honsemiro Date: Wed, 2 Aug 2023 18:28:19 +0900 Subject: [PATCH 73/94] fix(fastify): readme option table format (#1619) Co-authored-by: Mend Renovate Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Co-authored-by: Amir Blum --- plugins/node/opentelemetry-instrumentation-fastify/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/README.md b/plugins/node/opentelemetry-instrumentation-fastify/README.md index 3e74f96b8..a4a30e62c 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/README.md +++ b/plugins/node/opentelemetry-instrumentation-fastify/README.md @@ -47,8 +47,9 @@ See [examples/fastify](https://github.com/open-telemetry/opentelemetry-js-contri ## Fastify Instrumentation Options -| Options | Type | Example | Description | -| `requestHook` | `FastifyCustomAttributeFunction` | `(span, requestInfo) => {}` | Function for adding custom attributes to Fastify requests. Receives params: `Span, FastifyRequestInfo`. | +| Options | Type | Example | Description | +| -------------- | ---------------------------- | -------------------------------- | ------------------------------------------------------------------------------ | +| `requestHook` | `FastifyCustomAttributeFunction` | `(span, requestInfo) => {}` | Function for adding custom attributes to Fastify requests. Receives parameters: `Span, FastifyRequestInfo`. | ### Using `requestHook` From b4cda7a9db0bef3762490641ef672b0f88e9339b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 2 Aug 2023 12:49:36 +0200 Subject: [PATCH 74/94] chore(deps): update all patch versions (#3997) --- api/package.json | 4 ++-- experimental/packages/api-events/package.json | 2 +- experimental/packages/api-logs/package.json | 2 +- .../packages/exporter-logs-otlp-grpc/package.json | 4 ++-- .../packages/exporter-logs-otlp-http/package.json | 4 ++-- .../packages/exporter-logs-otlp-proto/package.json | 4 ++-- .../packages/exporter-trace-otlp-grpc/package.json | 4 ++-- .../packages/exporter-trace-otlp-http/package.json | 4 ++-- .../packages/exporter-trace-otlp-proto/package.json | 4 ++-- .../opentelemetry-browser-detector/package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../opentelemetry-exporter-prometheus/package.json | 4 ++-- .../opentelemetry-instrumentation-fetch/package.json | 4 ++-- .../opentelemetry-instrumentation-grpc/package.json | 10 +++++----- .../opentelemetry-instrumentation-http/package.json | 4 ++-- .../package.json | 4 ++-- .../opentelemetry-instrumentation/package.json | 4 ++-- .../packages/opentelemetry-sdk-node/package.json | 4 ++-- experimental/packages/otlp-exporter-base/package.json | 4 ++-- .../packages/otlp-grpc-exporter-base/package.json | 4 ++-- .../packages/otlp-proto-exporter-base/package.json | 4 ++-- experimental/packages/otlp-transformer/package.json | 2 +- experimental/packages/sdk-logs/package.json | 4 ++-- experimental/packages/shim-opencensus/package.json | 4 ++-- package.json | 4 ++-- .../opentelemetry-context-async-hooks/package.json | 2 +- .../opentelemetry-context-zone-peer-dep/package.json | 4 ++-- packages/opentelemetry-context-zone/package.json | 4 ++-- packages/opentelemetry-core/package.json | 4 ++-- packages/opentelemetry-exporter-jaeger/package.json | 4 ++-- packages/opentelemetry-exporter-zipkin/package.json | 4 ++-- packages/opentelemetry-propagator-b3/package.json | 2 +- packages/opentelemetry-propagator-jaeger/package.json | 4 ++-- packages/opentelemetry-resources/package.json | 4 ++-- packages/opentelemetry-sdk-trace-base/package.json | 4 ++-- packages/opentelemetry-sdk-trace-node/package.json | 4 ++-- packages/opentelemetry-sdk-trace-web/package.json | 4 ++-- .../opentelemetry-semantic-conventions/package.json | 4 ++-- packages/opentelemetry-shim-opentracing/package.json | 2 +- packages/sdk-metrics/package.json | 4 ++-- packages/template/package.json | 2 +- selenium-tests/package.json | 2 +- 44 files changed, 83 insertions(+), 83 deletions(-) diff --git a/api/package.json b/api/package.json index f73aef244..d2e4572f5 100644 --- a/api/package.json +++ b/api/package.json @@ -63,7 +63,7 @@ "devDependencies": { "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack": "4.41.33", "@types/webpack-env": "1.16.3", "codecov": "3.8.3", @@ -77,7 +77,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "memfs": "3.5.3", "mocha": "10.2.0", "nyc": "15.1.0", diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 94c3ce510..55d58ba1f 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -76,7 +76,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index e99c9fd65..4a50492b4 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -76,7 +76,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index bbd94bea1..a1e3cbc0a 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -56,11 +56,11 @@ "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 8d2c4c2e9..c7a7e41f9 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -77,7 +77,7 @@ "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -90,7 +90,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index f24ffbaac..31b6b025b 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -67,7 +67,7 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", @@ -78,7 +78,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 1a6a0114e..f9bcb032e 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -53,11 +53,11 @@ "@opentelemetry/otlp-exporter-base": "0.41.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 0b51ceb78..be7ba958f 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -67,7 +67,7 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -80,7 +80,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index bf01be8e5..3eea7ce95 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -66,7 +66,7 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cpx": "1.5.0", @@ -77,7 +77,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index bdf856692..75a4a7fde 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -57,7 +57,7 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -67,7 +67,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index c5fffbadb..70f2e344b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -52,11 +52,11 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 6adc7387e..021cdd182 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -67,7 +67,7 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -80,7 +80,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 59b19416e..4b24923e2 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -51,11 +51,11 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index 8b9a7251f..af3ea6833 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -47,10 +47,10 @@ "@opentelemetry/semantic-conventions": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 55b7b3565..8f6ebd9a6 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -61,7 +61,7 @@ "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -73,7 +73,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index f3e705dd6..0fc2fd5bf 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -47,9 +47,9 @@ }, "devDependencies": { "@bufbuild/buf": "1.21.0-1", - "@protobuf-ts/grpc-transport": "2.9.0", - "@protobuf-ts/runtime-rpc": "2.9.0", - "@protobuf-ts/runtime": "2.9.0", + "@protobuf-ts/grpc-transport": "2.9.1", + "@protobuf-ts/runtime-rpc": "2.9.1", + "@protobuf-ts/runtime": "2.9.1", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", @@ -60,10 +60,10 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "semver": "7.5.4", diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index f945fbefc..32a25479b 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -54,12 +54,12 @@ "@types/node": "18.6.5", "@types/request-promise-native": "1.0.18", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/superagent": "4.1.18", "axios": "1.4.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 3c729d400..7ac60c006 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -61,7 +61,7 @@ "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -73,7 +73,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index faa4b5a88..2e84dc74c 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -87,7 +87,7 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -100,7 +100,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index a00499ab7..d5773f83b 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -68,10 +68,10 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "semver": "7.5.4", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 2d3a61a5b..73407d780 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -68,7 +68,7 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -78,7 +78,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 67330ada1..a29489916 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -55,11 +55,11 @@ "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "protobufjs-cli": "1.1.1", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index a411fb4a9..c22110429 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -63,10 +63,10 @@ "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "protobufjs-cli": "1.1.1", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 1ea9fa0db..c8a77ae0b 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -69,7 +69,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 3ac1aba87..6113aeca5 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -77,7 +77,7 @@ "@opentelemetry/api-logs": "0.41.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -87,7 +87,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index b1724c988..d2deaae5f 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -54,10 +54,10 @@ "@opentelemetry/sdk-trace-base": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/package.json b/package.json index 2a6cffca3..864a548b0 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "4.2.1", "gh-pages": "5.0.0", - "lerna": "7.1.3", - "@lerna/legacy-package-management": "7.1.3", + "lerna": "7.1.4", + "@lerna/legacy-package-management": "7.1.4", "linkinator": "5.0.1", "markdownlint-cli": "0.35.0", "prettier": "2.8.8", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index a75321170..f8f479722 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -49,7 +49,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index b375a49f9..0b6929bcc 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -57,7 +57,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "@types/zone.js": "0.5.12", "babel-loader": "8.3.0", @@ -70,7 +70,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index ee7ba2406..0d290af7a 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -53,7 +53,7 @@ "@babel/core": "7.22.9", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "codecov": "3.8.3", @@ -63,7 +63,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 974185bdf..cb8da74b1 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -67,7 +67,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -78,7 +78,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 437b2b191..e31c28eaa 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -48,10 +48,10 @@ "@opentelemetry/resources": "1.15.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index ff789993a..1c325eaaf 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -64,7 +64,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -76,7 +76,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index dc771041f..a67230166 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -62,7 +62,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "ts-loader": "8.4.0", diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 487e6efa2..26e16812d 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -57,7 +57,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -68,7 +68,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 8889e298c..ddcc1e48d 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -65,7 +65,7 @@ "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -76,7 +76,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 7f9cdfe0a..c8b2ea54a 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -68,7 +68,7 @@ "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", @@ -80,7 +80,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 97b12571b..80b097656 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -51,10 +51,10 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index bcc00574f..58f407d0b 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -63,7 +63,7 @@ "@types/jquery": "3.5.16", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", @@ -77,7 +77,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 59473df70..778d89dd1 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -51,10 +51,10 @@ "devDependencies": { "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 26a8ba076..473b473cd 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -50,7 +50,7 @@ "@types/node": "18.6.5", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "ts-mocha": "10.0.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index f0abbe927..21a56b219 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -59,7 +59,7 @@ "@types/lodash.merge": "4.6.7", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "babel-plugin-istanbul": "6.1.1", "codecov": "3.8.3", "cross-var": "1.1.0", @@ -69,7 +69,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.3", + "lerna": "7.1.4", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/packages/template/package.json b/packages/template/package.json index 4cbc426dd..f7e010f22 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -80,7 +80,7 @@ "devDependencies": { "@types/node": "18.6.5", "cross-var": "1.1.0", - "lerna": "7.1.3", + "lerna": "7.1.4", "typescript": "4.4.4" }, "Add these to devDependencies for testing": { diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 04d420abe..aeff43006 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -40,7 +40,7 @@ "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "114.0.2", + "chromedriver": "114.0.3", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", From 2a0d54365a9d86c14986713a28a0b02a64434da5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 2 Aug 2023 13:04:10 +0200 Subject: [PATCH 75/94] chore(deps): update dependency rimraf to v5 (#1608) Co-authored-by: Amir Blum --- plugins/node/instrumentation-cucumber/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index da30bb803..1539e0fcf 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -58,7 +58,7 @@ "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", - "rimraf": "3.0.2", + "rimraf": "5.0.1", "semver": "^7.3.2", "sinon": "14.0.0", "test-all-versions": "5.0.1", From 4dc98d374505da523cd4aa77833c043311fb742d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 2 Aug 2023 14:33:40 +0200 Subject: [PATCH 76/94] chore(deps): update dependency mongoose to v6.11.3 [security] (#1601) Co-authored-by: Amir Blum --- plugins/node/instrumentation-mongoose/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index f8a6da4e9..b649440c3 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -52,7 +52,7 @@ "@types/node": "18.16.19", "expect": "29.2.0", "mocha": "7.2.0", - "mongoose": "6.5.2", + "mongoose": "6.11.3", "nyc": "15.1.0", "rimraf": "5.0.1", "test-all-versions": "5.0.1", From e5bca5fe5b27adc59c8de8fe4087d38b69d93bd4 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 2 Aug 2023 10:18:20 -0400 Subject: [PATCH 77/94] fix: Revert "feat(minification): Add importHelpers and tslib as a dependency (#1545)" (#1611) Co-authored-by: Marc Pichler --- .../opentelemetry-browser-extension-autoinjection/package.json | 3 +-- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 3 +-- .../node/opentelemetry-resource-detector-aws/package.json | 3 +-- .../opentelemetry-resource-detector-container/package.json | 3 +-- .../node/opentelemetry-resource-detector-gcp/package.json | 3 +-- .../node/opentelemetry-resource-detector-github/package.json | 3 +-- .../node/opentelemetry-resource-detector-instana/package.json | 3 +-- metapackages/auto-instrumentations-node/package.json | 3 +-- metapackages/auto-instrumentations-web/package.json | 3 +-- package.json | 3 +-- packages/opentelemetry-host-metrics/package.json | 3 +-- packages/opentelemetry-id-generator-aws-xray/package.json | 3 +-- packages/opentelemetry-propagation-utils/package.json | 3 --- packages/opentelemetry-redis-common/package.json | 3 --- packages/opentelemetry-sampler-aws-xray/package.json | 3 +-- packages/opentelemetry-test-utils/package.json | 3 +-- plugins/node/instrumentation-amqplib/package.json | 3 +-- plugins/node/instrumentation-dataloader/package.json | 3 +-- plugins/node/instrumentation-fs/package.json | 3 +-- plugins/node/instrumentation-lru-memoizer/package.json | 3 +-- plugins/node/instrumentation-mongoose/package.json | 3 +-- plugins/node/instrumentation-socket.io/package.json | 3 +-- plugins/node/instrumentation-tedious/package.json | 3 +-- .../node/opentelemetry-instrumentation-aws-lambda/package.json | 3 +-- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-bunyan/package.json | 3 +-- .../node/opentelemetry-instrumentation-cassandra/package.json | 3 +-- .../node/opentelemetry-instrumentation-connect/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-dns/package.json | 3 +-- .../examples/package.json | 3 +-- .../node/opentelemetry-instrumentation-express/package.json | 3 +-- .../node/opentelemetry-instrumentation-fastify/package.json | 3 +-- .../opentelemetry-instrumentation-generic-pool/package.json | 3 +-- .../node/opentelemetry-instrumentation-graphql/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-hapi/package.json | 3 +-- .../node/opentelemetry-instrumentation-ioredis/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-knex/package.json | 3 +-- .../opentelemetry-instrumentation-koa/examples/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-koa/package.json | 3 +-- .../node/opentelemetry-instrumentation-memcached/package.json | 3 +-- .../examples/package.json | 3 +-- .../node/opentelemetry-instrumentation-mongodb/package.json | 3 +-- .../opentelemetry-instrumentation-mysql/examples/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-mysql/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-mysql2/package.json | 3 +-- .../opentelemetry-instrumentation-nestjs-core/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-net/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-pg/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-pino/package.json | 3 +-- .../node/opentelemetry-instrumentation-redis-4/package.json | 3 +-- .../opentelemetry-instrumentation-redis/examples/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-redis/package.json | 3 +-- .../node/opentelemetry-instrumentation-restify/package.json | 3 +-- plugins/node/opentelemetry-instrumentation-router/package.json | 3 +-- .../node/opentelemetry-instrumentation-winston/package.json | 3 +-- .../opentelemetry-instrumentation-document-load/package.json | 3 +-- .../web/opentelemetry-instrumentation-long-task/package.json | 3 +-- .../package.json | 3 +-- plugins/web/opentelemetry-plugin-react-load/package.json | 3 +-- propagators/opentelemetry-propagator-aws-xray/package.json | 3 +-- .../opentelemetry-propagator-grpc-census-binary/package.json | 3 --- propagators/opentelemetry-propagator-instana/package.json | 3 --- propagators/opentelemetry-propagator-ot-trace/package.json | 3 --- tsconfig.base.json | 3 +-- 64 files changed, 59 insertions(+), 133 deletions(-) diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json index e6037e840..1efd629ff 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ b/archive/opentelemetry-browser-extension-autoinjection/package.json @@ -80,8 +80,7 @@ "change-case": "4.1.2", "json5": "2.2.0", "react": "17.0.2", - "react-dom": "17.0.2", - "tslib": "^2.3.1" + "react-dom": "17.0.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 38ec49da9..60adc9a00 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -60,8 +60,7 @@ }, "dependencies": { "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index a1021951a..db7a5c49f 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -60,8 +60,7 @@ "dependencies": { "@opentelemetry/core": "^1.0.0", "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index af04fbce2..b9fbf4105 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -54,8 +54,7 @@ }, "dependencies": { "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index a24d9d20b..7d53bacca 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -60,8 +60,7 @@ "@opentelemetry/core": "^1.0.0", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "gcp-metadata": "^5.0.0", - "tslib": "^2.3.1" + "gcp-metadata": "^5.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-gcp#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index c8d4aca6e..cb74595f3 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -57,8 +57,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/resources": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/resources": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-github#readme" } diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 640eaf264..b1918ed6f 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -54,8 +54,7 @@ }, "dependencies": { "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 2eca48794..a16e01b5b 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -92,7 +92,6 @@ "@opentelemetry/resource-detector-container": "^0.3.0", "@opentelemetry/resource-detector-gcp": "^0.29.0", "@opentelemetry/resources": "^1.12.0", - "@opentelemetry/sdk-node": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-node": "^0.41.0" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 96ad3d5ee..c0f086b10 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -63,7 +63,6 @@ "@opentelemetry/instrumentation-document-load": "^0.33.0", "@opentelemetry/instrumentation-fetch": "^0.41.0", "@opentelemetry/instrumentation-user-interaction": "^0.33.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation-xml-http-request": "^0.41.0" } } diff --git a/package.json b/package.json index 4cb48e1ea..24049e1ff 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,7 @@ "lerna": "5.5.2", "lerna-changelog": "2.2.0", "prettier": "2.8.7", - "typescript": "4.4.4", - "tslib": "^2.3.1" + "typescript": "4.4.4" }, "changelog": { "labels": { diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index d8ba6ba93..b5e85ace8 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -59,8 +59,7 @@ }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.8.0", - "systeminformation": "^5.0.0", - "tslib": "^2.3.1" + "systeminformation": "^5.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme" } diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index 68d6ab680..bb895a2aa 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -76,8 +76,7 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/core": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/core": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-id-generator-aws-xray#readme" } diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 954e0f4c8..435f11f84 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -55,8 +55,5 @@ "sinon": "15.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" - }, - "dependencies": { - "tslib": "^2.3.1" } } diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json index 13dc0ef7a..a90cc8aa6 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/opentelemetry-redis-common/package.json @@ -45,8 +45,5 @@ "nyc": "15.1.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" - }, - "dependencies": { - "tslib": "^2.3.1" } } diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 5717cc577..3855ff61d 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -47,8 +47,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "axios": "^1.3.5", - "tslib": "^2.3.1" + "axios": "^1.3.5" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 4d5fb5de3..b8e3e3479 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -52,7 +52,6 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" } } diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 591dafdf3..ed4e47f14 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -48,8 +48,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 450b9e1c7..ab90424d9 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -61,8 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" } diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index dadd93de3..92edeb1c0 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -60,8 +60,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme" } diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 58d275ecb..506350a38 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -57,8 +57,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" } diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index b649440c3..c8bb283c1 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -62,8 +62,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme" } diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 257251b81..eb26da2b1 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -59,8 +59,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme" } diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index c283f6e16..59f37c9fd 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -64,8 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/tedious": "^4.0.6", - "tslib": "^2.3.1" + "@types/tedious": "^4.0.6" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-tedious#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 8a0f54c75..525f0faab 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -63,8 +63,7 @@ "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/aws-lambda": "8.10.119", - "tslib": "^2.3.1" + "@types/aws-lambda": "8.10.119" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 14c2769c8..aaac2459f 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -49,8 +49,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.30.0", - "tslib": "^2.3.1" + "@opentelemetry/propagation-utils": "^0.30.0" }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.85.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 2b3ea4fd9..c840464dd 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -65,8 +65,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@types/bunyan": "1.8.8", - "tslib": "^2.3.1" + "@types/bunyan": "1.8.8" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 9754f9bee..67bbdc490 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -65,8 +65,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index c73aad27e..6eca188dd 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -61,8 +61,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/connect": "3.4.35", - "tslib": "^2.3.1" + "@types/connect": "3.4.35" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 3dcf28fb2..1a295836c 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -64,8 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "semver": "^7.3.2", - "tslib": "^2.3.1" + "semver": "^7.3.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 303c76d72..710ad522c 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -41,8 +41,7 @@ "@opentelemetry/semantic-conventions": "^1.0.0", "axios": "^0.21.1", "cross-env": "^7.0.3", - "express": "^4.17.1", - "tslib": "^2.3.1" + "express": "^4.17.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 62e0a3ee3..81ee1eb31 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -68,8 +68,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/express": "4.17.17", - "tslib": "^2.3.1" + "@types/express": "4.17.17" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index bbbcafa0d..c3950496b 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -64,8 +64,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 7d5990616..f716d2ba0 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -63,8 +63,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/generic-pool": "^3.1.9", - "tslib": "^2.3.1" + "@types/generic-pool": "^3.1.9" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 9ec53dd37..8c8eb4d1c 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -61,8 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 1f6de1882..0dec59a58 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -62,8 +62,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/hapi__hapi": "20.0.13", - "tslib": "^2.3.1" + "@types/hapi__hapi": "20.0.13" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 0cea9985f..f91d32215 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -72,8 +72,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/ioredis4": "npm:@types/ioredis@^4.28.10", - "tslib": "^2.3.1" + "@types/ioredis4": "npm:@types/ioredis@^4.28.10" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-ioredis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 4950347ce..1983536b1 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -61,8 +61,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index 6a23e6fe7..987572208 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -40,8 +40,7 @@ "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "axios": "^0.21.1", - "koa": "^2.13.0", - "tslib": "^2.3.1" + "koa": "^2.13.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index bc7f3de3a..0ab0d0092 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -71,8 +71,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.6", - "@types/koa__router": "8.0.11", - "tslib": "^2.3.1" + "@types/koa__router": "8.0.11" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 76310c051..47d076115 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -65,8 +65,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/memcached": "^2.2.6", - "tslib": "^2.3.1" + "@types/memcached": "^2.2.6" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-memcached#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index e64136898..3ee2b0c02 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -38,8 +38,7 @@ "@opentelemetry/instrumentation-mongodb": "^0.32.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", - "mongodb": "^3.7.3", - "tslib": "^2.3.1" + "mongodb": "^3.7.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 6a01a728d..a1c123792 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -72,8 +72,7 @@ "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index 2adaa420a..36a933988 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -40,8 +40,7 @@ "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/exporter-metrics-otlp-grpc": "0.33.0", - "mysql": "^2.18.1", - "tslib": "^2.3.1" + "mysql": "^2.18.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index a451bc175..7e0dd110a 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -65,8 +65,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/mysql": "2.15.21", - "tslib": "^2.3.1" + "@types/mysql": "2.15.21" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index f4664e43f..e2db06692 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -67,8 +67,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/sql-common": "^0.40.0", - "tslib": "^2.3.1" + "@opentelemetry/sql-common": "^0.40.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 50a0681a4..548ecc4d2 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -74,8 +74,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 8b291bb03..343edf2bc 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -62,8 +62,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index efc34eb03..215d11813 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -79,8 +79,7 @@ "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0", "@types/pg": "8.6.1", - "@types/pg-pool": "2.0.3", - "tslib": "^2.3.1" + "@types/pg-pool": "2.0.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 10f380221..7bfab71a2 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -66,8 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 0eb238062..b9155f425 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -71,8 +71,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/redis-common": "^0.36.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis-4#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 8d76b3b85..3162130ec 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -41,8 +41,7 @@ "@opentelemetry/sdk-trace-node": "^1.0.0", "axios": "^0.21.1", "express": "^4.17.1", - "redis": "^3.1.1", - "tslib": "^2.3.1" + "redis": "^3.1.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "devDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 41c8c14c5..e90fca4e8 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -72,8 +72,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/redis-common": "^0.36.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index ee28b9ea2..56e529795 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -66,8 +66,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 7eba20567..b3b12ed91 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -60,8 +60,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-router#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 5b7dfd428..fe6d76b6f 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -66,8 +66,7 @@ "winston2": "npm:winston@2.4.7" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", - "tslib": "^2.3.1" + "@opentelemetry/instrumentation": "^0.41.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 76bdda887..698334f94 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -80,8 +80,7 @@ "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.15.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index a5e6f8d8f..3d3108572 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -79,8 +79,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index a4cd971a1..a1224f352 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -81,8 +81,7 @@ "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/sdk-trace-web": "^1.8.0", - "tslib": "^2.3.1" + "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index cedd4252d..112433c1f 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -89,8 +89,7 @@ "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "shimmer": "^1.2.1", - "tslib": "^2.3.1" + "shimmer": "^1.2.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-react-load#readme" } diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index d6945e6d3..7d4fe027c 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -68,8 +68,7 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/core": "^1.0.0", - "tslib": "^2.3.1" + "@opentelemetry/core": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-aws-xray#readme" } diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 88f07eeff..44e32383c 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -56,8 +56,5 @@ "ts-mocha": "10.0.0", "typescript": "4.4.4" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-grpc-census-binary#readme" } diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index b620fac54..c4290cc40 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -70,8 +70,5 @@ "webpack": "4.46.0", "webpack-cli": "4.9.2" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme" } diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 91d77e37a..a36c753cd 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -67,8 +67,5 @@ "typescript": "4.4.4", "webpack": "4.46.0" }, - "dependencies": { - "tslib": "^2.3.1" - }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme" } diff --git a/tsconfig.base.json b/tsconfig.base.json index 1ee8ca34b..83c35af07 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,8 +18,7 @@ "strictNullChecks": true, "target": "es2017", "incremental": true, - "newLine": "LF", - "importHelpers": true + "newLine": "LF" }, "exclude": [ "node_modules" From 5d204b4945eea8f9033a22bb77885580f63ce38b Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 3 Aug 2023 09:01:58 +0300 Subject: [PATCH 78/94] chore(deps): update dependency @types/semver to v7.5.0 (#1621) --- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/opentelemetry-instrumentation-restify/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 1539e0fcf..8aad67862 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.3.1", "@opentelemetry/sdk-trace-node": "^1.3.1", "@types/mocha": "7.0.2", - "@types/semver": "7.3.8", + "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", "@types/sinon": "10.0.2", "gts": "3.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 56e529795..42b62378b 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -53,7 +53,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/restify": "4.3.9", - "@types/semver": "^7.3.12", + "@types/semver": "7.5.0", "mocha": "7.2.0", "nyc": "15.1.0", "restify": "11.1.0", From e242645269940c97f6418d1375a3dab07c032a93 Mon Sep 17 00:00:00 2001 From: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:00:43 +0300 Subject: [PATCH 79/94] fix(renovate): change renovate patch schedule (#1603) --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 6f9621a66..8d4c9f6f0 100644 --- a/renovate.json +++ b/renovate.json @@ -8,7 +8,7 @@ "groupSlug": "all-patch", "matchUpdateTypes": ["patch"], "excludePackageNames": ["prettier"], - "schedule": ["before 3am every weekday"] + "schedule": ["before 3am on Monday"] }, { "matchUpdateTypes": ["minor"], From 5fd656bb08ce2fa34f9ed588c09e99dfca26d42a Mon Sep 17 00:00:00 2001 From: Hunter Paulson Date: Thu, 3 Aug 2023 09:11:24 -0400 Subject: [PATCH 80/94] docs(resources): Fixes detectResources deprecated typos (#4003) Co-authored-by: Marc Pichler --- packages/opentelemetry-resources/src/detect-resources.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opentelemetry-resources/src/detect-resources.ts b/packages/opentelemetry-resources/src/detect-resources.ts index be6943f81..4fa477a4f 100644 --- a/packages/opentelemetry-resources/src/detect-resources.ts +++ b/packages/opentelemetry-resources/src/detect-resources.ts @@ -26,7 +26,7 @@ import { IResource } from './IResource'; * does not resolve until all the underlying detectors have resolved, unlike * detectResourcesSync. * - * @deprecated use detectResourceSync() instead. + * @deprecated use detectResourcesSync() instead. * @param config Configuration for resource detection */ export const detectResources = async ( From 154b30bc98ff0b848348faa18197eb7f11dcbdc4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 6 Aug 2023 11:29:09 +0200 Subject: [PATCH 81/94] chore(deps): update dependency prettier to v2.8.8 (#1622) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24049e1ff..ad0e87338 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "husky": "7.0.4", "lerna": "5.5.2", "lerna-changelog": "2.2.0", - "prettier": "2.8.7", + "prettier": "2.8.8", "typescript": "4.4.4" }, "changelog": { From 3732256f02c86471cf2016391f255e49a01fbd19 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 7 Aug 2023 17:14:30 +0200 Subject: [PATCH 82/94] docs(README): clarify browser support (#4037) Co-authored-by: Patrice Chalin --- README.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index ca7279674..370dfb17d 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ## About this project -This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a framework for collecting traces and metrics from applications. +This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a framework for collecting traces, metrics, and logs from applications. ## Quick Start @@ -109,24 +109,29 @@ If you are a library author looking to build OpenTelemetry into your library, pl ## Supported Runtimes -| Platform Version | Supported | -| ------------------- | ----------------------------------------------- | -| Node.JS `v18` | ✅ | -| Node.JS `v16` | ✅ | -| Node.JS `v14` | ✅ | -| Older Node Versions | See [Node Support](#node-support) | -| Web Browsers | ✅ See [Browser Support](#browser-support) below | +| Platform Version | Supported | +|---------------------|-----------------------------------------------| +| Node.JS `v18` | :heavy_check_mark: | +| Node.JS `v16` | :heavy_check_mark: | +| Node.JS `v14` | :heavy_check_mark: | +| Older Node Versions | See [Node Support](#node-support) | +| Web Browsers | See [Browser Support](#browser-support) below | ### Node Support Only Node.js Active or Maintenance LTS versions are supported. Previous versions of node *may* work, but they are not tested by OpenTelemetry and they are not guaranteed to work. -Please note that versions of Node.JS v8 prior to `v8.12.0` will NOT work, because OpenTelemetry Node depends on the `perf_hooks` module introduced in `v8.5.0` and `performance.timeOrigin` that is set correctly starting in `v8.12.0`. +Note that versions of Node.JS v8 prior to `v8.12.0` will NOT work, because OpenTelemetry Node depends on the +`perf_hooks` module introduced in `v8.5.0` and `performance.timeOrigin` that is set correctly starting in `v8.12.0`. ### Browser Support -Automated browser tests are run in the latest version of Headless Chrome. -There is currently no list of officially supported browsers, but OpenTelemetry is developed using standard web technologies with wide support and should work in currently supported versions of major browsers. +> [!IMPORTANT] +> Client instrumentation for the browser is **experimental** and mostly **unspecified**. If you are interested in +> helping out, get in touch with the [Client Instrumentation SIG][client-instrumentation-sig]. + +There is currently no list of officially supported browsers. OpenTelemetry is developed using standard web +technologies and aims to work in currently supported versions of major browsers. ## Package Version Compatibility @@ -552,6 +557,8 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [up-for-grabs-issues]: https://github.com/open-telemetry/OpenTelemetry-js/issues?q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs [good-first-issues]: https://github.com/open-telemetry/OpenTelemetry-js/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22 +[client-instrumentation-sig]: https://docs.google.com/document/d/16Vsdh-DM72AfMg_FIt9yT9ExEWF4A_vRbQ3jRNBe09w/edit + [docs]: https://open-telemetry.github.io/opentelemetry-js [compliance-matrix]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md [CONTRIBUTING]: https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md From a4213183b03664cdf29e622932ea4823a9b8de50 Mon Sep 17 00:00:00 2001 From: Katherine Date: Mon, 7 Aug 2023 12:11:46 -0400 Subject: [PATCH 83/94] fix(parseKeyPairsIntoRecord): allow equals in baggage value #3974 (#3975) Co-authored-by: Marc Pichler --- CHANGELOG.md | 1 + packages/opentelemetry-core/src/baggage/utils.ts | 12 ++++++++---- .../test/baggage/W3CBaggagePropagator.test.ts | 12 ++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0266669bd..190756613 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001 * fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass * fix(sdk-trace-web): add secureConnectionStart to https only [#3879](https://github.com/open-telemetry/opentelemetry-js/pull/3879) @Abinet18 +* fix(core): add baggage support for values containing an equals sign [#3975](https://github.com/open-telemetry/opentelemetry-js/pull/3975) @krosenk729 ### :house: (Internal) diff --git a/packages/opentelemetry-core/src/baggage/utils.ts b/packages/opentelemetry-core/src/baggage/utils.ts index 991b8a89a..bb8b4b015 100644 --- a/packages/opentelemetry-core/src/baggage/utils.ts +++ b/packages/opentelemetry-core/src/baggage/utils.ts @@ -61,10 +61,14 @@ export function parsePairKeyValue( if (valueProps.length <= 0) return; const keyPairPart = valueProps.shift(); if (!keyPairPart) return; - const keyPair = keyPairPart.split(BAGGAGE_KEY_PAIR_SEPARATOR); - if (keyPair.length !== 2) return; - const key = decodeURIComponent(keyPair[0].trim()); - const value = decodeURIComponent(keyPair[1].trim()); + const separatorIndex = keyPairPart.indexOf(BAGGAGE_KEY_PAIR_SEPARATOR); + if (separatorIndex <= 0) return; + const key = decodeURIComponent( + keyPairPart.substring(0, separatorIndex).trim() + ); + const value = decodeURIComponent( + keyPairPart.substring(separatorIndex + 1).trim() + ); let metadata; if (valueProps.length > 0) { metadata = baggageEntryMetadataFromString( diff --git a/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts b/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts index c30bfb301..801496513 100644 --- a/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts +++ b/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts @@ -181,9 +181,9 @@ describe('W3CBaggagePropagator', () => { describe('.extract()', () => { const baggageValue = - 'key1=d4cda95b,key3=c88815a7, keyn = valn, keym =valm'; + 'key1=d4cda95b==,key3=c88815a7, keyn = valn, keym =valm'; const expected = propagation.createBaggage({ - key1: { value: 'd4cda95b' }, + key1: { value: 'd4cda95b==' }, key3: { value: 'c88815a7' }, keyn: { value: 'valn' }, keym: { value: 'valm' }, @@ -217,7 +217,7 @@ describe('W3CBaggagePropagator', () => { it('should extract context of a sampled span when the headerValue comes as array with multiple items', () => { carrier[BAGGAGE_HEADER] = [ - 'key1=d4cda95b,key3=c88815a7, keyn = valn', + 'key1=d4cda95b==,key3=c88815a7, keyn = valn', 'keym =valm', ]; const extractedBaggage = propagation.getBaggage( @@ -282,10 +282,6 @@ describe('W3CBaggagePropagator', () => { header: '289371298nekjh2939299283jbk2b', baggage: undefined, }, - invalidDoubleEqual: { - header: 'key1==value;key2=value2', - baggage: undefined, - }, invalidWrongKeyValueFormat: { header: 'key1:value;key2=value2', baggage: undefined, @@ -295,7 +291,7 @@ describe('W3CBaggagePropagator', () => { baggage: undefined, }, mixInvalidAndValidKeys: { - header: 'key1==value,key2=value2', + header: 'key1:value,key2=value2', baggage: propagation.createBaggage({ key2: { value: 'value2', From ffe641c08c69f41ca8d292221dc1804d511efb28 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 8 Aug 2023 10:21:55 +0200 Subject: [PATCH 84/94] chore(deps): update all patch versions (#4043) --- .../packages/exporter-logs-otlp-grpc/package.json | 2 +- .../packages/exporter-logs-otlp-http/package.json | 2 +- .../packages/exporter-logs-otlp-proto/package.json | 2 +- .../packages/exporter-trace-otlp-grpc/package.json | 2 +- .../packages/exporter-trace-otlp-http/package.json | 2 +- .../packages/exporter-trace-otlp-proto/package.json | 2 +- .../packages/opentelemetry-browser-detector/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-grpc/package.json | 2 +- .../opentelemetry-exporter-metrics-otlp-http/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-instrumentation-fetch/package.json | 2 +- .../package.json | 2 +- .../packages/opentelemetry-instrumentation/package.json | 4 ++-- experimental/packages/otlp-exporter-base/package.json | 2 +- .../packages/otlp-grpc-exporter-base/package.json | 2 +- .../packages/otlp-proto-exporter-base/package.json | 2 +- experimental/packages/sdk-logs/package.json | 2 +- packages/opentelemetry-context-zone-peer-dep/package.json | 2 +- packages/opentelemetry-context-zone/package.json | 2 +- packages/opentelemetry-exporter-zipkin/package.json | 2 +- packages/opentelemetry-sdk-trace-web/package.json | 2 +- packages/sdk-metrics/package.json | 2 +- selenium-tests/package.json | 8 ++++---- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index a1e3cbc0a..bc9f28c60 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.1", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index c7a7e41f9..23ad53c61 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -71,7 +71,7 @@ ], "sideEffects": false, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.1", "@opentelemetry/resources": "1.15.1", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 31b6b025b..37200e912 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index f9bcb032e..002839950 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-exporter-base": "0.41.1", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index be7ba958f..9d5f3efc3 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index 3eea7ce95..d41027bac 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -62,7 +62,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 75a4a7fde..0f29c9c6d 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 70f2e344b..727b5ca2b 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 021cdd182..e0e814bcd 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -63,7 +63,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 4b24923e2..12496de95 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 8f6ebd9a6..d91814f30 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.1", "@opentelemetry/propagator-b3": "1.15.1", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 7ac60c006..2ef2fc894 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.1", "@opentelemetry/propagator-b3": "1.15.1", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 2e84dc74c..97a8b5d4e 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.4.1", + "import-in-the-middle": "1.4.2", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1", "shimmer": "^1.2.1" @@ -81,7 +81,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@opentelemetry/sdk-metrics": "1.15.1", "@types/mocha": "10.0.1", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 73407d780..70c6fef12 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -64,7 +64,7 @@ "@opentelemetry/core": "1.15.1" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index a29489916..87def63d6 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -48,7 +48,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-transformer": "0.41.1", "@opentelemetry/resources": "1.15.1", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index c22110429..61873ad1d 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -59,7 +59,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index 6113aeca5..a23006ad2 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -72,7 +72,7 @@ "@opentelemetry/api-logs": ">=0.39.1" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": ">=1.4.0 <1.5.0", "@opentelemetry/api-logs": "0.41.1", "@types/mocha": "10.0.1", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 0b6929bcc..65193793e 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 0d290af7a..b827d8211 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -50,7 +50,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 1c325eaaf..e32960e4b 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -60,7 +60,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 58f407d0b..fa1287b20 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -55,7 +55,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@opentelemetry/context-zone": "1.15.1", "@opentelemetry/propagator-b3": "1.15.1", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 21a56b219..612036af2 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": ">=1.3.0 <1.5.0", "@types/lodash.merge": "4.6.7", "@types/mocha": "10.0.1", diff --git a/selenium-tests/package.json b/selenium-tests/package.json index aeff43006..758542516 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -31,11 +31,11 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.22.7", - "@babel/plugin-transform-runtime": "7.22.9", - "@babel/preset-env": "7.22.9", + "@babel/plugin-proposal-decorators": "7.22.10", + "@babel/plugin-transform-runtime": "7.22.10", + "@babel/preset-env": "7.22.10", "@opentelemetry/api": "^1.0.0", "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", From 48fb15862e801b742059a3e39dbcc8ef4c10b2e2 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 8 Aug 2023 14:59:06 +0200 Subject: [PATCH 85/94] chore: prepare release 1.15.2/0.41.2 (#4036) --- CHANGELOG.md | 13 +++++--- examples/esm-http-ts/package.json | 16 +++++----- examples/http/package.json | 18 +++++------ examples/https/package.json | 18 +++++------ examples/opentelemetry-web/package.json | 30 ++++++++--------- examples/otlp-exporter-node/package.json | 24 +++++++------- experimental/CHANGELOG.md | 10 ++++-- .../node14/package.json | 6 ++-- .../node16/package.json | 6 ++-- experimental/examples/logs/package.json | 2 +- .../examples/opencensus-shim/package.json | 12 +++---- experimental/examples/prometheus/package.json | 6 ++-- experimental/packages/api-events/package.json | 2 +- experimental/packages/api-logs/package.json | 2 +- .../exporter-logs-otlp-grpc/package.json | 16 +++++----- .../exporter-logs-otlp-http/package.json | 14 ++++---- .../exporter-logs-otlp-proto/package.json | 18 +++++------ .../exporter-trace-otlp-grpc/package.json | 14 ++++---- .../exporter-trace-otlp-http/package.json | 12 +++---- .../exporter-trace-otlp-proto/package.json | 14 ++++---- .../package.json | 6 ++-- .../package.json | 14 ++++---- .../package.json | 12 +++---- .../package.json | 16 +++++----- .../package.json | 10 +++--- .../package.json | 16 +++++----- .../package.json | 20 ++++++------ .../package.json | 16 +++++----- .../package.json | 16 +++++----- .../package.json | 4 +-- .../opentelemetry-sdk-node/package.json | 32 +++++++++---------- .../packages/otlp-exporter-base/package.json | 4 +-- .../otlp-grpc-exporter-base/package.json | 12 +++---- .../otlp-proto-exporter-base/package.json | 6 ++-- .../packages/otlp-transformer/package.json | 14 ++++---- experimental/packages/sdk-logs/package.json | 8 ++--- .../packages/shim-opencensus/package.json | 8 ++--- .../package.json | 8 ++--- .../package.json | 2 +- .../package.json | 2 +- .../opentelemetry-context-zone/package.json | 4 +-- packages/opentelemetry-core/package.json | 4 +-- .../package.json | 10 +++--- .../package.json | 10 +++--- .../opentelemetry-propagator-b3/package.json | 4 +-- .../package.json | 4 +-- packages/opentelemetry-resources/package.json | 6 ++-- .../opentelemetry-sdk-trace-base/package.json | 8 ++--- .../opentelemetry-sdk-trace-node/package.json | 16 +++++----- .../opentelemetry-sdk-trace-web/package.json | 14 ++++---- .../package.json | 2 +- .../package.json | 12 +++---- packages/sdk-metrics/package.json | 6 ++-- packages/template/package.json | 2 +- selenium-tests/package.json | 22 ++++++------- 55 files changed, 305 insertions(+), 298 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 190756613..d449ad83d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,14 +13,18 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :bug: (Bug Fix) -* fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup -* fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions [#4014](https://github.com/open-telemetry/opentelemetry-js/pull/4014/) @aabmass -* fix(sdk-metrics): ignore invalid metric values [#3988](https://github.com/open-telemetry/opentelemetry-js/pull/3988) @legendecas - ### :books: (Refine Doc) ### :house: (Internal) +## 1.15.2 + +### :bug: (Bug Fix) + +* fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions [#4014](https://github.com/open-telemetry/opentelemetry-js/pull/4014/) @aabmass +* fix(sdk-metrics): ignore invalid metric values [#3988](https://github.com/open-telemetry/opentelemetry-js/pull/3988) @legendecas +* fix(core): add baggage support for values containing an equals sign [#3975](https://github.com/open-telemetry/opentelemetry-js/pull/3975) @krosenk729 + ## 1.15.1 ### :bug: (Bug Fix) @@ -36,7 +40,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001 * fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass * fix(sdk-trace-web): add secureConnectionStart to https only [#3879](https://github.com/open-telemetry/opentelemetry-js/pull/3879) @Abinet18 -* fix(core): add baggage support for values containing an equals sign [#3975](https://github.com/open-telemetry/opentelemetry-js/pull/3975) @krosenk729 ### :house: (Internal) diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json index a36bbf722..bc2aa9665 100644 --- a/examples/esm-http-ts/package.json +++ b/examples/esm-http-ts/package.json @@ -1,7 +1,7 @@ { "name": "esm-http-ts", "private": true, - "version": "0.41.1", + "version": "0.41.2", "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript", "main": "build/index.js", "type": "module", @@ -31,12 +31,12 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/", "dependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/instrumentation-http": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/exporter-trace-otlp-proto": "0.41.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/instrumentation-http": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" } } diff --git a/examples/http/package.json b/examples/http/package.json index 1452ccbd8..641344b3f 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -1,7 +1,7 @@ { "name": "http-example", "private": true, - "version": "0.41.1", + "version": "0.41.2", "description": "Example of HTTP integration with OpenTelemetry", "main": "index.js", "scripts": { @@ -29,14 +29,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-jaeger": "1.15.1", - "@opentelemetry/exporter-zipkin": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/instrumentation-http": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/exporter-jaeger": "1.15.2", + "@opentelemetry/exporter-zipkin": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/instrumentation-http": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/examples/https/package.json b/examples/https/package.json index 224178299..8eeac36fa 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -1,7 +1,7 @@ { "name": "https-example", "private": true, - "version": "0.41.1", + "version": "0.41.2", "description": "Example of HTTPs integration with OpenTelemetry", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -33,14 +33,14 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/exporter-jaeger": "1.15.1", - "@opentelemetry/exporter-zipkin": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/instrumentation-http": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/exporter-jaeger": "1.15.2", + "@opentelemetry/exporter-zipkin": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/instrumentation-http": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index 6f70a428a..2b79e07cc 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -1,7 +1,7 @@ { "name": "web-opentelemetry-example", "private": true, - "version": "0.41.1", + "version": "0.41.2", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", "main": "index.js", "scripts": { @@ -43,20 +43,20 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.15.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", - "@opentelemetry/exporter-trace-otlp-http": "0.41.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", - "@opentelemetry/exporter-zipkin": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/instrumentation-fetch": "0.41.1", - "@opentelemetry/instrumentation-xml-http-request": "0.41.1", - "@opentelemetry/propagator-b3": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-web": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/context-zone": "1.15.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.2", + "@opentelemetry/exporter-trace-otlp-http": "0.41.2", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.2", + "@opentelemetry/exporter-zipkin": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/instrumentation-fetch": "0.41.2", + "@opentelemetry/instrumentation-xml-http-request": "0.41.2", + "@opentelemetry/propagator-b3": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-web": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index c16a341a2..c8817d0e4 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -1,7 +1,7 @@ { "name": "example-otlp-exporter-node", "private": true, - "version": "0.41.1", + "version": "0.41.2", "description": "Example of using @opentelemetry/collector-exporter in Node.js", "main": "index.js", "scripts": { @@ -29,17 +29,17 @@ }, "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", - "@opentelemetry/exporter-metrics-otlp-proto": "0.41.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1", - "@opentelemetry/exporter-trace-otlp-http": "0.41.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.2", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.2", + "@opentelemetry/exporter-metrics-otlp-proto": "0.41.2", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.2", + "@opentelemetry/exporter-trace-otlp-http": "0.41.2", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index fa0d69b50..0c7912b3a 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -12,12 +12,17 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) -### :bug: (Bug Fix) - ### :books: (Refine Doc) ### :house: (Internal) +## 0.42.2 + +### :bug: (Bug Fix) + +* fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup +* fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods [#3804](https://github.com/open-telemetry/opentelemetry-js/pull/3804) @pichlermarc + ## 0.41.1 ### :books: (Refine Doc) @@ -81,7 +86,6 @@ All notable changes to experimental packages in this project will be documented * fix(sdk-node): use resource interface instead of concrete class [#3803](https://github.com/open-telemetry/opentelemetry-js/pull/3803) @blumamir * fix(sdk-logs): remove includeTraceContext configuration and use LogRecord context when available [#3817](https://github.com/open-telemetry/opentelemetry-js/pull/3817) @hectorhdzg -* fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods [#3804](https://github.com/open-telemetry/opentelemetry-js/pull/3804) @pichlermarc ## 0.39.1 diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json index cf9cc50be..fc19e3ddb 100644 --- a/experimental/backwards-compatibility/node14/package.json +++ b/experimental/backwards-compatibility/node14/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node14", - "version": "0.41.1", + "version": "0.41.2", "private": true, "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.41.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/sdk-node": "0.41.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "devDependencies": { "@types/node": "14.18.25", diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json index 92f16e43e..6c94e0320 100644 --- a/experimental/backwards-compatibility/node16/package.json +++ b/experimental/backwards-compatibility/node16/package.json @@ -1,6 +1,6 @@ { "name": "backcompat-node16", - "version": "0.41.1", + "version": "0.41.2", "private": true, "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK", "main": "index.js", @@ -9,8 +9,8 @@ "peer-api-check": "node ../../../scripts/peer-api-check.js" }, "dependencies": { - "@opentelemetry/sdk-node": "0.41.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/sdk-node": "0.41.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "devDependencies": { "@types/node": "16.11.52", diff --git a/experimental/examples/logs/package.json b/experimental/examples/logs/package.json index f4295a7c9..f97826564 100644 --- a/experimental/examples/logs/package.json +++ b/experimental/examples/logs/package.json @@ -1,6 +1,6 @@ { "name": "logs-example", - "version": "0.41.0", + "version": "0.41.1", "private": true, "scripts": { "start": "ts-node index.ts" diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index ee2bb6e08..d3c2726c3 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -1,7 +1,7 @@ { "name": "opencensus-shim", "private": true, - "version": "0.41.1", + "version": "0.41.2", "description": "Example of using @opentelemetry/shim-opencensus in Node.js", "main": "index.js", "scripts": { @@ -30,11 +30,11 @@ "@opencensus/core": "0.1.0", "@opencensus/nodejs-base": "0.1.0", "@opentelemetry/api": "1.4.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1", - "@opentelemetry/shim-opencensus": "0.41.1" + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2", + "@opentelemetry/shim-opencensus": "0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" } diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json index 9b51db4a9..678f2212c 100644 --- a/experimental/examples/prometheus/package.json +++ b/experimental/examples/prometheus/package.json @@ -1,6 +1,6 @@ { "name": "prometheus-example", - "version": "0.41.1", + "version": "0.41.2", "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/exporter-prometheus": "0.41.1", - "@opentelemetry/sdk-metrics": "1.15.1" + "@opentelemetry/exporter-prometheus": "0.41.2", + "@opentelemetry/sdk-metrics": "1.15.2" } } diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json index 55d58ba1f..23d69298f 100644 --- a/experimental/packages/api-events/package.json +++ b/experimental/packages/api-events/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-events", - "version": "0.41.1", + "version": "0.41.2", "description": "Public events API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index 4a50492b4..06d473b6b 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-logs", - "version": "0.41.1", + "version": "0.41.2", "description": "Public logs API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index bc9f28c60..d3c2fb9b1 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-grpc", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -51,9 +51,9 @@ "@babel/core": "7.22.10", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/api-logs": "0.41.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/resources": "1.15.1", + "@opentelemetry/api-logs": "0.41.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/resources": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -73,10 +73,10 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/sdk-logs": "0.41.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/sdk-logs": "0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 23ad53c61..5abf5d1b6 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.41.1", + "version": "0.41.2", "publishConfig": { "access": "public" }, @@ -73,8 +73,8 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", - "@opentelemetry/api-logs": "0.41.1", - "@opentelemetry/resources": "1.15.1", + "@opentelemetry/api-logs": "0.41.2", + "@opentelemetry/resources": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -105,9 +105,9 @@ "@opentelemetry/api-logs": ">=0.38.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/sdk-logs": "0.41.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/sdk-logs": "0.41.2" } } diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index 37200e912..4a210f122 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.41.1", + "version": "0.41.2", "description": "An OTLP exporter to send logs using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -93,14 +93,14 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.41.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/otlp-proto-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-logs": "0.41.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/api-logs": "0.41.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/otlp-proto-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-logs": "0.41.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 002839950..7d310c875 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ "@babel/core": "7.22.10", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/otlp-exporter-base": "0.41.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -70,11 +70,11 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 9d5f3efc3..8bed923c8 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -95,11 +95,11 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", "sideEffects": false diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index d41027bac..1b143605c 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -92,12 +92,12 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/otlp-proto-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/otlp-proto-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 0f29c9c6d..c5c56290b 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Resource Detector for Browser", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -82,8 +82,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 727b5ca2b..b1156ba3f 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-grpc", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -69,12 +69,12 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", - "@opentelemetry/otlp-grpc-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.2", + "@opentelemetry/otlp-grpc-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index e0e814bcd..6cfc836a0 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-http", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -95,11 +95,11 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 12496de95..e27d1c89f 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-metrics-otlp-proto", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -67,13 +67,13 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", - "@opentelemetry/otlp-proto-exporter-base": "0.41.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/exporter-metrics-otlp-http": "0.41.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", + "@opentelemetry/otlp-proto-exporter-base": "0.41.2", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "sideEffects": false diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index af3ea6833..327e452c9 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/semantic-conventions": "1.15.1", + "@opentelemetry/semantic-conventions": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -61,9 +61,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index d91814f30..2b219797d 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,9 +56,9 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.15.1", - "@opentelemetry/propagator-b3": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/context-zone": "1.15.2", + "@opentelemetry/propagator-b3": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -88,10 +88,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/sdk-trace-web": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/sdk-trace-web": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 0fc2fd5bf..4e3b39bce 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -47,16 +47,16 @@ }, "devDependencies": { "@bufbuild/buf": "1.21.0-1", - "@protobuf-ts/grpc-transport": "2.9.1", - "@protobuf-ts/runtime-rpc": "2.9.1", - "@protobuf-ts/runtime": "2.9.1", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/context-async-hooks": "1.15.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", + "@protobuf-ts/grpc-transport": "2.9.1", + "@protobuf-ts/runtime": "2.9.1", + "@protobuf-ts/runtime-rpc": "2.9.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", @@ -75,8 +75,8 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 32a25479b..19b0d5651 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,10 +46,10 @@ }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.1", - "@opentelemetry/sdk-metrics": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", + "@opentelemetry/context-async-hooks": "1.15.2", + "@opentelemetry/sdk-metrics": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.18", @@ -74,9 +74,9 @@ "@opentelemetry/api": "^1.3.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/semantic-conventions": "1.15.1", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/semantic-conventions": "1.15.2", "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 2ef2fc894..2b12f444d 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -56,9 +56,9 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.15.1", - "@opentelemetry/propagator-b3": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/context-zone": "1.15.2", + "@opentelemetry/propagator-b3": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -88,10 +88,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/sdk-trace-web": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/sdk-trace-web": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 97a8b5d4e..859058695 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.41.1", + "version": "0.41.2", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation", @@ -83,7 +83,7 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", - "@opentelemetry/sdk-metrics": "1.15.1", + "@opentelemetry/sdk-metrics": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index d5773f83b..857c8c79d 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,27 +44,27 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-logs": "0.41.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/exporter-jaeger": "1.15.1", - "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1", - "@opentelemetry/exporter-trace-otlp-http": "0.41.1", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.1", - "@opentelemetry/exporter-zipkin": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-logs": "0.41.1", - "@opentelemetry/sdk-metrics": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-node": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/api-logs": "0.41.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/exporter-jaeger": "1.15.2", + "@opentelemetry/exporter-trace-otlp-grpc": "0.41.2", + "@opentelemetry/exporter-trace-otlp-http": "0.41.2", + "@opentelemetry/exporter-trace-otlp-proto": "0.41.2", + "@opentelemetry/exporter-zipkin": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-logs": "0.41.2", + "@opentelemetry/sdk-metrics": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-node": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.5.0" }, "devDependencies": { "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.1", + "@opentelemetry/context-async-hooks": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 70c6fef12..9896eaaf8 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-exporter-base", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry OTLP Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -61,7 +61,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.15.1" + "@opentelemetry/core": "1.15.2" }, "devDependencies": { "@babel/core": "7.22.10", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 87def63d6..66bf284d2 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-grpc-exporter-base", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry OTLP-gRPC Exporter base (for internal use only)", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,9 +50,9 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": "1.4.1", - "@opentelemetry/otlp-transformer": "0.41.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/otlp-transformer": "0.41.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -73,8 +73,8 @@ }, "dependencies": { "@grpc/grpc-js": "^1.7.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 61873ad1d..6426bf9eb 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/otlp-proto-exporter-base", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -79,8 +79,8 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/otlp-exporter-base": "0.41.1", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/otlp-exporter-base": "0.41.2", "protobufjs": "^7.2.3" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index c8a77ae0b..6b48eacda 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "0.41.1", + "version": "0.41.2", "description": "Transform OpenTelemetry SDK data into OTLP", "module": "build/esm/index.js", "esnext": "build/esnext/index.js", @@ -78,12 +78,12 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api-logs": "0.41.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-logs": "0.41.1", - "@opentelemetry/sdk-metrics": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1" + "@opentelemetry/api-logs": "0.41.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-logs": "0.41.2", + "@opentelemetry/sdk-metrics": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", "sideEffects": false diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index a23006ad2..5c53b8417 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-logs", - "version": "0.41.1", + "version": "0.41.2", "publishConfig": { "access": "public" }, @@ -74,7 +74,7 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": ">=1.4.0 <1.5.0", - "@opentelemetry/api-logs": "0.41.1", + "@opentelemetry/api-logs": "0.41.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -99,7 +99,7 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/resources": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2" } } diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index d2deaae5f..3c9d4e820 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opencensus", - "version": "0.41.1", + "version": "0.41.2", "description": "OpenCensus to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,8 +50,8 @@ "devDependencies": { "@opencensus/core": "0.1.0", "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-async-hooks": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/context-async-hooks": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -69,7 +69,7 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", + "@opentelemetry/core": "1.15.2", "require-in-the-middle": "^7.1.1", "semver": "^7.5.1" }, diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index c027ea34c..505797007 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "1.15.1", + "version": "1.15.2", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,9 +12,9 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/context-async-hooks": "1.15.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/context-async-hooks": "1.15.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "axios": "1.4.0", "body-parser": "1.19.0", "express": "4.17.3" diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index f8f479722..362127101 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 65193793e..ba41bbe51 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index b827d8211..5b9581933 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -75,7 +75,7 @@ "webpack-merge": "5.9.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.1", + "@opentelemetry/context-zone-peer-dep": "1.15.2", "zone.js": "^0.11.0" }, "sideEffects": true, diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index cb8da74b1..061821f18 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/core", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -91,7 +91,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index e31c28eaa..162997425 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.0", - "@opentelemetry/resources": "1.15.1", + "@opentelemetry/resources": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -63,9 +63,9 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2", "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index e32960e4b..c68c7eb44 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -92,10 +92,10 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index a67230166..2a50fd93e 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -51,7 +51,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "1.15.1" + "@opentelemetry/core": "1.15.2" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0" diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 26e16812d..868cb0c2a 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -81,7 +81,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1" + "@opentelemetry/core": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger", "sideEffects": false diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index ddcc1e48d..bed20a954 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -91,8 +91,8 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index c8b2ea54a..2e741d532 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-base", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -93,9 +93,9 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 80b097656..bd88e07fd 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,8 +46,8 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/resources": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/semver": "7.5.0", @@ -65,11 +65,11 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/context-async-hooks": "1.15.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/propagator-b3": "1.15.1", - "@opentelemetry/propagator-jaeger": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/context-async-hooks": "1.15.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/propagator-b3": "1.15.2", + "@opentelemetry/propagator-jaeger": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "semver": "^7.5.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index fa1287b20..1d31e720e 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-web", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -57,9 +57,9 @@ "devDependencies": { "@babel/core": "7.22.10", "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/context-zone": "1.15.1", - "@opentelemetry/propagator-b3": "1.15.1", - "@opentelemetry/resources": "1.15.1", + "@opentelemetry/context-zone": "1.15.2", + "@opentelemetry/propagator-b3": "1.15.2", + "@opentelemetry/resources": "1.15.2", "@types/jquery": "3.5.16", "@types/mocha": "10.0.1", "@types/node": "18.6.5", @@ -92,9 +92,9 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/core": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 778d89dd1..bca2bd960 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 473b473cd..123ed49b8 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,9 +43,9 @@ }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/propagator-b3": "1.15.1", - "@opentelemetry/propagator-jaeger": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", + "@opentelemetry/propagator-b3": "1.15.2", + "@opentelemetry/propagator-jaeger": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "codecov": "3.8.3", @@ -60,8 +60,8 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/semantic-conventions": "1.15.1", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 612036af2..7de85fe7e 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-metrics", - "version": "1.15.1", + "version": "1.15.2", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -84,8 +84,8 @@ "@opentelemetry/api": ">=1.3.0 <1.5.0" }, "dependencies": { - "@opentelemetry/core": "1.15.1", - "@opentelemetry/resources": "1.15.1", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", "lodash.merge": "^4.6.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", diff --git a/packages/template/package.json b/packages/template/package.json index f7e010f22..cb538a503 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "1.15.1", + "version": "1.15.2", "private": true, "publishConfig": { "access": "restricted" diff --git a/selenium-tests/package.json b/selenium-tests/package.json index 758542516..71c40a8ed 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/selenium-tests", - "version": "1.15.1", + "version": "1.15.2", "private": true, "description": "OpenTelemetry Selenium Tests", "main": "index.js", @@ -56,16 +56,16 @@ "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.1", - "@opentelemetry/core": "1.15.1", - "@opentelemetry/exporter-trace-otlp-http": "0.41.1", - "@opentelemetry/exporter-zipkin": "1.15.1", - "@opentelemetry/instrumentation": "0.41.1", - "@opentelemetry/instrumentation-fetch": "0.41.1", - "@opentelemetry/instrumentation-xml-http-request": "0.41.1", - "@opentelemetry/sdk-metrics": "1.15.1", - "@opentelemetry/sdk-trace-base": "1.15.1", - "@opentelemetry/sdk-trace-web": "1.15.1", + "@opentelemetry/context-zone-peer-dep": "1.15.2", + "@opentelemetry/core": "1.15.2", + "@opentelemetry/exporter-trace-otlp-http": "0.41.2", + "@opentelemetry/exporter-zipkin": "1.15.2", + "@opentelemetry/instrumentation": "0.41.2", + "@opentelemetry/instrumentation-fetch": "0.41.2", + "@opentelemetry/instrumentation-xml-http-request": "0.41.2", + "@opentelemetry/sdk-metrics": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/sdk-trace-web": "1.15.2", "zone.js": "0.11.4" } } From d3436bfac5fb2bf739808afef305530fce88ef61 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Thu, 10 Aug 2023 04:27:47 -0400 Subject: [PATCH 86/94] feat(sdk-metrics): implement MetricProducer specification (#4007) Co-authored-by: David Ashpole --- CHANGELOG.md | 2 + .../sdk-metrics/src/export/MetricReader.ts | 63 +++++++-- packages/sdk-metrics/src/index.ts | 2 + .../test/export/MetricReader.test.ts | 120 +++++++++++++++++- .../test/export/TestMetricProducer.ts | 17 ++- .../test/export/TestMetricReader.ts | 2 +- 6 files changed, 187 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d449ad83d..63e669ceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) +* feat(sdk-metrics): implement MetricProducer specification [#4007](https://github.com/open-telemetry/opentelemetry-js/pull/4007) + ### :bug: (Bug Fix) ### :books: (Refine Doc) diff --git a/packages/sdk-metrics/src/export/MetricReader.ts b/packages/sdk-metrics/src/export/MetricReader.ts index 3bc4c63a0..8aad601d7 100644 --- a/packages/sdk-metrics/src/export/MetricReader.ts +++ b/packages/sdk-metrics/src/export/MetricReader.ts @@ -18,7 +18,7 @@ import * as api from '@opentelemetry/api'; import { AggregationTemporality } from './AggregationTemporality'; import { MetricProducer } from './MetricProducer'; import { CollectionResult } from './MetricData'; -import { callWithTimeout } from '../utils'; +import { FlatMap, callWithTimeout } from '../utils'; import { InstrumentType } from '../InstrumentDescriptor'; import { CollectionOptions, @@ -45,6 +45,13 @@ export interface MetricReaderOptions { * not configured, cumulative is used for all instruments. */ aggregationTemporalitySelector?: AggregationTemporalitySelector; + /** + * **Note, this option is experimental**. Additional MetricProducers to use as a source of + * aggregated metric data in addition to the SDK's metric data. The resource returned by + * these MetricProducers is ignored; the SDK's resource will be used instead. + * @experimental + */ + metricProducers?: MetricProducer[]; } /** @@ -55,8 +62,10 @@ export abstract class MetricReader { // Tracks the shutdown state. // TODO: use BindOncePromise here once a new version of @opentelemetry/core is available. private _shutdown = false; - // MetricProducer used by this instance. - private _metricProducer?: MetricProducer; + // Additional MetricProducers which will be combined with the SDK's output + private _metricProducers: MetricProducer[]; + // MetricProducer used by this instance which produces metrics from the SDK + private _sdkMetricProducer?: MetricProducer; private readonly _aggregationTemporalitySelector: AggregationTemporalitySelector; private readonly _aggregationSelector: AggregationSelector; @@ -66,20 +75,26 @@ export abstract class MetricReader { this._aggregationTemporalitySelector = options?.aggregationTemporalitySelector ?? DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR; + this._metricProducers = options?.metricProducers ?? []; } /** - * Set the {@link MetricProducer} used by this instance. + * Set the {@link MetricProducer} used by this instance. **This should only be called by the + * SDK and should be considered internal.** * + * To add additional {@link MetricProducer}s to a {@link MetricReader}, pass them to the + * constructor as {@link MetricReaderOptions.metricProducers}. + * + * @internal * @param metricProducer */ setMetricProducer(metricProducer: MetricProducer) { - if (this._metricProducer) { + if (this._sdkMetricProducer) { throw new Error( 'MetricReader can not be bound to a MeterProvider again.' ); } - this._metricProducer = metricProducer; + this._sdkMetricProducer = metricProducer; this.onInitialized(); } @@ -130,7 +145,7 @@ export abstract class MetricReader { * Collect all metrics from the associated {@link MetricProducer} */ async collect(options?: CollectionOptions): Promise { - if (this._metricProducer === undefined) { + if (this._sdkMetricProducer === undefined) { throw new Error('MetricReader is not bound to a MetricProducer'); } @@ -139,9 +154,37 @@ export abstract class MetricReader { throw new Error('MetricReader is shutdown'); } - return this._metricProducer.collect({ - timeoutMillis: options?.timeoutMillis, - }); + const [sdkCollectionResults, ...additionalCollectionResults] = + await Promise.all([ + this._sdkMetricProducer.collect({ + timeoutMillis: options?.timeoutMillis, + }), + ...this._metricProducers.map(producer => + producer.collect({ + timeoutMillis: options?.timeoutMillis, + }) + ), + ]); + + // Merge the results, keeping the SDK's Resource + const errors = sdkCollectionResults.errors.concat( + FlatMap(additionalCollectionResults, result => result.errors) + ); + const resource = sdkCollectionResults.resourceMetrics.resource; + const scopeMetrics = + sdkCollectionResults.resourceMetrics.scopeMetrics.concat( + FlatMap( + additionalCollectionResults, + result => result.resourceMetrics.scopeMetrics + ) + ); + return { + resourceMetrics: { + resource, + scopeMetrics, + }, + errors, + }; } /** diff --git a/packages/sdk-metrics/src/index.ts b/packages/sdk-metrics/src/index.ts index 4760da3cc..c9623707f 100644 --- a/packages/sdk-metrics/src/index.ts +++ b/packages/sdk-metrics/src/index.ts @@ -54,6 +54,8 @@ export { InMemoryMetricExporter } from './export/InMemoryMetricExporter'; export { ConsoleMetricExporter } from './export/ConsoleMetricExporter'; +export { MetricCollectOptions, MetricProducer } from './export/MetricProducer'; + export { InstrumentDescriptor, InstrumentType } from './InstrumentDescriptor'; export { MeterProvider, MeterProviderOptions } from './MeterProvider'; diff --git a/packages/sdk-metrics/test/export/MetricReader.test.ts b/packages/sdk-metrics/test/export/MetricReader.test.ts index 297622982..c0643a60d 100644 --- a/packages/sdk-metrics/test/export/MetricReader.test.ts +++ b/packages/sdk-metrics/test/export/MetricReader.test.ts @@ -20,7 +20,13 @@ import { MeterProvider } from '../../src/MeterProvider'; import { assertRejects } from '../test-utils'; import { emptyResourceMetrics, TestMetricProducer } from './TestMetricProducer'; import { TestMetricReader } from './TestMetricReader'; -import { Aggregation, AggregationTemporality } from '../../src'; +import { + Aggregation, + AggregationTemporality, + DataPointType, + InstrumentType, + ScopeMetrics, +} from '../../src'; import { DEFAULT_AGGREGATION_SELECTOR, DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR, @@ -29,6 +35,39 @@ import { assertAggregationSelector, assertAggregationTemporalitySelector, } from './utils'; +import { defaultResource } from '../util'; +import { ValueType } from '@opentelemetry/api'; +import { Resource } from '@opentelemetry/resources'; + +const testScopeMetrics: ScopeMetrics[] = [ + { + scope: { + name: 'additionalMetricProducerMetrics', + }, + metrics: [ + { + aggregationTemporality: AggregationTemporality.CUMULATIVE, + dataPointType: DataPointType.SUM, + dataPoints: [ + { + attributes: {}, + value: 1, + startTime: [0, 0], + endTime: [1, 0], + }, + ], + descriptor: { + name: 'additionalCounter', + unit: '', + type: InstrumentType.COUNTER, + description: '', + valueType: ValueType.INT, + }, + isMonotonic: true, + }, + ], + }, +]; describe('MetricReader', () => { describe('setMetricProducer', () => { @@ -83,20 +122,91 @@ describe('MetricReader', () => { assertRejects(reader.collect(), /MetricReader is shutdown/); }); - it('should call MetricProduce.collect with timeout', async () => { + it('should call MetricProducer.collect with timeout', async () => { const reader = new TestMetricReader(); const producer = new TestMetricProducer(); reader.setMetricProducer(producer); - const collectStub = sinon.stub(producer, 'collect'); + const collectSpy = sinon.spy(producer, 'collect'); await reader.collect({ timeoutMillis: 20 }); - assert(collectStub.calledOnce); - const args = collectStub.args[0]; + assert(collectSpy.calledOnce); + const args = collectSpy.args[0]; assert.deepStrictEqual(args, [{ timeoutMillis: 20 }]); await reader.shutdown(); }); + + it('should collect metrics from the SDK and the additional metricProducers', async () => { + const meterProvider = new MeterProvider({ resource: defaultResource }); + const additionalProducer = new TestMetricProducer({ + resourceMetrics: { + resource: new Resource({ + shouldBeDiscarded: 'should-be-discarded', + }), + scopeMetrics: testScopeMetrics, + }, + }); + const reader = new TestMetricReader({ + metricProducers: [additionalProducer], + }); + meterProvider.addMetricReader(reader); + + // Make a measurement + meterProvider + .getMeter('someSdkMetrics') + .createCounter('sdkCounter') + .add(5, { hello: 'world' }); + const collectionResult = await reader.collect(); + + assert.strictEqual(collectionResult.errors.length, 0); + // Should keep the SDK's Resource only + assert.deepStrictEqual( + collectionResult.resourceMetrics.resource, + defaultResource + ); + assert.strictEqual( + collectionResult.resourceMetrics.scopeMetrics.length, + 2 + ); + const [sdkScopeMetrics, additionalScopeMetrics] = + collectionResult.resourceMetrics.scopeMetrics; + + assert.strictEqual(sdkScopeMetrics.scope.name, 'someSdkMetrics'); + assert.strictEqual( + additionalScopeMetrics.scope.name, + 'additionalMetricProducerMetrics' + ); + + await reader.shutdown(); + }); + + it('should merge the errors from the SDK and all metricProducers', async () => { + const meterProvider = new MeterProvider(); + const reader = new TestMetricReader({ + metricProducers: [ + new TestMetricProducer({ errors: ['err1'] }), + new TestMetricProducer({ errors: ['err2'] }), + ], + }); + meterProvider.addMetricReader(reader); + + // Provide a callback throwing an error too + meterProvider + .getMeter('someSdkMetrics') + .createObservableCounter('sdkCounter') + .addCallback(result => { + throw 'errsdk'; + }); + const collectionResult = await reader.collect(); + + assert.deepStrictEqual(collectionResult.errors, [ + 'errsdk', + 'err1', + 'err2', + ]); + await reader.shutdown(); + }); }); describe('selectAggregation', () => { diff --git a/packages/sdk-metrics/test/export/TestMetricProducer.ts b/packages/sdk-metrics/test/export/TestMetricProducer.ts index 29137d62a..d4865724c 100644 --- a/packages/sdk-metrics/test/export/TestMetricProducer.ts +++ b/packages/sdk-metrics/test/export/TestMetricProducer.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { CollectionResult } from '../../src/export/MetricData'; +import { CollectionResult, ResourceMetrics } from '../../src/export/MetricData'; import { MetricProducer } from '../../src/export/MetricProducer'; import { defaultResource } from '../util'; @@ -24,10 +24,21 @@ export const emptyResourceMetrics = { }; export class TestMetricProducer implements MetricProducer { + private resourceMetrics: ResourceMetrics; + private errors: unknown[]; + + constructor(params?: { + resourceMetrics?: ResourceMetrics; + errors?: unknown[]; + }) { + this.resourceMetrics = params?.resourceMetrics ?? emptyResourceMetrics; + this.errors = params?.errors ?? []; + } + async collect(): Promise { return { - resourceMetrics: { resource: defaultResource, scopeMetrics: [] }, - errors: [], + resourceMetrics: this.resourceMetrics, + errors: this.errors, }; } } diff --git a/packages/sdk-metrics/test/export/TestMetricReader.ts b/packages/sdk-metrics/test/export/TestMetricReader.ts index 61727322a..46fd41c04 100644 --- a/packages/sdk-metrics/test/export/TestMetricReader.ts +++ b/packages/sdk-metrics/test/export/TestMetricReader.ts @@ -31,7 +31,7 @@ export class TestMetricReader extends MetricReader { } getMetricCollector(): MetricCollector { - return this['_metricProducer'] as MetricCollector; + return this['_sdkMetricProducer'] as MetricCollector; } } From a1243eec445758d557bcb9add7f773810d7269a8 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 10 Aug 2023 15:41:47 +0700 Subject: [PATCH 87/94] chore: fix issue with nyc crashing (#1605) * chore: fix issue with nyc crashing * chore: revert hoist change, make @babel/core nohoist * chore: update @babel/core to test Garbage Collector issue * chore: bump typescripts to 4.4.4 in some package * Revert "chore: bump typescripts to 4.4.4 in some package" This reverts commit 5bf1bfbe433bf614787c0ccca79a40aa644c86b3. * Revert "Revert "chore: bump typescripts to 4.4.4 in some package"" This reverts commit 2877b7e500b629216a66f4b9300e82e3d452ab4f. * Fix cancelled issue --------- Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .github/workflows/unit-test.yml | 11 +++++++++-- metapackages/auto-instrumentations-web/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../web/opentelemetry-plugin-react-load/package.json | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 89bc0eb04..654d7a95f 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -10,6 +10,9 @@ jobs: fail-fast: false matrix: node: ["14", "16", "18"] + include: + - node: 14 + code-coverage: true runs-on: ubuntu-latest services: memcached: @@ -146,12 +149,16 @@ jobs: run: npm install --ignore-scripts - name: Bootstrap Dependencies run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha' - - name: Unit tests + - name: Unit tests (Full) + if: matrix.code-coverage + run: npm run test -- ${{ matrix.lerna-extra-args }} + - name: Unit tests (Delta) + if: ${{ !matrix.code-coverage }} run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples run: npm run compile:examples - name: Report Coverage - if: matrix.node == '14' + if: ${{ matrix.code-coverage && !cancelled()}} uses: codecov/codecov-action@v3 with: verbose: true diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index c0f086b10..6477d3bec 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -33,7 +33,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 698334f94..82b2ac90e 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -50,7 +50,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 3d3108572..5e0bfedb5 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.16", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index a1224f352..7ee6154e3 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 112433c1f..fce5e9d25 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", From 902229afd89a2cf59b120b75892a56bdab5ff039 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 10 Aug 2023 12:23:28 +0300 Subject: [PATCH 88/94] chore: update blumamir employee name in the README (#4052) Co-authored-by: Marc Pichler --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 370dfb17d..dfd297a7b 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t #### Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers)) -- [Amir Blum](https://github.com/blumamir), Aspecto +- [Amir Blum](https://github.com/blumamir), Keyval - [Chengzhong Wu](https://github.com/legendecas), Alibaba - [Daniel Dyla](https://github.com/dyladan), Dynatrace - [Marc Pichler](https://github.com/pichlermarc), Dynatrace From e3d7f60562f49742831a9eed1e99aa58713f87e8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 10 Aug 2023 11:26:50 +0200 Subject: [PATCH 89/94] chore(deps): update all patch versions (#1604) --- .../package.json | 2 +- .../node/opentelemetry-resource-detector-aws/package.json | 2 +- .../opentelemetry-resource-detector-container/package.json | 2 +- .../opentelemetry-resource-detector-github/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 4 ++-- packages/opentelemetry-host-metrics/package.json | 2 +- packages/opentelemetry-id-generator-aws-xray/package.json | 2 +- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 4 ++-- plugins/node/instrumentation-cucumber/package.json | 6 +++--- plugins/node/instrumentation-mongoose/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../node/opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-cassandra/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- .../node/opentelemetry-instrumentation-express/package.json | 2 +- .../node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-koa/package.json | 4 ++-- .../node/opentelemetry-instrumentation-mysql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-net/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pg/package.json | 2 +- .../node/opentelemetry-instrumentation-pino/package.json | 2 +- .../node/opentelemetry-instrumentation-winston/package.json | 2 +- .../package.json | 4 ++-- .../opentelemetry-instrumentation-long-task/package.json | 4 ++-- .../package.json | 4 ++-- plugins/web/opentelemetry-plugin-react-load/package.json | 6 +++--- 28 files changed, 38 insertions(+), 38 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 60adc9a00..e6bd34924 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -46,7 +46,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index db7a5c49f..c1e52afb9 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -45,7 +45,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nock": "13.3.2", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index b9fbf4105..19c95d285 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -39,7 +39,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "^18.0.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", "nock": "13.3.2", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index cb74595f3..36af2ffce 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -48,7 +48,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index a16e01b5b..56d43288f 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -40,7 +40,7 @@ "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 6477d3bec..e5cc476e7 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -33,11 +33,11 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index b5e85ace8..cbfaaf787 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index bb895a2aa..71cd335ae 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -57,7 +57,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 3855ff61d..afb90e170 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -54,7 +54,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index ed4e47f14..9f6a80634 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -54,9 +54,9 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/amqplib": "^0.5.17", - "@types/lodash": "4.14.195", + "@types/lodash": "4.14.197", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/node": "18.16.19", "amqplib": "0.8.0", "expect": "29.2.0", diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 8aad67862..289c073ea 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -54,13 +54,13 @@ "@types/mocha": "7.0.2", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", - "gts": "3.1.0", + "@types/sinon": "10.0.16", + "gts": "3.1.1", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", "semver": "^7.3.2", - "sinon": "14.0.0", + "sinon": "14.0.2", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index c8bb283c1..71cda9320 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -52,7 +52,7 @@ "@types/node": "18.16.19", "expect": "29.2.0", "mocha": "7.2.0", - "mongoose": "6.11.3", + "mongoose": "6.11.5", "nyc": "15.1.0", "rimraf": "5.0.1", "test-all-versions": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index aaac2459f..38837b798 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -63,7 +63,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "aws-sdk": "2.1008.0", "eslint": "8.7.0", "expect": "29.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index c840464dd..9979f86f6 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "bunyan": "1.8.15", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 67bbdc490..306215305 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -54,7 +54,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "cassandra-driver": "4.6.4", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 1a295836c..14d1a3764 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -53,7 +53,7 @@ "@types/node": "18.16.19", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 81ee1eb31..b4924b098 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -54,7 +54,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "express": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index f91d32215..f60baa4ac 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -56,7 +56,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/node": "18.16.19", "cross-env": "7.0.3", "ioredis": "5.2.2", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 0ab0d0092..8084874db 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -56,7 +56,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "koa": "2.13.1", "mocha": "7.2.0", "nyc": "15.1.0", @@ -70,7 +70,7 @@ "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.41.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/koa": "2.13.6", + "@types/koa": "2.13.8", "@types/koa__router": "8.0.11" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa#readme" diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 7e0dd110a..52e61596d 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "mysql": "2.18.1", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 343edf2bc..8272e9200 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -52,7 +52,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 215d11813..797ffc463 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -60,7 +60,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 7bfab71a2..3b8d1a76e 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -54,7 +54,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/semver": "7.5.0", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index fe6d76b6f..afd7294be 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -53,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 82b2ac90e..e32e1c4f5 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -50,11 +50,11 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 5e0bfedb5..7d0a82ebf 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -47,13 +47,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 7ee6154e3..3528e3619 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -47,7 +47,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", @@ -55,7 +55,7 @@ "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index fce5e9d25..da73ea9a2 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -47,16 +47,16 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.9", + "@babel/core": "7.22.10", "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", "@types/node": "18.16.19", - "@types/react": "17.0.62", + "@types/react": "17.0.64", "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.15", + "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", From 3f2bfe8ed6feada3f1acc23677862501e8c06304 Mon Sep 17 00:00:00 2001 From: Carol Abadeer <60774943+carolabadeer@users.noreply.github.com> Date: Thu, 10 Aug 2023 03:41:54 -0700 Subject: [PATCH 90/94] fix(aws-sdk-instrumentation): Patch new smithy client and middleware packages (#1626) Co-authored-by: Amir Blum --- .../src/aws-sdk.ts | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts index c74f0433c..b82192ce8 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts @@ -112,6 +112,21 @@ export class AwsInstrumentation extends InstrumentationBase { v3MiddlewareStackFileNewVersions, ]); + // patch for @smithy/middleware-stack for aws-sdk packages v3.363.0+ + const v3SmithyMiddlewareStackFile = new InstrumentationNodeModuleFile( + '@smithy/middleware-stack/dist-cjs/MiddlewareStack.js', + ['>=1.0.1'], + this.patchV3ConstructStack.bind(this), + this.unpatchV3ConstructStack.bind(this) + ); + const v3SmithyMiddlewareStack = new InstrumentationNodeModuleDefinition( + '@smithy/middleware-stack', + ['>=2.0.0'], + undefined, + undefined, + [v3SmithyMiddlewareStackFile] + ); + const v3SmithyClient = new InstrumentationNodeModuleDefinition( '@aws-sdk/smithy-client', ['^3.1.0'], @@ -119,6 +134,14 @@ export class AwsInstrumentation extends InstrumentationBase { this.unpatchV3SmithyClient.bind(this) ); + // patch for new @smithy/smithy-client for aws-sdk packages v3.363.0+ + const v3NewSmithyClient = new InstrumentationNodeModuleDefinition( + '@smithy/smithy-client', + ['>=1.0.3'], + this.patchV3SmithyClient.bind(this), + this.unpatchV3SmithyClient.bind(this) + ); + const v2Request = new InstrumentationNodeModuleFile( 'aws-sdk/lib/core.js', ['^2.308.0'], @@ -134,7 +157,13 @@ export class AwsInstrumentation extends InstrumentationBase { [v2Request] ); - return [v2Module, v3MiddlewareStack, v3SmithyClient]; + return [ + v2Module, + v3MiddlewareStack, + v3SmithyMiddlewareStack, + v3SmithyClient, + v3NewSmithyClient, + ]; } protected patchV3ConstructStack(moduleExports: any, moduleVersion?: string) { From f4df836a279bd7512ecfeacc25db162e613a0e7e Mon Sep 17 00:00:00 2001 From: Jose Ignacio Gil Jaldo Date: Thu, 10 Aug 2023 13:19:02 +0200 Subject: [PATCH 91/94] fix(knex): nested queries result in wrong span names (#1537) * fix(knex): nested queries result in wrong span names. * Cleanup assertions. --------- Co-authored-by: Marc Pichler Co-authored-by: Amir Blum --- .../src/instrumentation.ts | 2 +- .../src/utils.ts | 8 + .../test/index.test.ts | 241 ++++++++++++++++++ 3 files changed, 250 insertions(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts index 91de6e767..257232f27 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts @@ -132,7 +132,7 @@ export class KnexInstrumentation extends InstrumentationBase { return function wrapped_logging_method(this: any, query: any) { const config = this.client.config; - const table = this.builder?._single?.table; + const table = utils.extractTableName(this.builder); // `method` actually refers to the knex API method - Not exactly "operation" // in the spec sense, but matches most of the time. const operation = query?.method; diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts b/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts index 6a54e7c87..6c7e6fbdb 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts @@ -80,3 +80,11 @@ export const limitLength = (str: string, maxLength: number) => { } return str; }; + +export const extractTableName = (builder: any): string => { + const table = builder?._single?.table; + if (typeof table === 'object') { + return extractTableName(table); + } + return table; +}; diff --git a/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts b/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts index f939160b0..1f660cf27 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts @@ -190,6 +190,247 @@ describe('Knex instrumentation', () => { } ); }); + + describe('nested queries', () => { + it('should correctly identify the table in nested queries', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const total = await nestedQueryBuilder; + assert.deepEqual(total, { count: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable1', + statement: + 'select count(*) as `count` from (select * from `te..', + parentSpan, + }, + null, + ]); + } + ); + }); + + it('should correctly identify the table in double nested queries', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const nestedClone = nestedQueryBuilder.clone().clear('order'); + const totalDoubleNested = await nestedQueryBuilder.client + .queryBuilder() + .count('* AS count2') + .from(nestedClone.as('inner2')) + .first(); + assert.deepEqual(totalDoubleNested, { count2: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable1', + statement: + 'select count(*) as `count2` from (select count(*) ..', + parentSpan, + }, + null, + ]); + } + ); + }); + + it('should correctly identify the table in join with nested table', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + await client.schema.createTable('testTable2', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test2' }).into('testTable2'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const totalDoubleNested = await nestedQueryBuilder.client + .queryBuilder() + .from('testTable2') + .leftJoin(nestedQueryBuilder.as('nested_query')) + .first(); + assert.deepEqual(totalDoubleNested, { title: 'test2', count: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + statement: 'create table `testTable2` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable2', + statement: 'insert into `testTable2` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable2', + statement: + 'select * from `testTable2` left join (select count..', + parentSpan, + }, + null, + ]); + } + ); + }); + + it('should correctly identify the table in join nested table with table', async () => { + const parentSpan = tracer.startSpan('parentSpan'); + await context.with( + trace.setSpan(context.active(), parentSpan), + async () => { + await client.schema.createTable('testTable1', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test1' }).into('testTable1'); + + await client.schema.createTable('testTable2', (table: any) => { + table.string('title'); + }); + await client.insert({ title: 'test2' }).into('testTable2'); + + const builder = client('testTable1').select('*'); + const clone = builder.clone().clear('order'); + + const nestedQueryBuilder = builder.client + .queryBuilder() + .count('* AS count') + .from(clone.as('inner')) + .first(); + + const totalDoubleNested = await nestedQueryBuilder.client + .queryBuilder() + .from(nestedQueryBuilder.as('nested_query')) + .leftJoin('testTable2') + .first(); + assert.deepEqual(totalDoubleNested, { title: 'test2', count: 1 }); + + parentSpan.end(); + + const instrumentationSpans = memoryExporter.getFinishedSpans(); + assertSpans(instrumentationSpans, [ + { + statement: 'create table `testTable1` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable1', + statement: 'insert into `testTable1` (`title`) values (?)', + parentSpan, + }, + { + statement: 'create table `testTable2` (`title` varchar(255))', + parentSpan, + }, + { + op: 'insert', + table: 'testTable2', + statement: 'insert into `testTable2` (`title`) values (?)', + parentSpan, + }, + { + op: 'first', + table: 'testTable1', + statement: + 'select * from (select count(*) as `count` from (se..', + parentSpan, + }, + null, + ]); + } + ); + }); + }); }); describe('Disabling instrumentation', () => { From ccf1efe0cf8f144ab0d0aab490dfff499bd3158e Mon Sep 17 00:00:00 2001 From: Jarle Fosen Date: Thu, 10 Aug 2023 14:09:27 +0200 Subject: [PATCH 92/94] fix(redis-4): omit credentials from db.connection_string span attribute (#1562) * fix(redis-4): omit credentials from db.connection_string span attribute * Reconstruct non-sensitive db.connection_string using built-in URL.href * style(redis-4): Fix code style according to community standards * fix(redis-4): Log error on connection string sanitization failure --------- Co-authored-by: Amir Blum Co-authored-by: Haddas Bronfman <85441461+haddasbronfman@users.noreply.github.com> --- .../src/instrumentation.ts | 4 +- .../src/utils.ts | 33 +++++++++- .../test/redis.test.ts | 63 ++++++++++++++++++- 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts index 4bf503e6c..07628f205 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-redis-4/src/instrumentation.ts @@ -354,7 +354,7 @@ export class RedisInstrumentation extends InstrumentationBase { return function patchedConnect(this: any): Promise { const options = this.options; - const attributes = getClientAttributes(options); + const attributes = getClientAttributes(this._diag, options); const span = plugin.tracer.startSpan( `${RedisInstrumentation.COMPONENT}-connect`, @@ -405,7 +405,7 @@ export class RedisInstrumentation extends InstrumentationBase { const dbStatementSerializer = this._config?.dbStatementSerializer || defaultDbStatementSerializer; - const attributes = getClientAttributes(clientOptions); + const attributes = getClientAttributes(this._diag, clientOptions); try { const dbStatement = dbStatementSerializer(commandName, commandArgs); diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts b/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts index f10260647..336bf7f2b 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-redis-4/src/utils.ts @@ -13,16 +13,45 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { DiagLogger } from '@opentelemetry/api'; import { DbSystemValues, SemanticAttributes, } from '@opentelemetry/semantic-conventions'; -export function getClientAttributes(options: any) { +export function getClientAttributes(diag: DiagLogger, options: any) { return { [SemanticAttributes.DB_SYSTEM]: DbSystemValues.REDIS, [SemanticAttributes.NET_PEER_NAME]: options?.socket?.host, [SemanticAttributes.NET_PEER_PORT]: options?.socket?.port, - [SemanticAttributes.DB_CONNECTION_STRING]: options?.url, + [SemanticAttributes.DB_CONNECTION_STRING]: + removeCredentialsFromDBConnectionStringAttribute(diag, options?.url), }; } + +/** + * removeCredentialsFromDBConnectionStringAttribute removes basic auth from url and user_pwd from query string + * + * Examples: + * redis://user:pass@localhost:6379/mydb => redis://localhost:6379/mydb + * redis://localhost:6379?db=mydb&user_pwd=pass => redis://localhost:6379?db=mydb + */ +function removeCredentialsFromDBConnectionStringAttribute( + diag: DiagLogger, + url?: unknown +): string | undefined { + if (typeof url !== 'string') { + return; + } + + try { + const u = new URL(url); + u.searchParams.delete('user_pwd'); + u.username = ''; + u.password = ''; + return u.href; + } catch (err) { + diag.error('failed to sanitize redis connection url', err); + } + return; +} diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts b/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts index 615572cf5..ac5abf5bc 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts +++ b/plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts @@ -220,8 +220,11 @@ describe('redis@^4.0.0', () => { }); it('sets error status on connection failure', async () => { + const redisURL = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }`; const newClient = createClient({ - url: `redis://${redisTestConfig.host}:${redisTestConfig.port + 1}`, + url: redisURL, }); await assert.rejects(newClient.connect()); @@ -230,6 +233,64 @@ describe('redis@^4.0.0', () => { assert.strictEqual(span.name, 'redis-connect'); assert.strictEqual(span.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + span.attributes[SemanticAttributes.DB_CONNECTION_STRING], + redisURL + ); + }); + + it('omits basic auth from DB_CONNECTION_STRING span attribute', async () => { + const redisURL = `redis://myuser:mypassword@${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }`; + const expectAttributeConnString = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }`; + const newClient = createClient({ + url: redisURL, + }); + + await assert.rejects(newClient.connect()); + + const [span] = getTestSpans(); + + assert.strictEqual(span.name, 'redis-connect'); + assert.strictEqual(span.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + span.attributes[SemanticAttributes.NET_PEER_NAME], + redisTestConfig.host + ); + assert.strictEqual( + span.attributes[SemanticAttributes.DB_CONNECTION_STRING], + expectAttributeConnString + ); + }); + + it('omits user_pwd query parameter from DB_CONNECTION_STRING span attribute', async () => { + const redisURL = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }?db=mydb&user_pwd=mypassword`; + const expectAttributeConnString = `redis://${redisTestConfig.host}:${ + redisTestConfig.port + 1 + }?db=mydb`; + const newClient = createClient({ + url: redisURL, + }); + + await assert.rejects(newClient.connect()); + + const [span] = getTestSpans(); + + assert.strictEqual(span.name, 'redis-connect'); + assert.strictEqual(span.status.code, SpanStatusCode.ERROR); + assert.strictEqual( + span.attributes[SemanticAttributes.NET_PEER_NAME], + redisTestConfig.host + ); + assert.strictEqual( + span.attributes[SemanticAttributes.DB_CONNECTION_STRING], + expectAttributeConnString + ); }); }); From 4f1124524aee565c3cfbf3975aa5d3d039377621 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 10 Aug 2023 14:57:58 +0200 Subject: [PATCH 93/94] fix(deps): update otel core experimental to v0.41.2 (#1628) --- .../opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 8 ++++---- metapackages/auto-instrumentations-web/package.json | 6 +++--- packages/opentelemetry-test-utils/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/instrumentation-dataloader/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../opentelemetry-instrumentation-aws-lambda/package.json | 2 +- .../opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-cassandra/package.json | 2 +- .../opentelemetry-instrumentation-connect/package.json | 2 +- .../node/opentelemetry-instrumentation-dns/package.json | 2 +- .../examples/package.json | 4 ++-- .../opentelemetry-instrumentation-express/package.json | 2 +- .../opentelemetry-instrumentation-fastify/package.json | 4 ++-- .../package.json | 2 +- .../opentelemetry-instrumentation-graphql/package.json | 2 +- .../node/opentelemetry-instrumentation-hapi/package.json | 2 +- .../opentelemetry-instrumentation-ioredis/package.json | 2 +- .../node/opentelemetry-instrumentation-knex/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-koa/package.json | 2 +- .../opentelemetry-instrumentation-memcached/package.json | 2 +- .../examples/package.json | 4 ++-- .../opentelemetry-instrumentation-mongodb/package.json | 2 +- .../examples/package.json | 6 +++--- .../node/opentelemetry-instrumentation-mysql/package.json | 2 +- .../opentelemetry-instrumentation-mysql2/package.json | 2 +- .../package.json | 2 +- .../node/opentelemetry-instrumentation-net/package.json | 2 +- .../node/opentelemetry-instrumentation-pg/package.json | 2 +- .../node/opentelemetry-instrumentation-pino/package.json | 2 +- .../opentelemetry-instrumentation-redis-4/package.json | 2 +- .../examples/package.json | 4 ++-- .../node/opentelemetry-instrumentation-redis/package.json | 2 +- .../opentelemetry-instrumentation-restify/package.json | 2 +- .../opentelemetry-instrumentation-router/package.json | 2 +- .../opentelemetry-instrumentation-winston/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-instrumentation-long-task/package.json | 2 +- .../package.json | 4 ++-- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index b1918ed6f..35fb4e0cd 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", - "@opentelemetry/sdk-node": "^0.41.0", + "@opentelemetry/sdk-node": "^0.41.2", "@types/mocha": "8.2.3", "@types/node": "18.16.19", "@types/semver": "7.5.0", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 56d43288f..4b82be75b 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -49,7 +49,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/instrumentation-amqplib": "^0.33.0", "@opentelemetry/instrumentation-aws-lambda": "^0.36.0", "@opentelemetry/instrumentation-aws-sdk": "^0.35.0", @@ -64,9 +64,9 @@ "@opentelemetry/instrumentation-fastify": "^0.32.0", "@opentelemetry/instrumentation-generic-pool": "^0.32.0", "@opentelemetry/instrumentation-graphql": "^0.35.0", - "@opentelemetry/instrumentation-grpc": "^0.41.0", + "@opentelemetry/instrumentation-grpc": "^0.41.2", "@opentelemetry/instrumentation-hapi": "^0.32.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-ioredis": "^0.35.0", "@opentelemetry/instrumentation-knex": "^0.32.0", "@opentelemetry/instrumentation-koa": "^0.35.0", @@ -92,6 +92,6 @@ "@opentelemetry/resource-detector-container": "^0.3.0", "@opentelemetry/resource-detector-gcp": "^0.29.0", "@opentelemetry/resources": "^1.12.0", - "@opentelemetry/sdk-node": "^0.41.0" + "@opentelemetry/sdk-node": "^0.41.2" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index e5cc476e7..79836489d 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -59,10 +59,10 @@ "webpack-merge": "5.8.0" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/instrumentation-document-load": "^0.33.0", - "@opentelemetry/instrumentation-fetch": "^0.41.0", + "@opentelemetry/instrumentation-fetch": "^0.41.2", "@opentelemetry/instrumentation-user-interaction": "^0.33.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.0" + "@opentelemetry/instrumentation-xml-http-request": "^0.41.2" } } diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index b8e3e3479..3995735c5 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -48,7 +48,7 @@ "dependencies": { "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.3.1", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-node": "^1.8.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 9f6a80634..3505cbb61 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "devDependencies": { diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 289c073ea..d23c06e90 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -66,7 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.36.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme" diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index ab90424d9..590b3886f 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" } diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 92edeb1c0..4361e87fe 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme" diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 506350a38..ceccfb35e 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -57,7 +57,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" } diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 71cda9320..5f320f246 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -61,7 +61,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme" diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index eb26da2b1..1e64ffb84 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -58,7 +58,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme" diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 59f37c9fd..b9c4219a8 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -62,7 +62,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/tedious": "^4.0.6" }, diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 525f0faab..415d231a3 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -59,7 +59,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/propagator-aws-xray": "^1.3.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 38837b798..7a382575e 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/propagation-utils": "^0.30.0" }, diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 9979f86f6..70f8d8e6a 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -64,7 +64,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@types/bunyan": "1.8.8" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 306215305..82b5e743b 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -64,7 +64,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme" diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 6eca188dd..81adf97d4 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/connect": "3.4.35" }, diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 14d1a3764..0f6f62751 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -62,7 +62,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "semver": "^7.3.2" }, diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 710ad522c..c829a5ac7 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -32,9 +32,9 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/instrumentation-express": "0.28.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index b4924b098..77de1e313 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -66,7 +66,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/express": "4.17.17" }, diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index c3950496b..65c8c2cc8 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -48,7 +48,7 @@ "@fastify/express": "^2.0.2", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^1.8.0", - "@opentelemetry/instrumentation-http": "0.41.0", + "@opentelemetry/instrumentation-http": "0.41.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/express": "4.17.17", @@ -63,7 +63,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme" diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index f716d2ba0..f89256489 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/generic-pool": "^3.1.9" }, diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 8c8eb4d1c..7f7613997 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 0dec59a58..464fca850 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -60,7 +60,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/hapi__hapi": "20.0.13" }, diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index f60baa4ac..d5232bd68 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -69,7 +69,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/ioredis4": "npm:@types/ioredis@^4.28.10" diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 1983536b1..687e6f4ef 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -60,7 +60,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme" diff --git a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json index 987572208..4c21e2689 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-koa": "^0.31.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 8084874db..7332fa4c2 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -68,7 +68,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/koa": "2.13.8", "@types/koa__router": "8.0.11" diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 47d076115..2454c18ce 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -63,7 +63,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/memcached": "^2.2.6" }, diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json index 3ee2b0c02..3b4f67004 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json @@ -33,8 +33,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-mongodb": "^0.32.0", "@opentelemetry/sdk-trace-node": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index a1c123792..241426f8f 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -71,7 +71,7 @@ }, "dependencies": { "@opentelemetry/sdk-metrics": "^1.9.1", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme" diff --git a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json index 36a933988..698bd86aa 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/examples/package.json @@ -34,12 +34,12 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-mysql": "^0.31.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", - "@opentelemetry/exporter-metrics-otlp-grpc": "0.33.0", + "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.2", "mysql": "^2.18.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 52e61596d..d9a09e3f2 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -63,7 +63,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@types/mysql": "2.15.21" }, diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index e2db06692..423274ead 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -65,7 +65,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0" }, diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 548ecc4d2..7777b1b29 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -73,7 +73,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core#readme" diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 8272e9200..82584add1 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -61,7 +61,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net#readme" diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 797ffc463..03caf5426 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -75,7 +75,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0", "@types/pg": "8.6.1", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 3b8d1a76e..fbca6c4d7 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -66,7 +66,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index b9155f425..84e65f16d 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -69,7 +69,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, diff --git a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json index 3162130ec..3d6c75980 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/examples/package.json @@ -34,8 +34,8 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/exporter-jaeger": "^1.0.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.41.0", - "@opentelemetry/instrumentation-http": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", + "@opentelemetry/instrumentation-http": "^0.41.2", "@opentelemetry/instrumentation-redis": "^0.32.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-node": "^1.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index e90fca4e8..114097676 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -70,7 +70,7 @@ "@types/redis": "2.8.32" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/redis-common": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 42b62378b..10f36902a 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -65,7 +65,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify#readme" diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index b3b12ed91..8b0a04924 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -59,7 +59,7 @@ "typescript": "4.4.4" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-router#readme" diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index afd7294be..713fd7c89 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -66,7 +66,7 @@ "winston2": "npm:winston@2.4.7" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.41.0" + "@opentelemetry/instrumentation": "^0.41.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index e32e1c4f5..3abf89be2 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -77,7 +77,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.15.0", "@opentelemetry/semantic-conventions": "^1.0.0" diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 7d0a82ebf..b78a6af9c 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -78,7 +78,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 3528e3619..bae699622 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -50,7 +50,7 @@ "@babel/core": "7.22.10", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.41.2", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.16", "@types/mocha": "7.0.2", @@ -80,7 +80,7 @@ }, "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.0", + "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/sdk-trace-web": "^1.8.0" }, "peerDependencies": { From 600bf22634190d38ad72edbc673a31e777d180eb Mon Sep 17 00:00:00 2001 From: Nev Wylie <54870357+MSNev@users.noreply.github.com> Date: Thu, 10 Aug 2023 14:05:17 -0700 Subject: [PATCH 94/94] [AutoMerge] staging @ [44bcf14...](https://github.com/open-telemetry/opentelemetry-sandbox-web-js/commit/44bcf146378abd92bed9e6fd995cf3fc11063987) ### Moving package from auto-merge/js/api to pkgs/api/ ### Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/ ### Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/ ### Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/ ### Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/ ### Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/ ### Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/ ### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/ ### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/ ### Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/ ### Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/ ### Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/ ### Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer ### Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base ### Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/ ### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/ ### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/ ### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/ ### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/ ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/ ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/ ### Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/ ### Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/ ### Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/ ### Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/ --- .gitmodules | 3 + .../.markdownlint.json => .markdownlint.json | 0 .../auto-instrumentations-web/package.json | 68 --------- .../package.json | 86 ----------- .../package.json | 89 ------------ .../package.json | 92 ------------ .../examples/opentelemetry-web/package.json | 62 -------- .../packages/api-events/package.json | 89 ------------ .../packages/api-logs/package.json | 89 ------------ .../exporter-logs-otlp-http/package.json | 113 --------------- .../exporter-logs-otlp-http/tsconfig.esm.json | 34 ----- .../tsconfig.esnext.json | 34 ----- .../exporter-logs-otlp-http/tsconfig.json | 34 ----- .../exporter-logs-otlp-proto/package.json | 107 -------------- .../tsconfig.esm.json | 40 ----- .../tsconfig.esnext.json | 40 ----- .../exporter-logs-otlp-proto/tsconfig.json | 40 ----- .../exporter-trace-otlp-http/package.json | 106 -------------- .../tsconfig.esm.json | 31 ---- .../tsconfig.esnext.json | 31 ---- .../exporter-trace-otlp-http/tsconfig.json | 32 ---- .../exporter-trace-otlp-proto/package.json | 104 ------------- .../tsconfig.esm.json | 34 ----- .../tsconfig.esnext.json | 34 ----- .../exporter-trace-otlp-proto/tsconfig.json | 34 ----- .../package.json | 89 ------------ .../tsconfig.esm.json | 22 --- .../tsconfig.esnext.json | 22 --- .../tsconfig.json | 23 --- .../tsconfig.esm.json | 31 ---- .../tsconfig.esnext.json | 31 ---- .../tsconfig.json | 32 ---- .../package.json | 98 ------------- .../tsconfig.esm.json | 37 ----- .../tsconfig.esnext.json | 37 ----- .../tsconfig.json | 38 ----- .../package.json | 98 ------------- .../tsconfig.esm.json | 37 ----- .../tsconfig.esnext.json | 37 ----- .../tsconfig.json | 38 ----- .../tsconfig.esm.json | 19 --- .../tsconfig.esnext.json | 19 --- .../tsconfig.json | 20 --- .../packages/otlp-exporter-base/package.json | 97 ------------- .../otlp-exporter-base/tsconfig.esm.json | 19 --- .../otlp-exporter-base/tsconfig.esnext.json | 19 --- .../packages/otlp-exporter-base/tsconfig.json | 20 --- .../otlp-proto-exporter-base/package.json | 88 ----------- .../tsconfig.esm.json | 24 --- .../tsconfig.esnext.json | 24 --- .../otlp-proto-exporter-base/tsconfig.json | 24 --- .../packages/otlp-transformer/package.json | 90 ------------ .../otlp-transformer/tsconfig.esm.json | 34 ----- .../otlp-transformer/tsconfig.esnext.json | 34 ----- .../packages/otlp-transformer/tsconfig.json | 35 ----- .../packages/sdk-logs/package.json | 105 -------------- .../packages/sdk-logs/tsconfig.esm.json | 25 ---- .../packages/sdk-logs/tsconfig.esnext.json | 25 ---- .../packages/sdk-logs/tsconfig.json | 25 ---- .../package.json | 90 ------------ .../tsconfig.esm.json | 19 --- .../opentelemetry-context-zone/.eslintrc.js | 7 - .../opentelemetry-context-zone/package.json | 83 ----------- .../tsconfig.esm.json | 19 --- .../tsconfig.esnext.json | 19 --- .../packages/opentelemetry-core/package.json | 98 ------------- .../opentelemetry-core/tsconfig.esm.json | 19 --- .../opentelemetry-core/tsconfig.esnext.json | 19 --- .../karma.conf.js | 26 ---- .../package.json | 102 ------------- .../tsconfig.esm.json | 28 ---- .../tsconfig.esnext.json | 28 ---- .../tsconfig.json | 29 ---- .../opentelemetry-propagator-b3/package.json | 74 ---------- .../tsconfig.esm.json | 19 --- .../opentelemetry-resources/package.json | 99 ------------- .../opentelemetry-resources/tsconfig.esm.json | 22 --- .../tsconfig.esnext.json | 22 --- .../opentelemetry-resources/tsconfig.json | 23 --- .../opentelemetry-sdk-trace-base/package.json | 102 ------------- .../tsconfig.esm.json | 25 ---- .../tsconfig.esnext.json | 25 ---- .../tsconfig.json | 26 ---- .../opentelemetry-sdk-trace-web/package.json | 101 ------------- .../tsconfig.esm.json | 34 ----- .../tsconfig.esnext.json | 34 ----- .../opentelemetry-sdk-trace-web/tsconfig.json | 35 ----- .../.eslintrc.js | 9 -- .../package.json | 67 --------- .../js/packages/sdk-metrics/.eslintrc.js | 7 - .../js/packages/sdk-metrics/package.json | 93 ------------ .../js/packages/sdk-metrics/tsconfig.esm.json | 22 --- .../packages/sdk-metrics/tsconfig.esnext.json | 22 --- .../js/packages/sdk-metrics/tsconfig.json | 23 --- .../js/eslint.base.js => eslint.base.js | 0 .../web/js}/.eslintrc.js | 0 .../web/js}/README.md | 0 .../web/js}/docker/collector-config.yaml | 0 .../web/js}/docker/docker-compose.yaml | 0 .../web/js}/docker/prometheus.yaml | 0 .../web/js}/examples/fetch-proto/index.html | 0 .../web/js}/examples/fetch-proto/index.js | 16 +- .../web/js}/examples/fetch/index.html | 0 .../web/js}/examples/fetch/index.js | 16 +- .../web/js}/examples/fetchXhr/index.html | 0 .../web/js}/examples/fetchXhr/index.js | 16 +- .../web/js}/examples/fetchXhrB3/index.html | 0 .../web/js}/examples/fetchXhrB3/index.js | 18 +-- .../web/js}/examples/metrics/index.html | 0 .../web/js}/examples/metrics/index.js | 6 +- .../js}/examples/xml-http-request/index.html | 0 .../js}/examples/xml-http-request/index.js | 16 +- .../web/js}/examples/zipkin/index.html | 0 .../web/js}/examples/zipkin/index.js | 6 +- .../web/js}/images/xml-http-request.png | Bin examples/web/js/package.json | 111 ++++++++++++++ examples/web/js/rollup.config.js | 21 +++ .../web/js}/webpack.dev.config.js | 0 .../web/js}/webpack.prod.config.js | 0 auto-merge/js/karma.base.js => karma.base.js | 0 karma.debug.js | 57 ++++++++ .../js/karma.webpack.js => karma.webpack.js | 0 .../js/karma.worker.js => karma.worker.js | 0 .../api-events}/.eslintignore | 0 .../packages => pkgs}/api-events/.eslintrc.js | 2 +- .../js/api => pkgs/api-events}/LICENSE | 0 .../packages => pkgs}/api-events/README.md | 2 +- .../api-events}/karma.conf.js | 0 pkgs/api-events/karma.debug.conf.js | 22 +++ pkgs/api-events/package.json | 115 +++++++++++++++ pkgs/api-events/rollup.config.js | 21 +++ .../api-events/src/NoopEventEmitter.ts | 0 .../src/NoopEventEmitterProvider.ts | 0 .../api-events/src/api/events.ts | 0 .../packages => pkgs}/api-events/src/index.ts | 0 .../api-events/src/internal/global-utils.ts | 0 .../src/platform/browser/globalThis.ts | 0 .../api-events}/src/platform/browser/index.ts | 0 .../api-events}/src/platform/index.ts | 0 .../src/platform/node/globalThis.ts | 0 .../api-events}/src/platform/node/index.ts | 0 .../api-events/src/types/Event.ts | 2 +- .../api-events/src/types/EventEmitter.ts | 0 .../src/types/EventEmitterOptions.ts | 2 +- .../src/types/EventEmitterProvider.ts | 0 .../api-events/test/api/api.test.ts | 0 .../api-events}/test/index-webpack.ts | 0 .../api-events/test/internal/global.test.ts | 0 .../noop-event-emitter-provider.test.ts | 0 .../noop-event-emitter.test.ts | 0 .../api-events}/tsconfig.esm.json | 5 +- .../api-events}/tsconfig.esnext.json | 5 +- .../api-events}/tsconfig.json | 5 +- .../api-logs}/.eslintignore | 0 .../packages => pkgs}/api-logs/.eslintrc.js | 2 +- .../api-events => pkgs/api-logs}/LICENSE | 0 .../packages => pkgs}/api-logs/README.md | 2 +- .../api-logs}/karma.conf.js | 0 pkgs/api-logs/karma.debug.conf.js | 22 +++ pkgs/api-logs/package.json | 115 +++++++++++++++ pkgs/api-logs/rollup.config.js | 21 +++ .../api-logs/src/NoopLogger.ts | 0 .../api-logs/src/NoopLoggerProvider.ts | 0 .../api-logs/src/api/logs.ts | 0 .../packages => pkgs}/api-logs/src/index.ts | 0 .../api-logs/src/internal/global-utils.ts | 0 .../src/platform/browser/globalThis.ts | 0 .../api-logs}/src/platform/browser/index.ts | 0 .../api-logs}/src/platform/index.ts | 0 .../api-logs}/src/platform/node/globalThis.ts | 0 .../api-logs}/src/platform/node/index.ts | 0 .../api-logs/src/types/LogRecord.ts | 2 +- .../api-logs/src/types/Logger.ts | 0 .../api-logs/src/types/LoggerOptions.ts | 2 +- .../api-logs/src/types/LoggerProvider.ts | 0 .../api-logs/test/api/api.test.ts | 0 .../api-logs}/test/index-webpack.ts | 0 .../api-logs/test/internal/global.test.ts | 0 .../noop-logger-provider.test.ts | 0 .../noop-implementations/noop-logger.test.ts | 0 .../api-logs}/tsconfig.esm.json | 5 +- .../api-logs}/tsconfig.esnext.json | 7 +- .../js/api => pkgs/api-logs}/tsconfig.json | 7 +- .../api}/.eslintignore | 0 {auto-merge/js => pkgs}/api/.eslintrc.js | 2 +- {auto-merge/js => pkgs}/api/CHANGELOG.md | 0 .../packages/api-logs => pkgs/api}/LICENSE | 0 {auto-merge/js => pkgs}/api/README.md | 4 +- .../api}/karma.conf.js | 0 pkgs/api/karma.debug.conf.js | 22 +++ .../api}/karma.worker.js | 0 {auto-merge/js => pkgs}/api/package.json | 81 +++++++---- pkgs/api/rollup.config.js | 21 +++ .../js => pkgs}/api/src/api/context.ts | 0 {auto-merge/js => pkgs}/api/src/api/diag.ts | 0 .../js => pkgs}/api/src/api/metrics.ts | 0 .../js => pkgs}/api/src/api/propagation.ts | 0 {auto-merge/js => pkgs}/api/src/api/trace.ts | 0 .../api/src/baggage/context-helpers.ts | 0 .../api/src/baggage/internal/baggage-impl.ts | 0 .../api/src/baggage/internal/symbol.ts | 0 .../js => pkgs}/api/src/baggage/types.ts | 0 .../js => pkgs}/api/src/baggage/utils.ts | 0 .../js => pkgs}/api/src/common/Attributes.ts | 0 .../js => pkgs}/api/src/common/Exception.ts | 0 .../js => pkgs}/api/src/common/Time.ts | 0 .../js => pkgs}/api/src/context-api.ts | 0 .../api/src/context/NoopContextManager.ts | 0 .../js => pkgs}/api/src/context/context.ts | 0 .../js => pkgs}/api/src/context/types.ts | 0 {auto-merge/js => pkgs}/api/src/diag-api.ts | 0 .../api/src/diag/ComponentLogger.ts | 2 +- .../js => pkgs}/api/src/diag/consoleLogger.ts | 0 .../api/src/diag/internal/logLevelLogger.ts | 0 .../api/src/diag/internal/noopLogger.ts | 0 {auto-merge/js => pkgs}/api/src/diag/types.ts | 0 {auto-merge/js => pkgs}/api/src/index.ts | 0 .../api/src/internal/global-utils.ts | 0 .../js => pkgs}/api/src/internal/semver.ts | 0 .../js => pkgs}/api/src/metrics-api.ts | 0 .../js => pkgs}/api/src/metrics/Meter.ts | 0 .../api/src/metrics/MeterProvider.ts | 0 .../js => pkgs}/api/src/metrics/Metric.ts | 0 .../js => pkgs}/api/src/metrics/NoopMeter.ts | 0 .../api/src/metrics/NoopMeterProvider.ts | 0 .../api/src/metrics/ObservableResult.ts | 0 .../api/src/platform/browser/globalThis.ts | 0 .../api}/src/platform/browser/index.ts | 0 .../api}/src/platform/index.ts | 0 .../api}/src/platform/node/globalThis.ts | 0 .../api}/src/platform/node/index.ts | 0 .../js => pkgs}/api/src/propagation-api.ts | 0 .../src/propagation/NoopTextMapPropagator.ts | 0 .../api/src/propagation/TextMapPropagator.ts | 0 {auto-merge/js => pkgs}/api/src/trace-api.ts | 0 .../api/src/trace/NonRecordingSpan.ts | 0 .../js => pkgs}/api/src/trace/NoopTracer.ts | 0 .../api/src/trace/NoopTracerProvider.ts | 0 .../js => pkgs}/api/src/trace/ProxyTracer.ts | 0 .../api/src/trace/ProxyTracerProvider.ts | 0 .../js => pkgs}/api/src/trace/Sampler.ts | 0 .../api/src/trace/SamplingResult.ts | 0 .../js => pkgs}/api/src/trace/SpanOptions.ts | 0 .../js => pkgs}/api/src/trace/attributes.ts | 0 .../api/src/trace/context-utils.ts | 0 .../api/src/trace/internal/tracestate-impl.ts | 0 .../trace/internal/tracestate-validators.ts | 0 .../api/src/trace/internal/utils.ts | 0 .../api/src/trace/invalid-span-constants.ts | 0 {auto-merge/js => pkgs}/api/src/trace/link.ts | 0 {auto-merge/js => pkgs}/api/src/trace/span.ts | 0 .../js => pkgs}/api/src/trace/span_context.ts | 0 .../js => pkgs}/api/src/trace/span_kind.ts | 0 .../api/src/trace/spancontext-utils.ts | 0 .../js => pkgs}/api/src/trace/status.ts | 0 .../js => pkgs}/api/src/trace/trace_flags.ts | 0 .../js => pkgs}/api/src/trace/trace_state.ts | 0 .../js => pkgs}/api/src/trace/tracer.ts | 0 .../api/src/trace/tracer_options.ts | 0 .../api/src/trace/tracer_provider.ts | 0 .../api/test/common/api/api.test.ts | 0 .../api/test/common/baggage/Baggage.test.ts | 0 .../common/context/NoopContextManager.test.ts | 0 .../test/common/diag/ComponentLogger.test.ts | 0 .../test/common/diag/consoleLogger.test.ts | 0 .../api/test/common/diag/logLevel.test.ts | 0 .../api/test/common/diag/logger.test.ts | 0 .../api/test/common/internal/global.test.ts | 0 .../api/test/common/internal/semver.test.ts | 0 .../api/test/common/internal/version.test.ts | 0 .../api/test/common/metrics/Metric.test.ts | 0 .../noop-implementations/noop-meter.test.ts | 0 .../noop-implementations/noop-span.test.ts | 0 .../noop-tracer-provider.test.ts | 0 .../noop-implementations/noop-tracer.test.ts | 0 .../proxy-tracer.test.ts | 0 .../common/trace/spancontext-utils.test.ts | 0 .../trace/tracestate-validators.test.ts | 0 .../api/test/common/trace/tracestate.test.ts | 0 .../js => pkgs}/api/test/index-webpack.ts | 0 .../api/test/index-webpack.worker.ts | 0 .../test/tree-shaking/tree-shaking.test.ts | 0 pkgs/api/tsconfig.esm.json | 11 ++ .../api}/tsconfig.esnext.json | 10 +- .../api}/tsconfig.json | 10 +- .../context/zone-peer-dep}/.eslintignore | 0 .../context/zone-peer-dep}/.eslintrc.js | 2 +- .../context/zone-peer-dep}/LICENSE | 0 .../context/zone-peer-dep}/README.md | 6 +- .../context/zone-peer-dep}/karma.conf.js | 0 .../context/zone-peer-dep/karma.debug.conf.js | 22 +++ pkgs/context/zone-peer-dep/package.json | 115 +++++++++++++++ pkgs/context/zone-peer-dep/rollup.config.js | 21 +++ .../zone-peer-dep}/src/ZoneContextManager.ts | 2 +- .../context/zone-peer-dep}/src/index.ts | 0 .../context/zone-peer-dep}/src/types.ts | 0 .../context/zone-peer-dep}/src/util.ts | 0 .../test/ZoneContextManager.test.ts | 2 +- .../zone-peer-dep}/test/index-webpack.ts | 0 .../context/zone-peer-dep}/test/utils.test.ts | 0 .../context/zone-peer-dep}/tsconfig.esm.json | 10 +- .../zone-peer-dep}/tsconfig.esnext.json | 10 +- .../context/zone-peer-dep}/tsconfig.json | 9 +- .../context/zone}/.eslintignore | 0 .../context/zone}/.eslintrc.js | 2 +- .../context/zone}/LICENSE | 0 .../context/zone}/README.md | 6 +- pkgs/context/zone/package.json | 110 ++++++++++++++ pkgs/context/zone/rollup.config.js | 21 +++ .../context/zone}/src/index.ts | 2 +- .../context/zone}/tsconfig.esm.json | 10 +- .../context/zone}/tsconfig.esnext.json | 10 +- .../context/zone}/tsconfig.json | 9 +- .../api-logs => pkgs/core}/.eslintignore | 0 .../core}/.eslintrc.js | 0 .../core}/.npmignore | 0 .../core}/LICENSE | 0 .../core}/README.md | 12 +- .../core}/karma.conf.js | 0 pkgs/core/karma.debug.conf.js | 22 +++ pkgs/core/karma.webpack.js | 42 ++++++ .../core}/karma.worker.js | 8 +- pkgs/core/package.json | 123 ++++++++++++++++ pkgs/core/rollup.config.js | 21 +++ .../core}/src/ExportResult.ts | 0 .../core}/src/baggage/constants.ts | 0 .../propagation/W3CBaggagePropagator.ts | 2 +- .../core}/src/baggage/utils.ts | 2 +- .../core}/src/common/anchored-clock.ts | 0 .../core}/src/common/attributes.ts | 2 +- .../core}/src/common/global-error-handler.ts | 2 +- .../core}/src/common/logging-error-handler.ts | 2 +- .../core}/src/common/time.ts | 2 +- .../core}/src/common/types.ts | 2 +- .../core}/src/index.ts | 0 .../core}/src/internal/exporter.ts | 2 +- .../core}/src/internal/validators.ts | 0 .../src/platform/browser/RandomIdGenerator.ts | 0 .../core}/src/platform/browser/environment.ts | 0 .../core}/src/platform/browser/globalThis.ts | 0 .../src/platform/browser/hex-to-base64.ts | 0 .../core}/src/platform/browser/index.ts | 0 .../core}/src/platform/browser/performance.ts | 0 .../core}/src/platform/browser/sdk-info.ts | 2 +- .../core}/src/platform/browser/timer-util.ts | 0 .../core}/src/platform/index.ts | 0 .../src/platform/node/RandomIdGenerator.ts | 0 .../core}/src/platform/node/environment.ts | 0 .../core}/src/platform/node/globalThis.ts | 0 .../core}/src/platform/node/hex-to-base64.ts | 0 .../core}/src/platform/node/index.ts | 0 .../core}/src/platform/node/performance.ts | 0 .../core}/src/platform/node/sdk-info.ts | 2 +- .../core}/src/platform/node/timer-util.ts | 0 .../core}/src/propagation/composite.ts | 2 +- .../core}/src/trace/IdGenerator.ts | 0 .../core}/src/trace/TraceState.ts | 2 +- .../src/trace/W3CTraceContextPropagator.ts | 2 +- .../core}/src/trace/rpc-metadata.ts | 2 +- .../src/trace/sampler/AlwaysOffSampler.ts | 2 +- .../src/trace/sampler/AlwaysOnSampler.ts | 2 +- .../src/trace/sampler/ParentBasedSampler.ts | 2 +- .../trace/sampler/TraceIdRatioBasedSampler.ts | 2 +- .../core}/src/trace/suppress-tracing.ts | 2 +- .../core}/src/utils/callback.ts | 0 .../core}/src/utils/environment.ts | 2 +- .../core}/src/utils/lodash.merge.ts | 0 .../core}/src/utils/merge.ts | 0 .../core}/src/utils/promise.ts | 0 .../core}/src/utils/sampling.ts | 0 .../core}/src/utils/timeout.ts | 0 .../core}/src/utils/url.ts | 0 .../core}/src/utils/wrap.ts | 0 .../test/baggage/W3CBaggagePropagator.test.ts | 4 +- .../core}/test/common/anchored-clock.test.ts | 0 .../core}/test/common/attributes.test.ts | 0 .../test/common/global-error-handler.test.ts | 2 +- .../test/common/logging-error-handler.test.ts | 2 +- .../core}/test/common/time.test.ts | 2 +- .../core}/test/index-webpack.ts | 0 pkgs/core/test/index-webpack.worker.ts | 20 +++ .../core}/test/internal/exporter.test.ts | 0 .../core}/test/internal/validators.test.ts | 0 .../test/platform/RandomIdGenerator.test.ts | 0 .../test/platform/browser/environment.test.ts | 0 .../core}/test/platform/hex-to-base64.test.ts | 0 .../core}/test/propagation/composite.test.ts | 4 +- .../sdk-logs => pkgs/core}/test/test-utils.ts | 0 .../core}/test/trace/AlwaysOffSampler.test.ts | 2 +- .../core}/test/trace/AlwaysOnSampler.test.ts | 2 +- .../test/trace/ParentBasedSampler.test.ts | 4 +- .../trace/TraceIdRatioBasedSampler.test.ts | 2 +- .../trace/W3CTraceContextPropagator.test.ts | 2 +- .../test-package/foo/bar/internal.d.ts | 0 .../fixtures/test-package/foo/bar/internal.js | 0 .../test/trace/fixtures/test-package/index.js | 0 .../trace/fixtures/test-package/package.json | 0 .../core}/test/trace/tracestate.test.ts | 0 .../core}/test/utils/callback.test.ts | 0 .../core}/test/utils/environment.test.ts | 2 +- .../core}/test/utils/merge.test.ts | 0 .../core}/test/utils/promise.test.ts | 0 .../core}/test/utils/url.test.ts | 0 .../core}/test/utils/wrap.test.ts | 0 pkgs/core/tsconfig.esm.json | 11 ++ .../core}/tsconfig.esnext.json | 10 +- .../core}/tsconfig.json | 10 +- .../detectors/browser}/.eslintignore | 0 .../detectors/browser}/.eslintrc.js | 0 .../detectors/browser}/.npmignore | 0 .../detectors/browser}/LICENSE | 0 .../detectors/browser}/README.md | 6 +- .../detectors/browser}/karma.conf.js | 0 pkgs/detectors/browser/karma.debug.conf.js | 22 +++ pkgs/detectors/browser/package.json | 115 +++++++++++++++ pkgs/detectors/browser/rollup.config.js | 21 +++ .../detectors/browser}/src/BrowserDetector.ts | 6 +- .../detectors/browser}/src/index.ts | 0 .../detectors/browser}/src/types.ts | 0 .../browser}/test/BrowserDetector.test.ts | 2 +- .../detectors/browser}/test/index-webpack.ts | 0 .../detectors/browser}/test/util.ts | 2 +- .../detectors/browser}/tsconfig.esm.json | 4 +- pkgs/detectors/browser/tsconfig.esnext.json | 11 ++ .../detectors/browser}/tsconfig.json | 7 +- .../exporters/otlp/base}/.eslintignore | 0 .../exporters/otlp/base}/.eslintrc.js | 2 +- .../exporters/otlp/base}/.npmignore | 0 .../exporters/otlp/base}/LICENSE | 0 .../exporters/otlp/base}/README.md | 0 .../exporters/otlp/base}/karma.conf.js | 4 +- pkgs/exporters/otlp/base/karma.debug.conf.js | 22 +++ pkgs/exporters/otlp/base/karma.webpack.js | 42 ++++++ pkgs/exporters/otlp/base/karma.worker.js | 24 +++ pkgs/exporters/otlp/base/package.json | 123 ++++++++++++++++ pkgs/exporters/otlp/base/rollup.config.js | 21 +++ .../otlp/base}/src/OTLPExporterBase.ts | 4 +- .../exporters/otlp/base}/src/index.ts | 0 .../browser/OTLPExporterBrowserBase.ts | 4 +- .../otlp/base}/src/platform/browser/index.ts | 0 .../otlp/base}/src/platform/browser/util.ts | 2 +- .../otlp/base}/src/platform/index.ts | 0 .../src/platform/node/OTLPExporterNodeBase.ts | 4 +- .../otlp/base}/src/platform/node/index.ts | 0 .../otlp/base}/src/platform/node/types.ts | 0 .../otlp/base}/src/platform/node/util.ts | 4 +- .../exporters/otlp/base}/src/types.ts | 0 .../exporters/otlp/base}/src/util.ts | 4 +- .../otlp/base}/test/browser/index-webpack.ts | 0 .../otlp/base}/test/browser/util.test.ts | 0 .../test/common/CollectorExporter.test.ts | 2 +- .../otlp/base}/test/common/util.test.ts | 2 +- .../otlp/base/test/index-webpack.worker.ts | 20 +++ .../otlp/base}/test/node/util.test.ts | 2 +- .../exporters/otlp/base}/test/testHelper.ts | 2 +- pkgs/exporters/otlp/base/tsconfig.esm.json | 11 ++ pkgs/exporters/otlp/base/tsconfig.esnext.json | 11 ++ pkgs/exporters/otlp/base/tsconfig.json | 12 ++ .../exporters/otlp/logs/http}/.eslintignore | 0 .../exporters/otlp/logs/http}/.eslintrc.js | 2 +- .../exporters/otlp/logs/http}/.npmignore | 0 .../exporters/otlp/logs/http}/LICENSE | 0 .../exporters/otlp/logs/http}/README.md | 10 +- .../exporters/otlp/logs/http}/karma.conf.js | 4 +- .../otlp/logs/http/karma.debug.conf.js | 22 +++ .../exporters/otlp/logs/http/karma.webpack.js | 42 ++++++ pkgs/exporters/otlp/logs/http/karma.worker.js | 24 +++ pkgs/exporters/otlp/logs/http/package.json | 137 ++++++++++++++++++ .../exporters/otlp/logs/http/rollup.config.js | 21 +++ .../exporters/otlp/logs/http}/src/index.ts | 0 .../src/platform/browser/OTLPLogExporter.ts | 12 +- .../logs/http}/src/platform/browser/index.ts | 0 .../otlp/logs/http}/src/platform/config.ts | 4 +- .../otlp/logs/http}/src/platform/index.ts | 0 .../src/platform/node/OTLPLogExporter.ts | 12 +- .../logs/http}/src/platform/node/index.ts | 0 .../test/browser/OTLPLogExporter.test.ts | 6 +- .../logs/http}/test/browser/index-webpack.ts | 0 .../otlp/logs/http}/test/config.test.ts | 0 .../logs/http/test/index-webpack.worker.ts | 20 +++ .../otlp/logs/http}/test/logHelper.ts | 12 +- .../http}/test/node/OTLPLogExporter.test.ts | 10 +- .../otlp/logs/http/tsconfig.esm.json | 11 ++ .../otlp/logs/http/tsconfig.esnext.json | 11 ++ pkgs/exporters/otlp/logs/http/tsconfig.json | 11 ++ .../exporters/otlp/logs/proto}/.eslintignore | 0 .../exporters/otlp/logs/proto}/.eslintrc.js | 2 +- .../exporters/otlp/logs/proto}/.npmignore | 0 .../exporters/otlp/logs/proto}/LICENSE | 0 .../exporters/otlp/logs/proto}/README.md | 4 +- .../exporters/otlp/logs/proto}/karma.conf.js | 4 +- .../otlp/logs/proto/karma.debug.conf.js | 22 +++ .../otlp/logs/proto/karma.webpack.js | 42 ++++++ .../exporters/otlp/logs/proto/karma.worker.js | 24 +++ pkgs/exporters/otlp/logs/proto/package.json | 133 +++++++++++++++++ .../otlp/logs/proto/rollup.config.js | 21 +++ .../exporters/otlp/logs/proto}/src/index.ts | 0 .../src/platform/browser/OTLPLogsExporter.ts | 10 +- .../logs/proto}/src/platform/browser/index.ts | 0 .../otlp/logs/proto}/src/platform/index.ts | 0 .../src/platform/node/OTLPLogsExporter.ts | 10 +- .../logs/proto}/src/platform/node/index.ts | 0 .../test/browser/OTLPLogsExporter.test.ts | 0 .../logs/proto}/test/browser/index-webpack.ts | 0 .../logs/proto/test/index-webpack.worker.ts | 20 +++ .../otlp/logs/proto}/test/logHelper.ts | 12 +- .../proto}/test/node/OTLPLogsExporter.test.ts | 12 +- .../otlp/logs/proto/tsconfig.esm.json | 11 ++ .../otlp/logs/proto/tsconfig.esnext.json | 11 ++ pkgs/exporters/otlp/logs/proto/tsconfig.json | 11 ++ .../otlp/metrics/http}/.eslintignore | 0 .../exporters/otlp/metrics/http}/.eslintrc.js | 2 +- .../exporters/otlp/metrics/http}/.npmignore | 0 .../exporters/otlp/metrics/http}/LICENSE | 0 .../exporters/otlp/metrics/http}/README.md | 8 +- .../otlp/metrics/http}/karma.conf.js | 4 +- .../otlp/metrics/http/karma.debug.conf.js | 22 +++ .../otlp/metrics/http/karma.webpack.js | 42 ++++++ .../otlp/metrics/http/karma.worker.js | 24 +++ .../exporters/otlp/metrics/http}/package.json | 92 +++++++----- .../otlp/metrics/http/rollup.config.js | 21 +++ .../http}/src/OTLPMetricExporterBase.ts | 10 +- .../http}/src/OTLPMetricExporterOptions.ts | 4 +- .../exporters/otlp/metrics/http}/src/index.ts | 0 .../platform/browser/OTLPMetricExporter.ts | 8 +- .../http}/src/platform/browser/index.ts | 0 .../otlp/metrics/http}/src/platform/index.ts | 0 .../src/platform/node/OTLPMetricExporter.ts | 8 +- .../metrics/http}/src/platform/node/index.ts | 0 .../browser/CollectorMetricExporter.test.ts | 10 +- .../http}/test/browser/index-webpack.ts | 0 .../common/CollectorMetricExporter.test.ts | 8 +- .../metrics/http/test/index-webpack.worker.ts | 20 +++ .../otlp/metrics/http}/test/metricsHelper.ts | 10 +- .../test/node/CollectorMetricExporter.test.ts | 10 +- .../metrics/http}/test/node/nodeHelpers.ts | 0 .../otlp/metrics/http/tsconfig.esm.json | 11 ++ .../otlp/metrics/http/tsconfig.esnext.json | 11 ++ .../exporters/otlp/metrics/http/tsconfig.json | 12 ++ .../exporters/otlp/proto-base}/.eslintignore | 0 .../exporters/otlp/proto-base}/.eslintrc.js | 4 +- .../exporters/otlp/proto-base}/.gitignore | 0 .../exporters/otlp/proto-base}/.npmignore | 0 .../exporters/otlp/proto-base}/LICENSE | 0 .../exporters/otlp/proto-base}/README.md | 0 pkgs/exporters/otlp/proto-base/package.json | 124 ++++++++++++++++ pkgs/exporters/otlp/proto-base/protos | 1 + .../otlp/proto-base/rollup.config.js | 21 +++ .../otlp/proto-base/src/generated}/.gitkeep | 0 .../exporters/otlp/proto-base}/src/index.ts | 0 .../browser/OTLPProtoExporterBrowserBase.ts | 4 +- .../proto-base}/src/platform/browser/index.ts | 0 .../otlp/proto-base}/src/platform/index.ts | 0 .../node/OTLPProtoExporterNodeBase.ts | 4 +- .../proto-base}/src/platform/node/index.ts | 0 .../proto-base}/src/platform/node/util.ts | 2 +- .../otlp/proto-base}/src/platform/types.ts | 0 .../otlp/proto-base}/src/platform/util.ts | 0 .../exporters/otlp/proto-base}/submodule.md | 0 .../otlp/proto-base/tsconfig.esm.json | 13 ++ .../otlp/proto-base/tsconfig.esnext.json | 13 ++ pkgs/exporters/otlp/proto-base/tsconfig.json | 13 ++ .../exporters/otlp/trace/http}/.eslintignore | 0 pkgs/exporters/otlp/trace/http/.eslintrc.js | 9 ++ .../exporters/otlp/trace/http}/.npmignore | 0 .../exporters/otlp/trace/http}/LICENSE | 0 .../exporters/otlp/trace/http}/README.md | 8 +- .../exporters/otlp/trace/http}/karma.conf.js | 4 +- .../otlp/trace/http/karma.debug.conf.js | 22 +++ .../otlp/trace/http/karma.webpack.js | 42 ++++++ .../exporters/otlp/trace/http/karma.worker.js | 24 +++ pkgs/exporters/otlp/trace/http/package.json | 130 +++++++++++++++++ .../otlp/trace/http/rollup.config.js | 21 +++ .../exporters/otlp/trace/http}/src/index.ts | 0 .../src/platform/browser/OTLPTraceExporter.ts | 8 +- .../trace/http}/src/platform/browser/index.ts | 0 .../otlp/trace/http}/src/platform/index.ts | 0 .../src/platform/node/OTLPTraceExporter.ts | 10 +- .../trace/http}/src/platform/node/index.ts | 0 .../browser/CollectorTraceExporter.test.ts | 12 +- .../trace/http}/test/browser/index-webpack.ts | 0 .../trace/http/test/index-webpack.worker.ts | 20 +++ .../test/node/CollectorTraceExporter.test.ts | 10 +- .../otlp/trace/http}/test/node/nodeHelpers.ts | 0 .../otlp/trace/http}/test/traceHelper.ts | 10 +- .../otlp/trace/http/tsconfig.esm.json | 11 ++ .../otlp/trace/http/tsconfig.esnext.json | 11 ++ pkgs/exporters/otlp/trace/http/tsconfig.json | 12 ++ .../exporters/otlp/trace/proto}/.eslintignore | 0 .../exporters/otlp/trace/proto}/.eslintrc.js | 2 +- .../exporters/otlp/trace/proto}/.npmignore | 0 .../exporters/otlp/trace/proto}/LICENSE | 0 .../exporters/otlp/trace/proto}/README.md | 4 +- pkgs/exporters/otlp/trace/proto/karma.conf.js | 26 ++++ .../otlp/trace/proto/karma.debug.conf.js | 22 +++ .../otlp/trace/proto/karma.webpack.js | 42 ++++++ .../otlp/trace/proto/karma.worker.js | 24 +++ pkgs/exporters/otlp/trace/proto/package.json | 130 +++++++++++++++++ .../otlp/trace/proto/rollup.config.js | 21 +++ .../exporters/otlp/trace/proto}/src/index.ts | 0 .../src/platform/browser/OTLPTraceExporter.ts | 10 +- .../proto}/src/platform/browser/index.ts | 0 .../otlp/trace/proto}/src/platform/index.ts | 0 .../src/platform/node/OTLPTraceExporter.ts | 10 +- .../trace/proto}/src/platform/node/index.ts | 0 .../browser/CollectorTraceExporter.test.ts | 0 .../proto}/test/browser/index-webpack.ts | 0 .../trace/proto/test/index-webpack.worker.ts | 20 +++ .../test/node/OTLPTraceExporter.test.ts | 12 +- .../otlp/trace/proto}/test/traceHelper.ts | 10 +- .../otlp/trace/proto/tsconfig.esm.json | 11 ++ .../otlp/trace/proto/tsconfig.esnext.json | 11 ++ pkgs/exporters/otlp/trace/proto/tsconfig.json | 11 ++ .../exporters/otlp/transformer}/.eslintignore | 0 .../exporters/otlp/transformer}/.eslintrc.js | 2 +- .../exporters/otlp/transformer}/.gitignore | 0 .../exporters/otlp/transformer}/README.md | 2 +- .../exporters/otlp/transformer}/karma.conf.js | 4 +- .../otlp/transformer/karma.debug.conf.js | 22 +++ .../otlp/transformer/karma.webpack.js | 42 ++++++ .../otlp/transformer/karma.worker.js | 24 +++ pkgs/exporters/otlp/transformer/package.json | 119 +++++++++++++++ .../otlp/transformer/rollup.config.js | 21 +++ .../otlp/transformer}/src/common/internal.ts | 2 +- .../otlp/transformer}/src/common/types.ts | 0 .../exporters/otlp/transformer}/src/index.ts | 0 .../otlp/transformer}/src/logs/index.ts | 10 +- .../otlp/transformer}/src/logs/types.ts | 0 .../otlp/transformer}/src/metrics/index.ts | 2 +- .../otlp/transformer}/src/metrics/internal.ts | 6 +- .../otlp/transformer}/src/metrics/types.ts | 0 .../otlp/transformer}/src/resource/types.ts | 0 .../otlp/transformer}/src/trace/index.ts | 4 +- .../otlp/transformer}/src/trace/internal.ts | 8 +- .../otlp/transformer}/src/trace/types.ts | 0 .../otlp/transformer}/test/common.test.ts | 0 .../otlp/transformer}/test/index-webpack.ts | 0 .../transformer/test/index-webpack.worker.ts | 20 +++ .../otlp/transformer}/test/logs.test.ts | 10 +- .../otlp/transformer}/test/metrics.test.ts | 8 +- .../otlp/transformer}/test/trace.test.ts | 8 +- .../otlp/transformer/tsconfig.esm.json | 11 ++ .../otlp/transformer/tsconfig.esnext.json | 11 ++ pkgs/exporters/otlp/transformer/tsconfig.json | 12 ++ .../exporters/zipkin}/.eslintignore | 0 .../exporters/zipkin}/.eslintrc.js | 0 .../exporters/zipkin}/.npmignore | 0 .../exporters/zipkin}/LICENSE | 0 .../exporters/zipkin}/README.md | 2 +- .../exporters/zipkin}/karma.conf.js | 0 pkgs/exporters/zipkin/karma.debug.conf.js | 22 +++ pkgs/exporters/zipkin/karma.webpack.js | 42 ++++++ pkgs/exporters/zipkin/karma.worker.js | 24 +++ pkgs/exporters/zipkin/package.json | 126 ++++++++++++++++ pkgs/exporters/zipkin/rollup.config.js | 21 +++ .../exporters/zipkin}/src/index.ts | 0 .../zipkin}/src/platform/browser/index.ts | 0 .../zipkin}/src/platform/browser/util.ts | 4 +- .../exporters/zipkin}/src/platform/index.ts | 0 .../zipkin}/src/platform/node/index.ts | 0 .../zipkin}/src/platform/node/util.ts | 4 +- .../exporters/zipkin}/src/transform.ts | 6 +- .../exporters/zipkin}/src/types.ts | 2 +- .../exporters/zipkin}/src/utils.ts | 0 .../exporters/zipkin}/src/zipkin.ts | 8 +- .../zipkin}/test/browser/index-webpack.ts | 0 .../zipkin}/test/browser/zipkin.test.ts | 4 +- .../zipkin}/test/common/transform.test.ts | 10 +- .../zipkin}/test/common/zipkin.test.ts | 0 .../exporters/zipkin}/test/helper.ts | 6 +- .../zipkin/test/index-webpack.worker.ts | 20 +++ .../zipkin}/test/node/zipkin.test.ts | 12 +- pkgs/exporters/zipkin/tsconfig.esm.json | 11 ++ pkgs/exporters/zipkin/tsconfig.esnext.json | 11 ++ .../exporters/zipkin}/tsconfig.json | 7 +- .../instrumentation}/.eslintignore | 0 .../instrumentation}/.eslintrc.js | 0 .../instrumentation}/.gitignore | 0 .../instrumentation}/.npmignore | 0 .../instrumentations/instrumentation}/LICENSE | 0 .../instrumentation}/README.md | 22 +-- .../instrumentation}/hook.mjs | 0 .../instrumentation}/karma.conf.js | 0 .../instrumentation/karma.debug.conf.js | 22 +++ .../instrumentation/karma.webpack.js | 42 ++++++ .../instrumentation/karma.worker.js | 24 +++ .../instrumentation}/package.json | 82 +++++++---- .../instrumentation/rollup.config.js | 21 +++ .../instrumentation}/src/autoLoader.ts | 2 +- .../instrumentation}/src/autoLoaderUtils.ts | 2 +- .../instrumentation}/src/index.ts | 0 .../instrumentation}/src/instrumentation.ts | 2 +- .../src/platform/browser/index.ts | 0 .../src/platform/browser/instrumentation.ts | 0 .../instrumentation}/src/platform/index.ts | 0 .../src/platform/node/ModuleNameTrie.ts | 0 .../node/RequireInTheMiddleSingleton.ts | 0 .../src/platform/node/index.ts | 0 .../src/platform/node/instrumentation.ts | 2 +- .../instrumentationNodeModuleDefinition.ts | 0 .../node/instrumentationNodeModuleFile.ts | 0 .../src/platform/node/types.ts | 0 .../instrumentation}/src/types.ts | 2 +- .../instrumentation}/src/types_internal.ts | 2 +- .../instrumentation}/src/utils.ts | 0 .../test/browser/index-webpack.ts | 0 .../test/common/Instrumentation.test.ts | 2 +- .../test/common/autoLoader.test.ts | 2 +- .../test/common/autoLoaderUtils.test.ts | 0 .../test/common/utils.test.ts | 0 .../test/index-webpack.worker.ts | 20 +++ .../test/node/EsmInstrumentation.test.mjs | 0 .../test/node/InstrumentationBase.test.ts | 4 +- .../InstrumentationNodeModuleFile.test.ts | 0 .../test/node/ModuleNameTrie.test.ts | 0 .../node/RequireInTheMiddleSingleton.test.ts | 0 .../node/fixtures/absolutePathTestFixture.js | 0 .../test/node/node_modules}/.gitkeep | 0 .../node_modules/test-esm-module/package.json | 0 .../node_modules/test-esm-module/src/index.js | 0 .../instrumentation/tsconfig.esm.json | 11 ++ .../instrumentation/tsconfig.esnext.json | 11 ++ .../instrumentation/tsconfig.json | 12 ++ .../instrumentations/web/auto}/.eslintignore | 0 .../instrumentations/web/auto}/.eslintrc.js | 4 +- .../instrumentations/web/auto}/.npmignore | 0 .../instrumentations/web/auto}/CHANGELOG.md | 0 .../instrumentations/web/auto}/LICENSE | 0 .../instrumentations/web/auto}/README.md | 16 +- .../instrumentations/web/auto}/karma.conf.js | 4 +- .../web/auto/karma.debug.conf.js | 22 +++ pkgs/instrumentations/web/auto/package.json | 94 ++++++++++++ .../web/auto/rollup.config.js | 21 +++ .../instrumentations/web/auto}/src/index.ts | 0 .../instrumentations/web/auto}/src/utils.ts | 20 +-- .../web/auto}/test/index-webpack.ts | 0 .../web/auto}/test/utils.test.ts | 22 +-- .../web/auto/tsconfig.esm.json | 12 ++ .../instrumentations/web/auto}/tsconfig.json | 2 +- .../web/document-load}/.eslintignore | 0 .../web/document-load}/.eslintrc.js | 2 +- .../web/document-load}/CHANGELOG.md | 0 .../web/document-load}/LICENSE | 0 .../web/document-load}/README.md | 14 +- .../web/document-load}/karma.conf.js | 4 +- .../web/document-load/karma.debug.conf.js | 22 +++ .../web/document-load/package.json | 112 ++++++++++++++ .../web/document-load/rollup.config.js | 21 +++ .../src/enums/AttributeNames.ts | 0 .../document-load}/src/enums/EventNames.ts | 0 .../web/document-load}/src/index.ts | 0 .../web/document-load}/src/instrumentation.ts | 12 +- .../web/document-load}/src/types.ts | 4 +- .../web/document-load}/src/utils.ts | 6 +- .../document-load}/test/documentLoad.test.ts | 10 +- .../web/document-load}/test/index-webpack.ts | 0 .../web/document-load}/tsconfig.esm.json | 7 +- .../web/document-load}/tsconfig.json | 2 +- .../instrumentations/web/fetch}/.eslintignore | 0 .../instrumentations/web/fetch}/.eslintrc.js | 2 +- .../instrumentations/web/fetch}/.npmignore | 0 .../instrumentations/web/fetch}/LICENSE | 0 .../instrumentations/web/fetch}/README.md | 8 +- .../web/fetch}/images/trace1.png | Bin .../web/fetch}/images/trace2.png | Bin .../web/fetch}/images/trace3.png | Bin .../instrumentations/web/fetch}/karma.conf.js | 4 +- .../web/fetch/karma.debug.conf.js | 22 +++ .../web/fetch/karma.webpack.js | 42 ++++++ .../web/fetch/karma.worker.js | 24 +++ pkgs/instrumentations/web/fetch/package.json | 123 ++++++++++++++++ .../web/fetch/rollup.config.js | 21 +++ .../web/fetch}/src/enums/AttributeNames.ts | 0 .../instrumentations/web/fetch}/src/fetch.ts | 14 +- .../instrumentations/web/fetch}/src/index.ts | 0 .../instrumentations/web/fetch}/src/types.ts | 2 +- .../web/fetch}/test/fetch.test.ts | 16 +- .../web/fetch}/test/index-webpack.ts | 0 .../web/fetch/test/index-webpack.worker.ts | 20 +++ .../web/fetch/tsconfig.esm.json | 11 ++ .../web/fetch/tsconfig.esnext.json | 11 ++ pkgs/instrumentations/web/fetch/tsconfig.json | 12 ++ .../web/long-task}/.eslintignore | 0 .../web/long-task}/.eslintrc.js | 2 +- .../web/long-task}/CHANGELOG.md | 0 .../instrumentations/web/long-task}/README.md | 8 +- .../web/long-task}/karma.conf.js | 4 +- .../web/long-task/karma.debug.conf.js | 22 +++ .../web/long-task/package.json | 114 +++++++++++++++ .../web/long-task/rollup.config.js | 21 +++ .../web/long-task}/src/index.ts | 0 .../web/long-task}/src/instrumentation.ts | 8 +- .../web/long-task}/src/types.ts | 4 +- .../web/long-task}/test/compatibility.test.ts | 8 +- .../web/long-task}/test/index-webpack.ts | 0 .../web/long-task}/test/longTask.test.ts | 12 +- .../web/long-task}/test/util.ts | 2 +- .../web/long-task}/tsconfig.esm.json | 2 +- .../web/long-task}/tsconfig.json | 2 +- .../web/user-interaction}/.eslintignore | 0 .../web/user-interaction}/.eslintrc.js | 2 +- .../web/user-interaction}/CHANGELOG.md | 0 .../web/user-interaction}/LICENSE | 0 .../web/user-interaction}/README.md | 12 +- .../user-interaction}/images/click-sync.jpg | Bin .../web/user-interaction}/images/click.jpg | Bin .../user-interaction}/images/main-sync.jpg | Bin .../web/user-interaction}/images/main.jpg | Bin .../web/user-interaction}/karma.conf.js | 4 +- .../web/user-interaction/karma.debug.conf.js | 22 +++ .../web/user-interaction/package.json | 117 +++++++++++++++ .../web/user-interaction/rollup.config.js | 21 +++ .../src/enums/AttributeNames.ts | 0 .../web/user-interaction}/src/index.ts | 0 .../user-interaction}/src/instrumentation.ts | 10 +- .../user-interaction}/src/internal-types.ts | 2 +- .../web/user-interaction}/src/types.ts | 4 +- .../web/user-interaction}/test/helper.test.ts | 2 +- .../user-interaction}/test/index-webpack.ts | 0 .../test/userInteraction.nozone.test.ts | 12 +- .../test/userInteraction.test.ts | 12 +- .../web/user-interaction}/tsconfig.esm.json | 2 +- .../web/user-interaction}/tsconfig.json | 2 +- .../instrumentations/web/xhr}/.eslintignore | 0 .../instrumentations/web/xhr}/.eslintrc.js | 2 +- .../instrumentations/web/xhr}/.npmignore | 0 .../instrumentations/web/xhr}/LICENSE | 0 .../instrumentations/web/xhr}/README.md | 8 +- .../instrumentations/web/xhr}/images/cors.jpg | Bin .../instrumentations/web/xhr}/images/main.jpg | Bin .../web/xhr}/images/request.jpg | Bin pkgs/instrumentations/web/xhr/karma.conf.js | 24 +++ .../web/xhr/karma.debug.conf.js | 22 +++ pkgs/instrumentations/web/xhr/package.json | 123 ++++++++++++++++ .../instrumentations/web/xhr/rollup.config.js | 21 +++ .../web/xhr}/src/enums/AttributeNames.ts | 0 .../web/xhr}/src/enums/EventNames.ts | 0 .../instrumentations/web/xhr}/src/index.ts | 0 .../instrumentations/web/xhr}/src/types.ts | 2 +- .../instrumentations/web/xhr}/src/xhr.ts | 12 +- .../web/xhr}/test/index-webpack.ts | 0 .../web/xhr}/test/unmocked.test.ts | 10 +- .../web/xhr}/test/xhr.test.ts | 16 +- .../web/xhr/tsconfig.esm.json | 11 ++ .../web/xhr/tsconfig.esnext.json | 11 ++ pkgs/instrumentations/web/xhr/tsconfig.json | 12 ++ .../propagators/b3}/.eslintignore | 0 .../propagators/b3}/.eslintrc.js | 0 .../propagators/b3}/.npmignore | 0 .../propagators/b3}/LICENSE | 0 .../propagators/b3}/README.md | 14 +- .../propagators/b3/karma.browser.conf.js | 7 +- pkgs/propagators/b3/karma.debug.conf.js | 22 +++ pkgs/propagators/b3/karma.webpack.js | 42 ++++++ pkgs/propagators/b3/package.json | 110 ++++++++++++++ pkgs/propagators/b3/rollup.config.js | 21 +++ .../propagators/b3}/src/B3MultiPropagator.ts | 4 +- .../propagators/b3}/src/B3Propagator.ts | 4 +- .../propagators/b3}/src/B3SinglePropagator.ts | 4 +- .../propagators/b3}/src/common.ts | 2 +- .../propagators/b3}/src/constants.ts | 0 .../propagators/b3}/src/index.ts | 0 .../propagators/b3}/src/types.ts | 0 .../b3}/test/B3MultiPropagator.test.ts | 6 +- .../propagators/b3}/test/B3Propagator.test.ts | 4 +- .../b3}/test/B3SinglePropagator.test.ts | 4 +- pkgs/propagators/b3/test/index-webpack.ts | 20 +++ pkgs/propagators/b3/tsconfig.esm.json | 11 ++ pkgs/propagators/b3/tsconfig.esnext.json | 11 ++ pkgs/propagators/b3/tsconfig.json | 12 ++ .../resources}/.eslintignore | 0 .../resources}/.eslintrc.js | 0 .../resources}/.npmignore | 0 .../resources}/LICENSE | 0 .../resources}/README.md | 4 +- .../resources}/karma.conf.js | 0 pkgs/resources/karma.debug.conf.js | 22 +++ .../resources}/karma.worker.js | 0 pkgs/resources/package.json | 125 ++++++++++++++++ pkgs/resources/rollup.config.js | 21 +++ .../resources}/src/IResource.ts | 0 .../resources}/src/Resource.ts | 6 +- .../resources}/src/config.ts | 0 .../resources}/src/detect-resources.ts | 2 +- .../src/detectors/BrowserDetector.ts | 0 .../src/detectors/BrowserDetectorSync.ts | 4 +- .../resources}/src/detectors/EnvDetector.ts | 0 .../src/detectors/EnvDetectorSync.ts | 6 +- .../resources}/src/detectors/NoopDetector.ts | 0 .../src/detectors/NoopDetectorSync.ts | 0 .../resources}/src/detectors/index.ts | 0 .../resources}/src/index.ts | 0 .../src/platform/browser/HostDetector.ts | 0 .../src/platform/browser/HostDetectorSync.ts | 0 .../src/platform/browser/OSDetector.ts | 0 .../src/platform/browser/OSDetectorSync.ts | 0 .../src/platform/browser/ProcessDetector.ts | 0 .../platform/browser/ProcessDetectorSync.ts | 0 .../platform/browser/default-service-name.ts | 0 .../resources}/src/platform/browser/index.ts | 0 .../resources}/src/platform/index.ts | 0 .../src/platform/node/HostDetector.ts | 0 .../src/platform/node/HostDetectorSync.ts | 2 +- .../src/platform/node/OSDetector.ts | 0 .../src/platform/node/OSDetectorSync.ts | 2 +- .../src/platform/node/ProcessDetector.ts | 0 .../src/platform/node/ProcessDetectorSync.ts | 4 +- .../src/platform/node/default-service-name.ts | 0 .../resources}/src/platform/node/index.ts | 0 .../src/platform/node/machine-id/execAsync.ts | 0 .../node/machine-id/getMachineId-bsd.ts | 2 +- .../node/machine-id/getMachineId-darwin.ts | 2 +- .../node/machine-id/getMachineId-linux.ts | 2 +- .../machine-id/getMachineId-unsupported.ts | 2 +- .../node/machine-id/getMachineId-win.ts | 2 +- .../platform/node/machine-id/getMachineId.ts | 0 .../resources}/src/platform/node/utils.ts | 0 .../resources}/src/types.ts | 2 +- .../resources}/src/utils.ts | 0 .../resources}/test/Resource.test.ts | 8 +- .../resources}/test/detect-resources.test.ts | 2 +- .../detectors/browser/BrowserDetector.test.ts | 0 .../detectors/browser/EnvDetector.test.ts | 4 +- .../detectors/browser/HostDetector.test.ts | 0 .../test/detectors/browser/OSDetector.test.ts | 0 .../detectors/browser/ProcessDetector.test.ts | 0 .../detectors/node/BrowserDetector.test.ts | 0 .../test/detectors/node/EnvDetector.test.ts | 0 .../test/detectors/node/HostDetector.test.ts | 2 +- .../test/detectors/node/OSDetector.test.ts | 2 +- .../detectors/node/ProcessDetector.test.ts | 0 .../node/machine-id/getMachineId-bsd.test.ts | 0 .../machine-id/getMachineId-darwin.test.ts | 0 .../machine-id/getMachineId-linux.test.ts | 0 .../node/machine-id/getMachineId-win.test.ts | 0 .../resources}/test/index-webpack.ts | 0 .../resources}/test/index-webpack.worker.ts | 0 .../existing-detectors-1-9-1.test.ts | 0 .../test/resource-assertions.test.ts | 4 +- .../resources}/test/util.ts | 0 .../test/util/resource-assertions.ts | 4 +- .../resources}/test/util/sample-detector.ts | 2 +- pkgs/resources/tsconfig.esm.json | 11 ++ pkgs/resources/tsconfig.esnext.json | 11 ++ pkgs/resources/tsconfig.json | 12 ++ .../sdk/logs}/.eslintignore | 0 .../sdk-logs => pkgs/sdk/logs}/.eslintrc.js | 0 .../sdk/logs}/.npmignore | 0 .../sdk/logs}/LICENSE | 0 .../sdk-logs => pkgs/sdk/logs}/README.md | 4 +- .../sdk-logs => pkgs/sdk/logs}/karma.conf.js | 0 pkgs/sdk/logs/karma.debug.conf.js | 22 +++ pkgs/sdk/logs/karma.webpack.js | 42 ++++++ pkgs/sdk/logs/karma.worker.js | 24 +++ pkgs/sdk/logs/package.json | 131 +++++++++++++++++ pkgs/sdk/logs/rollup.config.js | 21 +++ .../sdk/logs}/src/LogRecord.ts | 12 +- .../sdk/logs}/src/LogRecordProcessor.ts | 2 +- .../sdk-logs => pkgs/sdk/logs}/src/Logger.ts | 8 +- .../sdk/logs}/src/LoggerProvider.ts | 10 +- .../sdk/logs}/src/MultiLogRecordProcessor.ts | 2 +- .../sdk-logs => pkgs/sdk/logs}/src/config.ts | 2 +- .../src/export/BatchLogRecordProcessorBase.ts | 6 +- .../src/export/ConsoleLogRecordExporter.ts | 4 +- .../src/export/InMemoryLogRecordExporter.ts | 4 +- .../sdk/logs}/src/export/LogRecordExporter.ts | 2 +- .../src/export/NoopLogRecordProcessor.ts | 0 .../sdk/logs}/src/export/ReadableLogRecord.ts | 8 +- .../src/export/SimpleLogRecordProcessor.ts | 4 +- .../sdk-logs => pkgs/sdk/logs}/src/index.ts | 0 .../browser/export/BatchLogRecordProcessor.ts | 0 .../sdk/logs}/src/platform/browser/index.ts | 0 .../sdk/logs}/src/platform/index.ts | 0 .../node/export/BatchLogRecordProcessor.ts | 0 .../sdk/logs}/src/platform/node/index.ts | 0 .../sdk-logs => pkgs/sdk/logs}/src/types.ts | 2 +- .../export/BatchLogRecordProcessor.test.ts | 0 .../sdk/logs}/test/common/LogRecord.test.ts | 10 +- .../sdk/logs}/test/common/Logger.test.ts | 4 +- .../logs}/test/common/LoggerProvider.test.ts | 6 +- .../common/MultiLogRecordProcessor.test.ts | 0 .../export/BatchLogRecordProcessor.test.ts | 2 +- .../export/ConsoleLogRecordExporter.test.ts | 2 +- .../export/InMemoryLogRecordExporter.test.ts | 4 +- .../export/SimpleLogRecordProcessor.test.ts | 2 +- .../sdk/logs}/test/common/utils.ts | 0 .../sdk/logs}/test/index-webpack.ts | 0 .../sdk/logs}/test/index-webpack.worker.ts | 0 .../sdk/logs}/test/test-utils.ts | 0 pkgs/sdk/logs/tsconfig.esm.json | 11 ++ pkgs/sdk/logs/tsconfig.esnext.json | 11 ++ pkgs/sdk/logs/tsconfig.json | 11 ++ .../sdk/metrics}/.eslintignore | 0 pkgs/sdk/metrics/.eslintrc.js | 7 + .../sdk/metrics}/.npmignore | 0 .../sdk/metrics}/LICENSE | 0 .../sdk/metrics}/README.md | 4 +- .../sdk/metrics}/karma.conf.js | 0 pkgs/sdk/metrics/karma.debug.conf.js | 22 +++ pkgs/sdk/metrics/karma.webpack.js | 42 ++++++ pkgs/sdk/metrics/karma.worker.js | 24 +++ pkgs/sdk/metrics/package.json | 119 +++++++++++++++ pkgs/sdk/metrics/rollup.config.js | 21 +++ .../sdk/metrics}/src/InstrumentDescriptor.ts | 2 +- .../sdk/metrics}/src/Instruments.ts | 4 +- .../sdk/metrics}/src/Meter.ts | 2 +- .../sdk/metrics}/src/MeterProvider.ts | 4 +- .../sdk/metrics}/src/ObservableResult.ts | 2 +- .../sdk/metrics}/src/aggregator/Drop.ts | 2 +- .../src/aggregator/ExponentialHistogram.ts | 2 +- .../sdk/metrics}/src/aggregator/Histogram.ts | 2 +- .../sdk/metrics}/src/aggregator/LastValue.ts | 4 +- .../sdk/metrics}/src/aggregator/Sum.ts | 2 +- .../exponential-histogram/Buckets.ts | 0 .../mapping/ExponentMapping.ts | 0 .../mapping/LogarithmMapping.ts | 0 .../mapping/getMapping.ts | 0 .../exponential-histogram/mapping/ieee754.ts | 0 .../exponential-histogram/mapping/types.ts | 0 .../aggregator/exponential-histogram/util.ts | 0 .../sdk/metrics}/src/aggregator/index.ts | 0 .../sdk/metrics}/src/aggregator/types.ts | 2 +- ...AlignedHistogramBucketExemplarReservoir.ts | 2 +- .../exemplar/AlwaysSampleExemplarFilter.ts | 2 +- .../sdk/metrics}/src/exemplar/Exemplar.ts | 2 +- .../metrics}/src/exemplar/ExemplarFilter.ts | 2 +- .../src/exemplar/ExemplarReservoir.ts | 2 +- .../src/exemplar/NeverSampleExemplarFilter.ts | 2 +- .../SimpleFixedSizeExemplarReservoir.ts | 2 +- .../src/exemplar/WithTraceExemplarFilter.ts | 2 +- .../sdk/metrics}/src/exemplar/index.ts | 0 .../src/export/AggregationSelector.ts | 0 .../src/export/AggregationTemporality.ts | 0 .../src/export/ConsoleMetricExporter.ts | 2 +- .../src/export/InMemoryMetricExporter.ts | 4 +- .../sdk/metrics}/src/export/MetricData.ts | 6 +- .../sdk/metrics}/src/export/MetricExporter.ts | 2 +- .../sdk/metrics}/src/export/MetricProducer.ts | 0 .../sdk/metrics}/src/export/MetricReader.ts | 2 +- .../export/PeriodicExportingMetricReader.ts | 6 +- .../sdk/metrics}/src/index.ts | 0 .../metrics}/src/state/AsyncMetricStorage.ts | 2 +- .../src/state/DeltaMetricProcessor.ts | 2 +- .../sdk/metrics}/src/state/HashMap.ts | 2 +- .../src/state/MeterProviderSharedState.ts | 4 +- .../metrics}/src/state/MeterSharedState.ts | 4 +- .../sdk/metrics}/src/state/MetricCollector.ts | 2 +- .../sdk/metrics}/src/state/MetricStorage.ts | 2 +- .../src/state/MetricStorageRegistry.ts | 2 +- .../src/state/MultiWritableMetricStorage.ts | 2 +- .../metrics}/src/state/ObservableRegistry.ts | 2 +- .../metrics}/src/state/SyncMetricStorage.ts | 2 +- .../src/state/TemporalMetricProcessor.ts | 2 +- .../src/state/WritableMetricStorage.ts | 2 +- .../sdk/metrics}/src/types.ts | 0 .../sdk/metrics}/src/utils.ts | 4 +- .../sdk/metrics}/src/view/Aggregation.ts | 2 +- .../metrics}/src/view/AttributesProcessor.ts | 2 +- .../metrics}/src/view/InstrumentSelector.ts | 0 .../sdk/metrics}/src/view/MeterSelector.ts | 0 .../sdk/metrics}/src/view/Predicate.ts | 0 .../src/view/RegistrationConflicts.ts | 0 .../sdk/metrics}/src/view/View.ts | 0 .../sdk/metrics}/src/view/ViewRegistry.ts | 2 +- .../sdk/metrics}/test/ExemplarFilter.test.ts | 2 +- .../metrics}/test/ExemplarReservoir.test.ts | 4 +- .../test/InstrumentDescriptor.test.ts | 0 .../sdk/metrics}/test/Instruments.test.ts | 6 +- .../sdk/metrics}/test/Meter.test.ts | 2 +- .../sdk/metrics}/test/MeterProvider.test.ts | 0 .../metrics}/test/ObservableResult.test.ts | 2 +- .../sdk/metrics}/test/aggregator/Drop.test.ts | 2 +- .../aggregator/ExponentialHistogram.test.ts | 2 +- .../test/aggregator/Histogram.test.ts | 2 +- .../test/aggregator/LastValue.test.ts | 2 +- .../sdk/metrics}/test/aggregator/Sum.test.ts | 2 +- .../ExponentMapping.test.ts | 0 .../LogarithmMapping.test.ts | 0 .../exponential-histogram/getMapping.test.ts | 0 .../exponential-histogram/helpers.ts | 0 .../exponential-histogram/ieee754.test.ts | 0 .../test/export/ConsoleMetricExporter.test.ts | 4 +- .../export/InMemoryMetricExporter.test.ts | 6 +- .../metrics}/test/export/MetricReader.test.ts | 4 +- .../PeriodicExportingMetricReader.test.ts | 2 +- .../test/export/TestMetricExporter.ts | 2 +- .../test/export/TestMetricProducer.ts | 0 .../metrics}/test/export/TestMetricReader.ts | 0 .../sdk/metrics}/test/export/utils.ts | 0 .../sdk/metrics}/test/index-webpack.ts | 0 pkgs/sdk/metrics/test/index-webpack.worker.ts | 20 +++ .../cumulative-exponential-histogram.test.ts | 0 ...wo-metric-readers-async-instrument.test.ts | 0 .../test/state/AsyncMetricStorage.test.ts | 2 +- .../test/state/DeltaMetricProcessor.test.ts | 2 +- .../sdk/metrics}/test/state/HashMap.test.ts | 2 +- .../test/state/MeterSharedState.test.ts | 0 .../test/state/MetricCollector.test.ts | 0 .../test/state/MetricStorageRegistry.test.ts | 4 +- .../state/MultiWritableMetricStorage.test.ts | 6 +- .../test/state/ObservableRegistry.test.ts | 0 .../test/state/SyncMetricStorage.test.ts | 2 +- .../state/TemporalMetricProcessor.test.ts | 2 +- .../sdk/metrics}/test/test-utils.ts | 0 .../sdk/metrics}/test/util.ts | 8 +- .../sdk/metrics}/test/utils.test.ts | 2 +- .../metrics}/test/view/Aggregation.test.ts | 0 .../test/view/AttributesProcessor.test.ts | 2 +- .../sdk/metrics}/test/view/Predicate.test.ts | 0 .../sdk/metrics}/test/view/View.test.ts | 0 .../metrics}/test/view/ViewRegistry.test.ts | 0 pkgs/sdk/metrics/tsconfig.esm.json | 11 ++ pkgs/sdk/metrics/tsconfig.esnext.json | 11 ++ pkgs/sdk/metrics/tsconfig.json | 12 ++ .../sdk/trace/base}/.eslintignore | 0 .../sdk/trace/base}/.eslintrc.js | 2 +- .../sdk/trace/base}/.npmignore | 0 .../sdk/trace/base}/LICENSE | 0 .../sdk/trace/base}/README.md | 12 +- .../api => pkgs/sdk/trace/base}/karma.conf.js | 4 +- pkgs/sdk/trace/base/karma.debug.conf.js | 22 +++ .../sdk/trace/base}/karma.worker.js | 4 +- pkgs/sdk/trace/base/package.json | 125 ++++++++++++++++ pkgs/sdk/trace/base/rollup.config.js | 21 +++ .../trace/base}/src/BasicTracerProvider.ts | 6 +- .../sdk/trace/base}/src/IdGenerator.ts | 0 .../sdk/trace/base}/src/MultiSpanProcessor.ts | 4 +- .../sdk/trace/base}/src/Sampler.ts | 2 +- .../sdk/trace/base}/src/Span.ts | 8 +- .../sdk/trace/base}/src/SpanProcessor.ts | 2 +- .../sdk/trace/base}/src/TimedEvent.ts | 2 +- .../sdk/trace/base}/src/Tracer.ts | 6 +- .../sdk/trace/base}/src/config.ts | 4 +- .../sdk/trace/base}/src/enums.ts | 0 .../src/export/BatchSpanProcessorBase.ts | 4 +- .../base}/src/export/ConsoleSpanExporter.ts | 2 +- .../base}/src/export/InMemorySpanExporter.ts | 2 +- .../base}/src/export/NoopSpanProcessor.ts | 2 +- .../trace/base}/src/export/ReadableSpan.ts | 6 +- .../base}/src/export/SimpleSpanProcessor.ts | 6 +- .../trace/base}/src/export/SpanExporter.ts | 2 +- .../sdk/trace/base}/src/index.ts | 0 .../src/platform/browser/RandomIdGenerator.ts | 0 .../browser/export/BatchSpanProcessor.ts | 0 .../trace/base}/src/platform/browser/index.ts | 0 .../sdk/trace/base}/src/platform/index.ts | 0 .../src/platform/node/RandomIdGenerator.ts | 0 .../node/export/BatchSpanProcessor.ts | 0 .../trace/base}/src/platform/node/index.ts | 0 .../base}/src/sampler/AlwaysOffSampler.ts | 0 .../base}/src/sampler/AlwaysOnSampler.ts | 0 .../base}/src/sampler/ParentBasedSampler.ts | 4 +- .../src/sampler/TraceIdRatioBasedSampler.ts | 2 +- .../sdk/trace/base}/src/types.ts | 4 +- .../sdk/trace/base}/src/utility.ts | 2 +- .../browser/export/BatchSpanProcessor.test.ts | 0 .../test/common/BasicTracerProvider.test.ts | 8 +- .../test/common/MultiSpanProcessor.test.ts | 2 +- .../trace/base}/test/common/Sampler.test.ts | 2 +- .../sdk/trace/base}/test/common/Span.test.ts | 6 +- .../trace/base}/test/common/Tracer.test.ts | 4 +- .../trace/base}/test/common/config.test.ts | 0 .../export/BatchSpanProcessorBase.test.ts | 8 +- .../common/export/ConsoleSpanExporter.test.ts | 4 +- .../export/InMemorySpanExporter.test.ts | 4 +- .../common/export/SimpleSpanProcessor.test.ts | 8 +- .../common/export/TestExporterWithDelay.ts | 2 +- .../common/export/TestRecordOnlySampler.ts | 0 .../common/export/TestStackContextManager.ts | 2 +- .../common/export/TestTracingSpanExporter.ts | 2 +- .../common/platform/RandomIdGenerator.test.ts | 0 .../common/sampler/AlwaysOffSampler.test.ts | 2 +- .../common/sampler/AlwaysOnSampler.test.ts | 2 +- .../common/sampler/ParentBasedSampler.test.ts | 4 +- .../sampler/TraceIdRatioBasedSampler.test.ts | 2 +- .../sdk/trace/base}/test/common/util.ts | 0 .../sdk/trace/base}/test/index-webpack.ts | 0 .../trace/base}/test/index-webpack.worker.ts | 0 pkgs/sdk/trace/base/tsconfig.esm.json | 11 ++ pkgs/sdk/trace/base/tsconfig.esnext.json | 11 ++ pkgs/sdk/trace/base/tsconfig.json | 12 ++ .../sdk/trace/web}/.eslintignore | 0 pkgs/sdk/trace/web/.eslintrc.js | 7 + .../sdk/trace/web}/.npmignore | 0 .../sdk/trace/web}/LICENSE | 0 .../sdk/trace/web}/README.md | 8 +- .../sdk/trace/web}/karma.conf.js | 4 +- pkgs/sdk/trace/web/karma.debug.conf.js | 22 +++ pkgs/sdk/trace/web/karma.worker.js | 24 +++ pkgs/sdk/trace/web/package.json | 123 ++++++++++++++++ pkgs/sdk/trace/web/rollup.config.js | 21 +++ .../sdk/trace/web}/src/StackContextManager.ts | 2 +- .../sdk/trace/web}/src/WebTracerProvider.ts | 2 +- .../web}/src/enums/PerformanceTimingNames.ts | 0 .../sdk/trace/web}/src/index.ts | 2 +- .../sdk/trace/web}/src/types.ts | 0 .../sdk/trace/web}/src/utils.ts | 6 +- .../web}/test/NodeGlobalsFoolProofing.test.ts | 6 +- .../web}/test/StackContextManager.test.ts | 2 +- .../trace/web}/test/WebTracerProvider.test.ts | 12 +- .../sdk/trace/web}/test/index-webpack.ts | 0 .../trace/web}/test/index-webpack.worker.ts | 0 .../sdk/trace/web}/test/registration.test.ts | 4 +- .../sdk/trace/web}/test/utils.test.ts | 8 +- .../sdk/trace/web}/test/window/utils.test.ts | 0 pkgs/sdk/trace/web/tsconfig.esm.json | 11 ++ pkgs/sdk/trace/web/tsconfig.esnext.json | 11 ++ pkgs/sdk/trace/web/tsconfig.json | 12 ++ .../semantic-conventions}/.eslintignore | 0 .../semantic-conventions}/.eslintrc.js | 0 .../semantic-conventions}/.npmignore | 0 .../semantic-conventions}/LICENSE | 0 .../semantic-conventions}/README.md | 2 +- pkgs/semantic-conventions/package.json | 103 +++++++++++++ pkgs/semantic-conventions/rollup.config.js | 21 +++ .../semantic-conventions}/src/index.ts | 0 .../resource/SemanticResourceAttributes.ts | 0 .../src/resource/index.ts | 0 .../src/trace/SemanticAttributes.ts | 0 .../semantic-conventions}/src/trace/index.ts | 0 pkgs/semantic-conventions/tsconfig.esm.json | 11 ++ .../semantic-conventions/tsconfig.esnext.json | 11 ++ pkgs/semantic-conventions/tsconfig.json | 12 ++ .../prettier.config.js => prettier.config.js | 0 .../js/scripts => scripts}/generate-protos.js | 0 .../js/scripts => scripts}/peer-api-check.js | 0 .../js/scripts => scripts}/semconv/.gitignore | 0 .../scripts => scripts}/semconv/generate.sh | 0 .../templates/SemanticAttributes.ts.j2 | 0 .../update-ts-configs-constants.js | 0 .../scripts => scripts}/update-ts-configs.js | 0 .../js/scripts => scripts}/version-update.js | 5 +- ...ig.base.es5.json => tsconfig.base.es5.json | 0 ...ig.base.esm.json => tsconfig.base.esm.json | 0 ...e.esnext.json => tsconfig.base.esnext.json | 0 .../tsconfig.base.json => tsconfig.base.json | 0 .../js/tsconfig.esm.json => tsconfig.esm.json | 0 ...config.esnext.json => tsconfig.esnext.json | 0 auto-merge/js/tsconfig.json => tsconfig.json | 0 ...-polyfills.js => webpack.node-polyfills.js | 0 1240 files changed, 7641 insertions(+), 5378 deletions(-) create mode 100644 .gitmodules rename auto-merge/js/.markdownlint.json => .markdownlint.json (100%) delete mode 100644 auto-merge/contrib/metapackages/auto-instrumentations-web/package.json delete mode 100644 auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/package.json delete mode 100644 auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/package.json delete mode 100644 auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/package.json delete mode 100644 auto-merge/js/examples/opentelemetry-web/package.json delete mode 100644 auto-merge/js/experimental/packages/api-events/package.json delete mode 100644 auto-merge/js/experimental/packages/api-logs/package.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-proto/package.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-http/package.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-proto/package.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-browser-detector/package.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/package.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/otlp-exporter-base/package.json delete mode 100644 auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/otlp-proto-exporter-base/package.json delete mode 100644 auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/otlp-transformer/package.json delete mode 100644 auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/otlp-transformer/tsconfig.json delete mode 100644 auto-merge/js/experimental/packages/sdk-logs/package.json delete mode 100644 auto-merge/js/experimental/packages/sdk-logs/tsconfig.esm.json delete mode 100644 auto-merge/js/experimental/packages/sdk-logs/tsconfig.esnext.json delete mode 100644 auto-merge/js/experimental/packages/sdk-logs/tsconfig.json delete mode 100644 auto-merge/js/packages/opentelemetry-context-zone-peer-dep/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-context-zone/.eslintrc.js delete mode 100644 auto-merge/js/packages/opentelemetry-context-zone/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/opentelemetry-core/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-core/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-core/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/opentelemetry-exporter-zipkin/karma.conf.js delete mode 100644 auto-merge/js/packages/opentelemetry-exporter-zipkin/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.json delete mode 100644 auto-merge/js/packages/opentelemetry-propagator-b3/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-resources/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-resources/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-resources/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/opentelemetry-resources/tsconfig.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-base/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-web/package.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.json delete mode 100644 auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js delete mode 100644 auto-merge/js/packages/opentelemetry-semantic-conventions/package.json delete mode 100644 auto-merge/js/packages/sdk-metrics/.eslintrc.js delete mode 100644 auto-merge/js/packages/sdk-metrics/package.json delete mode 100644 auto-merge/js/packages/sdk-metrics/tsconfig.esm.json delete mode 100644 auto-merge/js/packages/sdk-metrics/tsconfig.esnext.json delete mode 100644 auto-merge/js/packages/sdk-metrics/tsconfig.json rename auto-merge/js/eslint.base.js => eslint.base.js (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/.eslintrc.js (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/README.md (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/docker/collector-config.yaml (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/docker/docker-compose.yaml (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/docker/prometheus.yaml (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetch-proto/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetch-proto/index.js (79%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetch/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetch/index.js (77%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetchXhr/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetchXhr/index.js (83%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetchXhrB3/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/fetchXhrB3/index.js (81%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/metrics/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/metrics/index.js (90%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/xml-http-request/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/xml-http-request/index.js (79%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/zipkin/index.html (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/examples/zipkin/index.js (79%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/images/xml-http-request.png (100%) create mode 100644 examples/web/js/package.json create mode 100644 examples/web/js/rollup.config.js rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/webpack.dev.config.js (100%) rename {auto-merge/js/examples/opentelemetry-web => examples/web/js}/webpack.prod.config.js (100%) rename auto-merge/js/karma.base.js => karma.base.js (100%) create mode 100644 karma.debug.js rename auto-merge/js/karma.webpack.js => karma.webpack.js (100%) rename auto-merge/js/karma.worker.js => karma.worker.js (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/api-events}/.eslintignore (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/.eslintrc.js (74%) rename {auto-merge/js/api => pkgs/api-events}/LICENSE (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/README.md (98%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/api-events}/karma.conf.js (100%) create mode 100644 pkgs/api-events/karma.debug.conf.js create mode 100644 pkgs/api-events/package.json create mode 100644 pkgs/api-events/rollup.config.js rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/NoopEventEmitter.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/NoopEventEmitterProvider.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/api/events.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/index.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/internal/global-utils.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/platform/browser/globalThis.ts (100%) rename {auto-merge/js/api => pkgs/api-events}/src/platform/browser/index.ts (100%) rename {auto-merge/js/api => pkgs/api-events}/src/platform/index.ts (100%) rename {auto-merge/js/api => pkgs/api-events}/src/platform/node/globalThis.ts (100%) rename {auto-merge/js/api => pkgs/api-events}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/types/Event.ts (95%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/types/EventEmitter.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/types/EventEmitterOptions.ts (93%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/src/types/EventEmitterProvider.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/test/api/api.test.ts (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/api-events}/test/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/test/internal/global.test.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/test/noop-implementations/noop-event-emitter-provider.test.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-events/test/noop-implementations/noop-event-emitter.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/api-events}/tsconfig.esm.json (89%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/api-events}/tsconfig.esnext.json (89%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/api-events}/tsconfig.json (87%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/api-logs}/.eslintignore (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/.eslintrc.js (74%) rename {auto-merge/js/experimental/packages/api-events => pkgs/api-logs}/LICENSE (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/README.md (98%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/api-logs}/karma.conf.js (100%) create mode 100644 pkgs/api-logs/karma.debug.conf.js create mode 100644 pkgs/api-logs/package.json create mode 100644 pkgs/api-logs/rollup.config.js rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/NoopLogger.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/NoopLoggerProvider.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/api/logs.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/index.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/internal/global-utils.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/platform/browser/globalThis.ts (100%) rename {auto-merge/js/experimental/packages/api-events => pkgs/api-logs}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/api-events => pkgs/api-logs}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/api-events => pkgs/api-logs}/src/platform/node/globalThis.ts (100%) rename {auto-merge/js/experimental/packages/api-events => pkgs/api-logs}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/types/LogRecord.ts (96%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/types/Logger.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/types/LoggerOptions.ts (94%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/src/types/LoggerProvider.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/test/api/api.test.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/api-logs}/test/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/test/internal/global.test.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/test/noop-implementations/noop-logger-provider.test.ts (100%) rename {auto-merge/js/experimental/packages => pkgs}/api-logs/test/noop-implementations/noop-logger.test.ts (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/api-logs}/tsconfig.esm.json (88%) rename {auto-merge/js/api => pkgs/api-logs}/tsconfig.esnext.json (71%) rename {auto-merge/js/api => pkgs/api-logs}/tsconfig.json (68%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/api}/.eslintignore (100%) rename {auto-merge/js => pkgs}/api/.eslintrc.js (76%) rename {auto-merge/js => pkgs}/api/CHANGELOG.md (100%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/api}/LICENSE (100%) rename {auto-merge/js => pkgs}/api/README.md (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/api}/karma.conf.js (100%) create mode 100644 pkgs/api/karma.debug.conf.js rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/api}/karma.worker.js (100%) rename {auto-merge/js => pkgs}/api/package.json (50%) create mode 100644 pkgs/api/rollup.config.js rename {auto-merge/js => pkgs}/api/src/api/context.ts (100%) rename {auto-merge/js => pkgs}/api/src/api/diag.ts (100%) rename {auto-merge/js => pkgs}/api/src/api/metrics.ts (100%) rename {auto-merge/js => pkgs}/api/src/api/propagation.ts (100%) rename {auto-merge/js => pkgs}/api/src/api/trace.ts (100%) rename {auto-merge/js => pkgs}/api/src/baggage/context-helpers.ts (100%) rename {auto-merge/js => pkgs}/api/src/baggage/internal/baggage-impl.ts (100%) rename {auto-merge/js => pkgs}/api/src/baggage/internal/symbol.ts (100%) rename {auto-merge/js => pkgs}/api/src/baggage/types.ts (100%) rename {auto-merge/js => pkgs}/api/src/baggage/utils.ts (100%) rename {auto-merge/js => pkgs}/api/src/common/Attributes.ts (100%) rename {auto-merge/js => pkgs}/api/src/common/Exception.ts (100%) rename {auto-merge/js => pkgs}/api/src/common/Time.ts (100%) rename {auto-merge/js => pkgs}/api/src/context-api.ts (100%) rename {auto-merge/js => pkgs}/api/src/context/NoopContextManager.ts (100%) rename {auto-merge/js => pkgs}/api/src/context/context.ts (100%) rename {auto-merge/js => pkgs}/api/src/context/types.ts (100%) rename {auto-merge/js => pkgs}/api/src/diag-api.ts (100%) rename {auto-merge/js => pkgs}/api/src/diag/ComponentLogger.ts (97%) rename {auto-merge/js => pkgs}/api/src/diag/consoleLogger.ts (100%) rename {auto-merge/js => pkgs}/api/src/diag/internal/logLevelLogger.ts (100%) rename {auto-merge/js => pkgs}/api/src/diag/internal/noopLogger.ts (100%) rename {auto-merge/js => pkgs}/api/src/diag/types.ts (100%) rename {auto-merge/js => pkgs}/api/src/index.ts (100%) rename {auto-merge/js => pkgs}/api/src/internal/global-utils.ts (100%) rename {auto-merge/js => pkgs}/api/src/internal/semver.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics-api.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics/Meter.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics/MeterProvider.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics/Metric.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics/NoopMeter.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics/NoopMeterProvider.ts (100%) rename {auto-merge/js => pkgs}/api/src/metrics/ObservableResult.ts (100%) rename {auto-merge/js => pkgs}/api/src/platform/browser/globalThis.ts (100%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/api}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/api}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/api}/src/platform/node/globalThis.ts (100%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/api}/src/platform/node/index.ts (100%) rename {auto-merge/js => pkgs}/api/src/propagation-api.ts (100%) rename {auto-merge/js => pkgs}/api/src/propagation/NoopTextMapPropagator.ts (100%) rename {auto-merge/js => pkgs}/api/src/propagation/TextMapPropagator.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace-api.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/NonRecordingSpan.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/NoopTracer.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/NoopTracerProvider.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/ProxyTracer.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/ProxyTracerProvider.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/Sampler.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/SamplingResult.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/SpanOptions.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/attributes.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/context-utils.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/internal/tracestate-impl.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/internal/tracestate-validators.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/internal/utils.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/invalid-span-constants.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/link.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/span.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/span_context.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/span_kind.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/spancontext-utils.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/status.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/trace_flags.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/trace_state.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/tracer.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/tracer_options.ts (100%) rename {auto-merge/js => pkgs}/api/src/trace/tracer_provider.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/api/api.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/baggage/Baggage.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/context/NoopContextManager.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/diag/ComponentLogger.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/diag/consoleLogger.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/diag/logLevel.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/diag/logger.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/internal/global.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/internal/semver.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/internal/version.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/metrics/Metric.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/noop-implementations/noop-meter.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/noop-implementations/noop-span.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/noop-implementations/noop-tracer-provider.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/noop-implementations/noop-tracer.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/proxy-implementations/proxy-tracer.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/trace/spancontext-utils.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/trace/tracestate-validators.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/common/trace/tracestate.test.ts (100%) rename {auto-merge/js => pkgs}/api/test/index-webpack.ts (100%) rename {auto-merge/js => pkgs}/api/test/index-webpack.worker.ts (100%) rename {auto-merge/js => pkgs}/api/test/tree-shaking/tree-shaking.test.ts (100%) create mode 100644 pkgs/api/tsconfig.esm.json rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/api}/tsconfig.esnext.json (67%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/api}/tsconfig.json (61%) rename {auto-merge/js/api => pkgs/context/zone-peer-dep}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/.eslintrc.js (79%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/context/zone-peer-dep}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/README.md (93%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/context/zone-peer-dep}/karma.conf.js (100%) create mode 100644 pkgs/context/zone-peer-dep/karma.debug.conf.js create mode 100644 pkgs/context/zone-peer-dep/package.json create mode 100644 pkgs/context/zone-peer-dep/rollup.config.js rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/src/ZoneContextManager.ts (99%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/src/types.ts (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/src/util.ts (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/test/ZoneContextManager.test.ts (99%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/context/zone-peer-dep}/test/index-webpack.ts (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/test/utils.test.ts (100%) rename {auto-merge/js/experimental/packages/api-events => pkgs/context/zone-peer-dep}/tsconfig.esm.json (78%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/context/zone-peer-dep}/tsconfig.esnext.json (79%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/context/zone-peer-dep}/tsconfig.json (64%) rename {auto-merge/js/experimental/packages/api-events => pkgs/context/zone}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/context/zone}/.eslintrc.js (81%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/context/zone}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-context-zone => pkgs/context/zone}/README.md (93%) create mode 100644 pkgs/context/zone/package.json create mode 100644 pkgs/context/zone/rollup.config.js rename {auto-merge/js/packages/opentelemetry-context-zone => pkgs/context/zone}/src/index.ts (90%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/context/zone}/tsconfig.esm.json (78%) rename {auto-merge/js/experimental/packages/api-events => pkgs/context/zone}/tsconfig.esnext.json (79%) rename {auto-merge/js/packages/opentelemetry-context-zone => pkgs/context/zone}/tsconfig.json (59%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/core}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/.eslintrc.js (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/core}/.npmignore (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/core}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/README.md (86%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/core}/karma.conf.js (100%) create mode 100644 pkgs/core/karma.debug.conf.js create mode 100644 pkgs/core/karma.webpack.js rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/core}/karma.worker.js (89%) create mode 100644 pkgs/core/package.json create mode 100644 pkgs/core/rollup.config.js rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/ExportResult.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/baggage/constants.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/baggage/propagation/W3CBaggagePropagator.ts (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/baggage/utils.ts (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/common/anchored-clock.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/common/attributes.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/common/global-error-handler.ts (95%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/common/logging-error-handler.ts (96%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/common/time.ts (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/common/types.ts (97%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/internal/exporter.ts (95%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/internal/validators.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/RandomIdGenerator.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/environment.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/globalThis.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/hex-to-base64.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/performance.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/sdk-info.ts (95%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/browser/timer-util.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/RandomIdGenerator.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/environment.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/globalThis.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/hex-to-base64.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/performance.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/sdk-info.ts (95%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/platform/node/timer-util.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/propagation/composite.ts (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/IdGenerator.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/TraceState.ts (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/W3CTraceContextPropagator.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/rpc-metadata.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/sampler/AlwaysOffSampler.ts (97%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/sampler/AlwaysOnSampler.ts (97%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/sampler/ParentBasedSampler.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/sampler/TraceIdRatioBasedSampler.ts (98%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/trace/suppress-tracing.ts (93%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/callback.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/environment.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/lodash.merge.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/merge.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/promise.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/sampling.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/timeout.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/url.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/src/utils/wrap.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/baggage/W3CBaggagePropagator.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/common/anchored-clock.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/common/attributes.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/common/global-error-handler.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/common/logging-error-handler.test.ts (97%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/common/time.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/index-webpack.ts (100%) create mode 100644 pkgs/core/test/index-webpack.worker.ts rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/internal/exporter.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/internal/validators.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/platform/RandomIdGenerator.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/platform/browser/environment.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/platform/hex-to-base64.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/propagation/composite.test.ts (98%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/core}/test/test-utils.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/AlwaysOffSampler.test.ts (95%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/AlwaysOnSampler.test.ts (95%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/ParentBasedSampler.test.ts (97%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/TraceIdRatioBasedSampler.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/W3CTraceContextPropagator.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/fixtures/test-package/foo/bar/internal.d.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/fixtures/test-package/foo/bar/internal.js (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/fixtures/test-package/index.js (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/fixtures/test-package/package.json (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/trace/tracestate.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/utils/callback.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/utils/environment.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/utils/merge.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/utils/promise.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/utils/url.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/test/utils/wrap.test.ts (100%) create mode 100644 pkgs/core/tsconfig.esm.json rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/core}/tsconfig.esnext.json (64%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/tsconfig.json (58%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/detectors/browser}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/detectors/browser}/.eslintrc.js (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/detectors/browser}/.npmignore (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/detectors/browser}/LICENSE (100%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/README.md (85%) rename {auto-merge/js/experimental/packages/api-events => pkgs/detectors/browser}/karma.conf.js (100%) create mode 100644 pkgs/detectors/browser/karma.debug.conf.js create mode 100644 pkgs/detectors/browser/package.json create mode 100644 pkgs/detectors/browser/rollup.config.js rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/src/BrowserDetector.ts (94%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/src/types.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/test/BrowserDetector.test.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/test/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/detectors/browser}/test/util.ts (97%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/detectors/browser}/tsconfig.esm.json (99%) create mode 100644 pkgs/detectors/browser/tsconfig.esnext.json rename {auto-merge/js/experimental/packages/api-events => pkgs/detectors/browser}/tsconfig.json (74%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/base}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/.eslintrc.js (75%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/base}/.npmignore (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/LICENSE (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/README.md (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/base}/karma.conf.js (87%) create mode 100644 pkgs/exporters/otlp/base/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/base/karma.webpack.js create mode 100644 pkgs/exporters/otlp/base/karma.worker.js create mode 100644 pkgs/exporters/otlp/base/package.json create mode 100644 pkgs/exporters/otlp/base/rollup.config.js rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/OTLPExporterBase.ts (97%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/browser/OTLPExporterBrowserBase.ts (95%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/browser/util.ts (98%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/node/OTLPExporterNodeBase.ts (95%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/node/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/platform/node/util.ts (98%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/src/util.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/base}/test/browser/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/test/browser/util.test.ts (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/test/common/CollectorExporter.test.ts (99%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/test/common/util.test.ts (98%) create mode 100644 pkgs/exporters/otlp/base/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/test/node/util.test.ts (99%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/base}/test/testHelper.ts (97%) create mode 100644 pkgs/exporters/otlp/base/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/base/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/base/tsconfig.json rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/logs/http}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/.eslintrc.js (69%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/logs/http}/.npmignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/exporters/otlp/logs/http}/LICENSE (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/README.md (94%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/karma.conf.js (86%) create mode 100644 pkgs/exporters/otlp/logs/http/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/logs/http/karma.webpack.js create mode 100644 pkgs/exporters/otlp/logs/http/karma.worker.js create mode 100644 pkgs/exporters/otlp/logs/http/package.json create mode 100644 pkgs/exporters/otlp/logs/http/rollup.config.js rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/platform/browser/OTLPLogExporter.ts (76%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/platform/config.ts (93%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/platform/node/OTLPLogExporter.ts (79%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/test/browser/OTLPLogExporter.test.ts (95%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/test/browser/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/test/config.test.ts (100%) create mode 100644 pkgs/exporters/otlp/logs/http/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/test/logHelper.ts (92%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/test/node/OTLPLogExporter.test.ts (95%) create mode 100644 pkgs/exporters/otlp/logs/http/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/logs/http/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/logs/http/tsconfig.json rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/logs/proto}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/logs/proto}/.eslintrc.js (70%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/logs/proto}/.npmignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/logs/proto}/LICENSE (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/README.md (97%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/exporters/otlp/logs/proto}/karma.conf.js (86%) create mode 100644 pkgs/exporters/otlp/logs/proto/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/logs/proto/karma.webpack.js create mode 100644 pkgs/exporters/otlp/logs/proto/karma.worker.js create mode 100644 pkgs/exporters/otlp/logs/proto/package.json create mode 100644 pkgs/exporters/otlp/logs/proto/rollup.config.js rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/src/platform/browser/OTLPLogsExporter.ts (89%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/src/platform/node/OTLPLogsExporter.ts (89%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/test/browser/OTLPLogsExporter.test.ts (100%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/test/browser/index-webpack.ts (100%) create mode 100644 pkgs/exporters/otlp/logs/proto/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/test/logHelper.ts (92%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/otlp/logs/proto}/test/node/OTLPLogsExporter.test.ts (97%) create mode 100644 pkgs/exporters/otlp/logs/proto/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/logs/proto/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/logs/proto/tsconfig.json rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/exporters/otlp/metrics/http}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/exporters/otlp/metrics/http}/.eslintrc.js (73%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/exporters/otlp/metrics/http}/.npmignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/exporters/otlp/metrics/http}/LICENSE (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/README.md (96%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/metrics/http}/karma.conf.js (86%) create mode 100644 pkgs/exporters/otlp/metrics/http/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/metrics/http/karma.webpack.js create mode 100644 pkgs/exporters/otlp/metrics/http/karma.worker.js rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/package.json (50%) create mode 100644 pkgs/exporters/otlp/metrics/http/rollup.config.js rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/OTLPMetricExporterBase.ts (92%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/OTLPMetricExporterOptions.ts (84%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/platform/browser/OTLPMetricExporter.ts (90%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/metrics/http}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/platform/node/OTLPMetricExporter.ts (91%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/test/browser/CollectorMetricExporter.test.ts (98%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/metrics/http}/test/browser/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/test/common/CollectorMetricExporter.test.ts (95%) create mode 100644 pkgs/exporters/otlp/metrics/http/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/test/metricsHelper.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/metrics/http}/test/node/CollectorMetricExporter.test.ts (98%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/metrics/http}/test/node/nodeHelpers.ts (100%) create mode 100644 pkgs/exporters/otlp/metrics/http/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/metrics/http/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/metrics/http/tsconfig.json rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/.eslintignore (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/exporters/otlp/proto-base}/.eslintrc.js (71%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/.gitignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/proto-base}/.npmignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/exporters/otlp/proto-base}/LICENSE (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/README.md (100%) create mode 100644 pkgs/exporters/otlp/proto-base/package.json create mode 160000 pkgs/exporters/otlp/proto-base/protos create mode 100644 pkgs/exporters/otlp/proto-base/rollup.config.js rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules => pkgs/exporters/otlp/proto-base/src/generated}/.gitkeep (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/browser/OTLPProtoExporterBrowserBase.ts (95%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/node/OTLPProtoExporterNodeBase.ts (96%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/node/util.ts (96%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/src/platform/util.ts (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/proto-base}/submodule.md (100%) create mode 100644 pkgs/exporters/otlp/proto-base/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/proto-base/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/proto-base/tsconfig.json rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/trace/http}/.eslintignore (100%) create mode 100644 pkgs/exporters/otlp/trace/http/.eslintrc.js rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/exporters/otlp/trace/http}/.npmignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/exporters/otlp/trace/http}/LICENSE (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/README.md (96%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/exporters/otlp/trace/http}/karma.conf.js (86%) create mode 100644 pkgs/exporters/otlp/trace/http/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/trace/http/karma.webpack.js create mode 100644 pkgs/exporters/otlp/trace/http/karma.worker.js create mode 100644 pkgs/exporters/otlp/trace/http/package.json create mode 100644 pkgs/exporters/otlp/trace/http/rollup.config.js rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/src/platform/browser/OTLPTraceExporter.ts (88%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/trace/http}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/src/platform/node/OTLPTraceExporter.ts (86%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/test/browser/CollectorTraceExporter.test.ts (98%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/test/browser/index-webpack.ts (100%) create mode 100644 pkgs/exporters/otlp/trace/http/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/test/node/CollectorTraceExporter.test.ts (98%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/exporters/otlp/trace/http}/test/node/nodeHelpers.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/otlp/trace/http}/test/traceHelper.ts (97%) create mode 100644 pkgs/exporters/otlp/trace/http/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/trace/http/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/trace/http/tsconfig.json rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/exporters/otlp/trace/proto}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/exporters/otlp/trace/proto}/.eslintrc.js (70%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/exporters/otlp/trace/proto}/.npmignore (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/exporters/otlp/trace/proto}/LICENSE (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/README.md (97%) create mode 100644 pkgs/exporters/otlp/trace/proto/karma.conf.js create mode 100644 pkgs/exporters/otlp/trace/proto/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/trace/proto/karma.webpack.js create mode 100644 pkgs/exporters/otlp/trace/proto/karma.worker.js create mode 100644 pkgs/exporters/otlp/trace/proto/package.json create mode 100644 pkgs/exporters/otlp/trace/proto/rollup.config.js rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/src/platform/browser/OTLPTraceExporter.ts (86%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/src/platform/node/OTLPTraceExporter.ts (87%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/test/browser/CollectorTraceExporter.test.ts (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/test/browser/index-webpack.ts (100%) create mode 100644 pkgs/exporters/otlp/trace/proto/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/test/node/OTLPTraceExporter.test.ts (97%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-proto => pkgs/exporters/otlp/trace/proto}/test/traceHelper.ts (95%) create mode 100644 pkgs/exporters/otlp/trace/proto/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/trace/proto/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/trace/proto/tsconfig.json rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/.eslintrc.js (73%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/.gitignore (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/README.md (97%) rename {auto-merge/js/experimental/packages/opentelemetry-browser-detector => pkgs/exporters/otlp/transformer}/karma.conf.js (85%) create mode 100644 pkgs/exporters/otlp/transformer/karma.debug.conf.js create mode 100644 pkgs/exporters/otlp/transformer/karma.webpack.js create mode 100644 pkgs/exporters/otlp/transformer/karma.worker.js create mode 100644 pkgs/exporters/otlp/transformer/package.json create mode 100644 pkgs/exporters/otlp/transformer/rollup.config.js rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/common/internal.ts (96%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/common/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/logs/index.ts (92%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/logs/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/metrics/index.ts (92%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/metrics/internal.ts (96%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/metrics/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/resource/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/trace/index.ts (95%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/trace/internal.ts (91%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/src/trace/types.ts (100%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/test/common.test.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/exporters/otlp/transformer}/test/index-webpack.ts (100%) create mode 100644 pkgs/exporters/otlp/transformer/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/test/logs.test.ts (95%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/test/metrics.test.ts (98%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/exporters/otlp/transformer}/test/trace.test.ts (97%) create mode 100644 pkgs/exporters/otlp/transformer/tsconfig.esm.json create mode 100644 pkgs/exporters/otlp/transformer/tsconfig.esnext.json create mode 100644 pkgs/exporters/otlp/transformer/tsconfig.json rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/exporters/zipkin}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/exporters/zipkin}/.eslintrc.js (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/exporters/zipkin}/.npmignore (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/exporters/zipkin}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/README.md (97%) rename {auto-merge/js/experimental/packages/exporter-logs-otlp-proto => pkgs/exporters/zipkin}/karma.conf.js (100%) create mode 100644 pkgs/exporters/zipkin/karma.debug.conf.js create mode 100644 pkgs/exporters/zipkin/karma.webpack.js create mode 100644 pkgs/exporters/zipkin/karma.worker.js create mode 100644 pkgs/exporters/zipkin/package.json create mode 100644 pkgs/exporters/zipkin/rollup.config.js rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/platform/browser/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/platform/browser/util.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/exporters/zipkin}/src/platform/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/platform/node/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/platform/node/util.ts (95%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/transform.ts (94%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/types.ts (98%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/utils.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/src/zipkin.ts (94%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/test/browser/index-webpack.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/test/browser/zipkin.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/test/common/transform.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/test/common/zipkin.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/test/helper.ts (91%) create mode 100644 pkgs/exporters/zipkin/test/index-webpack.worker.ts rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/exporters/zipkin}/test/node/zipkin.test.ts (97%) create mode 100644 pkgs/exporters/zipkin/tsconfig.esm.json create mode 100644 pkgs/exporters/zipkin/tsconfig.esnext.json rename {auto-merge/js/experimental/packages/api-logs => pkgs/exporters/zipkin}/tsconfig.json (74%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http => pkgs/instrumentations/instrumentation}/.eslintrc.js (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/.gitignore (100%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/instrumentations/instrumentation}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/instrumentations/instrumentation}/LICENSE (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/README.md (91%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/hook.mjs (100%) rename {auto-merge/js/experimental/packages/exporter-trace-otlp-http => pkgs/instrumentations/instrumentation}/karma.conf.js (100%) create mode 100644 pkgs/instrumentations/instrumentation/karma.debug.conf.js create mode 100644 pkgs/instrumentations/instrumentation/karma.webpack.js create mode 100644 pkgs/instrumentations/instrumentation/karma.worker.js rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/package.json (57%) create mode 100644 pkgs/instrumentations/instrumentation/rollup.config.js rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/autoLoader.ts (95%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/autoLoaderUtils.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/instrumentation.ts (98%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/browser/instrumentation.ts (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/instrumentations/instrumentation}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/ModuleNameTrie.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/RequireInTheMiddleSingleton.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/instrumentation.ts (99%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/instrumentationNodeModuleDefinition.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/instrumentationNodeModuleFile.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/platform/node/types.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/types.ts (96%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/types_internal.ts (93%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/src/utils.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/browser/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/common/Instrumentation.test.ts (98%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/common/autoLoader.test.ts (99%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/common/autoLoaderUtils.test.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/common/utils.test.ts (100%) create mode 100644 pkgs/instrumentations/instrumentation/test/index-webpack.worker.ts rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/EsmInstrumentation.test.mjs (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/InstrumentationBase.test.ts (98%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/InstrumentationNodeModuleFile.test.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/ModuleNameTrie.test.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/RequireInTheMiddleSingleton.test.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/fixtures/absolutePathTestFixture.js (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/generated => pkgs/instrumentations/instrumentation/test/node/node_modules}/.gitkeep (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/node_modules/test-esm-module/package.json (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/instrumentation}/test/node/node_modules/test-esm-module/src/index.js (100%) create mode 100644 pkgs/instrumentations/instrumentation/tsconfig.esm.json create mode 100644 pkgs/instrumentations/instrumentation/tsconfig.esnext.json create mode 100644 pkgs/instrumentations/instrumentation/tsconfig.json rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/instrumentations/web/auto}/.eslintrc.js (71%) rename {auto-merge/js/experimental/packages/otlp-proto-exporter-base => pkgs/instrumentations/web/auto}/.npmignore (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/CHANGELOG.md (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/LICENSE (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/README.md (76%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/auto}/karma.conf.js (85%) create mode 100644 pkgs/instrumentations/web/auto/karma.debug.conf.js create mode 100644 pkgs/instrumentations/web/auto/package.json create mode 100644 pkgs/instrumentations/web/auto/rollup.config.js rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/src/index.ts (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/src/utils.ts (72%) rename {auto-merge/js/experimental/packages/api-events => pkgs/instrumentations/web/auto}/test/index-webpack.ts (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/test/utils.test.ts (80%) create mode 100644 pkgs/instrumentations/web/auto/tsconfig.esm.json rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/auto}/tsconfig.json (78%) rename {auto-merge/js/experimental/packages/otlp-exporter-base => pkgs/instrumentations/web/document-load}/.eslintignore (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/document-load}/.eslintrc.js (75%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/CHANGELOG.md (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/LICENSE (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/README.md (91%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/document-load}/karma.conf.js (85%) create mode 100644 pkgs/instrumentations/web/document-load/karma.debug.conf.js create mode 100644 pkgs/instrumentations/web/document-load/package.json create mode 100644 pkgs/instrumentations/web/document-load/rollup.config.js rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/src/enums/AttributeNames.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/src/enums/EventNames.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/src/index.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/src/instrumentation.ts (96%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/src/types.ts (90%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/src/utils.ts (93%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/test/documentLoad.test.ts (98%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/instrumentations/web/document-load}/test/index-webpack.ts (100%) rename {auto-merge/js/api => pkgs/instrumentations/web/document-load}/tsconfig.esm.json (72%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/document-load}/tsconfig.json (75%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/instrumentations/web/fetch}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation => pkgs/instrumentations/web/fetch}/.eslintrc.js (75%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/instrumentations/web/fetch}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-context-zone => pkgs/instrumentations/web/fetch}/LICENSE (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/README.md (92%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/images/trace1.png (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/images/trace2.png (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/images/trace3.png (100%) rename {auto-merge/contrib/metapackages/auto-instrumentations-web => pkgs/instrumentations/web/fetch}/karma.conf.js (85%) create mode 100644 pkgs/instrumentations/web/fetch/karma.debug.conf.js create mode 100644 pkgs/instrumentations/web/fetch/karma.webpack.js create mode 100644 pkgs/instrumentations/web/fetch/karma.worker.js create mode 100644 pkgs/instrumentations/web/fetch/package.json create mode 100644 pkgs/instrumentations/web/fetch/rollup.config.js rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/src/enums/AttributeNames.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/src/fetch.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/src/types.ts (95%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/test/fetch.test.ts (98%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/instrumentations/web/fetch}/test/index-webpack.ts (100%) create mode 100644 pkgs/instrumentations/web/fetch/test/index-webpack.worker.ts create mode 100644 pkgs/instrumentations/web/fetch/tsconfig.esm.json create mode 100644 pkgs/instrumentations/web/fetch/tsconfig.esnext.json create mode 100644 pkgs/instrumentations/web/fetch/tsconfig.json rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/instrumentations/web/long-task}/.eslintignore (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load => pkgs/instrumentations/web/long-task}/.eslintrc.js (75%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/CHANGELOG.md (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/README.md (91%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/long-task}/karma.conf.js (86%) create mode 100644 pkgs/instrumentations/web/long-task/karma.debug.conf.js create mode 100644 pkgs/instrumentations/web/long-task/package.json create mode 100644 pkgs/instrumentations/web/long-task/rollup.config.js rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/src/index.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/src/instrumentation.ts (93%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/src/types.ts (90%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/test/compatibility.test.ts (92%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/long-task}/test/index-webpack.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/test/longTask.test.ts (92%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/test/util.ts (92%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/tsconfig.esm.json (82%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/long-task}/tsconfig.json (75%) rename {auto-merge/js/packages/opentelemetry-context-zone => pkgs/instrumentations/web/user-interaction}/.eslintignore (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/.eslintrc.js (80%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/CHANGELOG.md (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/LICENSE (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/README.md (89%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/images/click-sync.jpg (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/images/click.jpg (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/images/main-sync.jpg (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/images/main.jpg (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task => pkgs/instrumentations/web/user-interaction}/karma.conf.js (86%) create mode 100644 pkgs/instrumentations/web/user-interaction/karma.debug.conf.js create mode 100644 pkgs/instrumentations/web/user-interaction/package.json create mode 100644 pkgs/instrumentations/web/user-interaction/rollup.config.js rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/src/enums/AttributeNames.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/src/index.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/src/instrumentation.ts (98%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/src/internal-types.ts (96%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/src/types.ts (90%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/test/helper.test.ts (97%) rename {auto-merge/js/experimental/packages/otlp-transformer => pkgs/instrumentations/web/user-interaction}/test/index-webpack.ts (100%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/test/userInteraction.nozone.test.ts (98%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/test/userInteraction.test.ts (97%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/tsconfig.esm.json (83%) rename {auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction => pkgs/instrumentations/web/user-interaction}/tsconfig.json (83%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/instrumentations/web/xhr}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/instrumentations/web/xhr}/.eslintrc.js (66%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/instrumentations/web/xhr}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/instrumentations/web/xhr}/LICENSE (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/README.md (89%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/images/cors.jpg (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/images/main.jpg (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/images/request.jpg (100%) create mode 100644 pkgs/instrumentations/web/xhr/karma.conf.js create mode 100644 pkgs/instrumentations/web/xhr/karma.debug.conf.js create mode 100644 pkgs/instrumentations/web/xhr/package.json create mode 100644 pkgs/instrumentations/web/xhr/rollup.config.js rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/src/enums/AttributeNames.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/src/enums/EventNames.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/src/types.ts (97%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/src/xhr.ts (97%) rename {auto-merge/js/packages/opentelemetry-context-zone-peer-dep => pkgs/instrumentations/web/xhr}/test/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/test/unmocked.test.ts (85%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request => pkgs/instrumentations/web/xhr}/test/xhr.test.ts (98%) create mode 100644 pkgs/instrumentations/web/xhr/tsconfig.esm.json create mode 100644 pkgs/instrumentations/web/xhr/tsconfig.esnext.json create mode 100644 pkgs/instrumentations/web/xhr/tsconfig.json rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/propagators/b3}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch => pkgs/propagators/b3}/.eslintrc.js (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/propagators/b3}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/propagators/b3}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/README.md (91%) rename auto-merge/js/experimental/packages/otlp-transformer/karma.conf.js => pkgs/propagators/b3/karma.browser.conf.js (85%) create mode 100644 pkgs/propagators/b3/karma.debug.conf.js create mode 100644 pkgs/propagators/b3/karma.webpack.js create mode 100644 pkgs/propagators/b3/package.json create mode 100644 pkgs/propagators/b3/rollup.config.js rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/B3MultiPropagator.ts (97%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/B3Propagator.ts (96%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/B3SinglePropagator.ts (96%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/common.ts (92%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/constants.ts (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/src/types.ts (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/test/B3MultiPropagator.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/test/B3Propagator.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/propagators/b3}/test/B3SinglePropagator.test.ts (98%) create mode 100644 pkgs/propagators/b3/test/index-webpack.ts create mode 100644 pkgs/propagators/b3/tsconfig.esm.json create mode 100644 pkgs/propagators/b3/tsconfig.esnext.json create mode 100644 pkgs/propagators/b3/tsconfig.json rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/resources}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-exporter-zipkin => pkgs/resources}/.eslintrc.js (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/resources}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/README.md (92%) rename {auto-merge/js/packages/sdk-metrics => pkgs/resources}/karma.conf.js (100%) create mode 100644 pkgs/resources/karma.debug.conf.js rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/karma.worker.js (100%) create mode 100644 pkgs/resources/package.json create mode 100644 pkgs/resources/rollup.config.js rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/IResource.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/Resource.ts (96%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/config.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detect-resources.ts (98%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/BrowserDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/BrowserDetectorSync.ts (93%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/EnvDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/EnvDetectorSync.ts (96%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/NoopDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/NoopDetectorSync.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/detectors/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/HostDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/HostDetectorSync.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/OSDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/OSDetectorSync.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/ProcessDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/ProcessDetectorSync.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/default-service-name.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/browser/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/HostDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/HostDetectorSync.ts (95%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/OSDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/OSDetectorSync.ts (93%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/ProcessDetector.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/ProcessDetectorSync.ts (93%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/default-service-name.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/execAsync.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/getMachineId-bsd.ts (95%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/getMachineId-darwin.ts (95%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/getMachineId-linux.ts (95%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/getMachineId-unsupported.ts (93%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/getMachineId-win.ts (96%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/machine-id/getMachineId.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/platform/node/utils.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/types.ts (95%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/src/utils.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/Resource.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detect-resources.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/browser/BrowserDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/browser/EnvDetector.test.ts (94%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/browser/HostDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/browser/OSDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/browser/ProcessDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/BrowserDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/EnvDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/HostDetector.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/OSDetector.test.ts (95%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/ProcessDetector.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/machine-id/getMachineId-bsd.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/machine-id/getMachineId-darwin.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/machine-id/getMachineId-linux.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/detectors/node/machine-id/getMachineId-win.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/index-webpack.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/index-webpack.worker.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/regression/existing-detectors-1-9-1.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/resource-assertions.test.ts (97%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/util.ts (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/util/resource-assertions.ts (98%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/resources}/test/util/sample-detector.ts (93%) create mode 100644 pkgs/resources/tsconfig.esm.json create mode 100644 pkgs/resources/tsconfig.esnext.json create mode 100644 pkgs/resources/tsconfig.json rename {auto-merge/js/packages/opentelemetry-resources => pkgs/sdk/logs}/.eslintignore (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/.eslintrc.js (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/sdk/logs}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/sdk/logs}/LICENSE (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/README.md (96%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/karma.conf.js (100%) create mode 100644 pkgs/sdk/logs/karma.debug.conf.js create mode 100644 pkgs/sdk/logs/karma.webpack.js create mode 100644 pkgs/sdk/logs/karma.worker.js create mode 100644 pkgs/sdk/logs/package.json create mode 100644 pkgs/sdk/logs/rollup.config.js rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/LogRecord.ts (94%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/LogRecordProcessor.ts (95%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/Logger.ts (90%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/LoggerProvider.ts (93%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/MultiLogRecordProcessor.ts (96%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/config.ts (98%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/BatchLogRecordProcessorBase.ts (97%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/ConsoleLogRecordExporter.ts (96%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/InMemoryLogRecordExporter.ts (93%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/LogRecordExporter.ts (93%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/NoopLogRecordProcessor.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/ReadableLogRecord.ts (81%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/export/SimpleLogRecordProcessor.ts (94%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/index.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/platform/browser/export/BatchLogRecordProcessor.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/platform/browser/index.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/platform/index.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/platform/node/export/BatchLogRecordProcessor.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/platform/node/index.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/src/types.ts (97%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/browser/export/BatchLogRecordProcessor.test.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/LogRecord.test.ts (98%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/Logger.test.ts (96%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/LoggerProvider.test.ts (98%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/MultiLogRecordProcessor.test.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/export/BatchLogRecordProcessor.test.ts (99%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/export/ConsoleLogRecordExporter.test.ts (97%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/export/InMemoryLogRecordExporter.test.ts (95%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/export/SimpleLogRecordProcessor.test.ts (98%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/common/utils.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/index-webpack.ts (100%) rename {auto-merge/js/experimental/packages/sdk-logs => pkgs/sdk/logs}/test/index-webpack.worker.ts (100%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/sdk/logs}/test/test-utils.ts (100%) create mode 100644 pkgs/sdk/logs/tsconfig.esm.json create mode 100644 pkgs/sdk/logs/tsconfig.esnext.json create mode 100644 pkgs/sdk/logs/tsconfig.json rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/metrics}/.eslintignore (100%) create mode 100644 pkgs/sdk/metrics/.eslintrc.js rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/metrics}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/metrics}/LICENSE (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/README.md (96%) rename {auto-merge/js/experimental/packages/api-logs => pkgs/sdk/metrics}/karma.conf.js (100%) create mode 100644 pkgs/sdk/metrics/karma.debug.conf.js create mode 100644 pkgs/sdk/metrics/karma.webpack.js create mode 100644 pkgs/sdk/metrics/karma.worker.js create mode 100644 pkgs/sdk/metrics/package.json create mode 100644 pkgs/sdk/metrics/rollup.config.js rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/InstrumentDescriptor.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/Instruments.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/Meter.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/MeterProvider.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/ObservableResult.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/Drop.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/ExponentialHistogram.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/Histogram.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/LastValue.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/Sum.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/Buckets.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/mapping/getMapping.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/mapping/ieee754.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/mapping/types.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/exponential-histogram/util.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/index.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/aggregator/types.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/AlwaysSampleExemplarFilter.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/Exemplar.ts (95%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/ExemplarFilter.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/ExemplarReservoir.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/NeverSampleExemplarFilter.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/SimpleFixedSizeExemplarReservoir.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/WithTraceExemplarFilter.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/exemplar/index.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/AggregationSelector.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/AggregationTemporality.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/ConsoleMetricExporter.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/InMemoryMetricExporter.ts (94%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/MetricData.ts (95%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/MetricExporter.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/MetricProducer.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/MetricReader.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/export/PeriodicExportingMetricReader.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/index.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/AsyncMetricStorage.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/DeltaMetricProcessor.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/HashMap.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/MeterProviderSharedState.ts (93%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/MeterSharedState.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/MetricCollector.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/MetricStorage.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/MetricStorageRegistry.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/MultiWritableMetricStorage.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/ObservableRegistry.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/SyncMetricStorage.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/TemporalMetricProcessor.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/state/WritableMetricStorage.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/types.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/utils.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/Aggregation.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/AttributesProcessor.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/InstrumentSelector.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/MeterSelector.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/Predicate.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/RegistrationConflicts.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/View.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/src/view/ViewRegistry.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/ExemplarFilter.test.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/ExemplarReservoir.test.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/InstrumentDescriptor.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/Instruments.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/Meter.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/MeterProvider.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/ObservableResult.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/Drop.test.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/ExponentialHistogram.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/Histogram.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/LastValue.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/Sum.test.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/exponential-histogram/ExponentMapping.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/exponential-histogram/LogarithmMapping.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/exponential-histogram/getMapping.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/exponential-histogram/helpers.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/aggregator/exponential-histogram/ieee754.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/ConsoleMetricExporter.test.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/InMemoryMetricExporter.test.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/MetricReader.test.ts (98%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/PeriodicExportingMetricReader.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/TestMetricExporter.ts (94%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/TestMetricProducer.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/TestMetricReader.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/export/utils.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/index-webpack.ts (100%) create mode 100644 pkgs/sdk/metrics/test/index-webpack.worker.ts rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/regression/cumulative-exponential-histogram.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/regression/two-metric-readers-async-instrument.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/AsyncMetricStorage.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/DeltaMetricProcessor.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/HashMap.test.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/MeterSharedState.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/MetricCollector.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/MetricStorageRegistry.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/MultiWritableMetricStorage.test.ts (94%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/ObservableRegistry.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/SyncMetricStorage.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/state/TemporalMetricProcessor.test.ts (99%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/test-utils.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/util.ts (96%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/utils.test.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/view/Aggregation.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/view/AttributesProcessor.test.ts (97%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/view/Predicate.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/view/View.test.ts (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/metrics}/test/view/ViewRegistry.test.ts (100%) create mode 100644 pkgs/sdk/metrics/tsconfig.esm.json create mode 100644 pkgs/sdk/metrics/tsconfig.esnext.json create mode 100644 pkgs/sdk/metrics/tsconfig.json rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-resources => pkgs/sdk/trace/base}/.eslintrc.js (75%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/base}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/base}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/README.md (94%) rename {auto-merge/js/api => pkgs/sdk/trace/base}/karma.conf.js (85%) create mode 100644 pkgs/sdk/trace/base/karma.debug.conf.js rename {auto-merge/js/api => pkgs/sdk/trace/base}/karma.worker.js (85%) create mode 100644 pkgs/sdk/trace/base/package.json create mode 100644 pkgs/sdk/trace/base/rollup.config.js rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/BasicTracerProvider.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/IdGenerator.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/MultiSpanProcessor.ts (94%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/Sampler.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/Span.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/SpanProcessor.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/TimedEvent.ts (93%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/Tracer.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/config.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/enums.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/BatchSpanProcessorBase.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/ConsoleSpanExporter.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/InMemorySpanExporter.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/NoopSpanProcessor.ts (95%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/ReadableSpan.ts (88%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/SimpleSpanProcessor.ts (95%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/export/SpanExporter.ts (95%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/browser/RandomIdGenerator.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/browser/export/BatchSpanProcessor.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/browser/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/node/RandomIdGenerator.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/node/export/BatchSpanProcessor.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/platform/node/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/sampler/AlwaysOffSampler.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/sampler/AlwaysOnSampler.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/sampler/ParentBasedSampler.ts (97%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/sampler/TraceIdRatioBasedSampler.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/types.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/src/utility.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/browser/export/BatchSpanProcessor.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/BasicTracerProvider.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/MultiSpanProcessor.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/Sampler.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/Span.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/Tracer.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/config.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/BatchSpanProcessorBase.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/ConsoleSpanExporter.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/InMemorySpanExporter.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/SimpleSpanProcessor.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/TestExporterWithDelay.ts (95%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/TestRecordOnlySampler.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/TestStackContextManager.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/export/TestTracingSpanExporter.ts (97%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/platform/RandomIdGenerator.test.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/sampler/AlwaysOffSampler.test.ts (95%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/sampler/AlwaysOnSampler.test.ts (95%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/sampler/ParentBasedSampler.test.ts (97%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/sampler/TraceIdRatioBasedSampler.test.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/common/util.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/index-webpack.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-base => pkgs/sdk/trace/base}/test/index-webpack.worker.ts (100%) create mode 100644 pkgs/sdk/trace/base/tsconfig.esm.json create mode 100644 pkgs/sdk/trace/base/tsconfig.esnext.json create mode 100644 pkgs/sdk/trace/base/tsconfig.json rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/sdk/trace/web}/.eslintignore (100%) create mode 100644 pkgs/sdk/trace/web/.eslintrc.js rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/sdk/trace/web}/.npmignore (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/sdk/trace/web}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/README.md (90%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/karma.conf.js (86%) create mode 100644 pkgs/sdk/trace/web/karma.debug.conf.js create mode 100644 pkgs/sdk/trace/web/karma.worker.js create mode 100644 pkgs/sdk/trace/web/package.json create mode 100644 pkgs/sdk/trace/web/rollup.config.js rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/src/StackContextManager.ts (99%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/src/WebTracerProvider.ts (97%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/src/enums/PerformanceTimingNames.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/src/index.ts (93%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/src/types.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/src/utils.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/NodeGlobalsFoolProofing.test.ts (93%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/StackContextManager.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/WebTracerProvider.test.ts (90%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/index-webpack.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/index-webpack.worker.ts (100%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/registration.test.ts (96%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/utils.test.ts (98%) rename {auto-merge/js/packages/opentelemetry-sdk-trace-web => pkgs/sdk/trace/web}/test/window/utils.test.ts (100%) create mode 100644 pkgs/sdk/trace/web/tsconfig.esm.json create mode 100644 pkgs/sdk/trace/web/tsconfig.esnext.json create mode 100644 pkgs/sdk/trace/web/tsconfig.json rename {auto-merge/js/packages/sdk-metrics => pkgs/semantic-conventions}/.eslintignore (100%) rename {auto-merge/js/packages/opentelemetry-propagator-b3 => pkgs/semantic-conventions}/.eslintrc.js (100%) rename {auto-merge/js/packages/sdk-metrics => pkgs/semantic-conventions}/.npmignore (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/LICENSE (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/README.md (94%) create mode 100644 pkgs/semantic-conventions/package.json create mode 100644 pkgs/semantic-conventions/rollup.config.js rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/src/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/src/resource/SemanticResourceAttributes.ts (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/src/resource/index.ts (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/src/trace/SemanticAttributes.ts (100%) rename {auto-merge/js/packages/opentelemetry-semantic-conventions => pkgs/semantic-conventions}/src/trace/index.ts (100%) create mode 100644 pkgs/semantic-conventions/tsconfig.esm.json create mode 100644 pkgs/semantic-conventions/tsconfig.esnext.json create mode 100644 pkgs/semantic-conventions/tsconfig.json rename auto-merge/js/prettier.config.js => prettier.config.js (100%) rename {auto-merge/js/scripts => scripts}/generate-protos.js (100%) rename {auto-merge/js/scripts => scripts}/peer-api-check.js (100%) rename {auto-merge/js/scripts => scripts}/semconv/.gitignore (100%) rename {auto-merge/js/scripts => scripts}/semconv/generate.sh (100%) rename {auto-merge/js/scripts => scripts}/semconv/templates/SemanticAttributes.ts.j2 (100%) rename {auto-merge/js/scripts => scripts}/update-ts-configs-constants.js (100%) rename {auto-merge/js/scripts => scripts}/update-ts-configs.js (100%) rename {auto-merge/js/scripts => scripts}/version-update.js (90%) rename auto-merge/js/tsconfig.base.es5.json => tsconfig.base.es5.json (100%) rename auto-merge/js/tsconfig.base.esm.json => tsconfig.base.esm.json (100%) rename auto-merge/js/tsconfig.base.esnext.json => tsconfig.base.esnext.json (100%) rename auto-merge/js/tsconfig.base.json => tsconfig.base.json (100%) rename auto-merge/js/tsconfig.esm.json => tsconfig.esm.json (100%) rename auto-merge/js/tsconfig.esnext.json => tsconfig.esnext.json (100%) rename auto-merge/js/tsconfig.json => tsconfig.json (100%) rename auto-merge/js/webpack.node-polyfills.js => webpack.node-polyfills.js (100%) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..1bf240817 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "pkgs/exporters/otlp/proto-base/protos"] + path = pkgs/exporters/otlp/proto-base/protos + url = https://github.com/open-telemetry/opentelemetry-proto.git diff --git a/auto-merge/js/.markdownlint.json b/.markdownlint.json similarity index 100% rename from auto-merge/js/.markdownlint.json rename to .markdownlint.json diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/package.json b/auto-merge/contrib/metapackages/auto-instrumentations-web/package.json deleted file mode 100644 index 79836489d..000000000 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/package.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "@opentelemetry/auto-instrumentations-web", - "version": "0.33.0", - "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", - "author": "OpenTelemetry Authors", - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-web#readme", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "publishConfig": { - "access": "public" - }, - "main": "build/src/index.js", - "module": "build/esm/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", - "scripts": { - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-web --include-dependencies", - "prewatch": "npm run precompile", - "prepare": "npm run compile", - "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" - }, - "bugs": { - "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "^1.3.0", - "@types/mocha": "8.2.3", - "@types/node": "18.16.19", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.2", - "babel-loader": "8.2.2", - "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "karma": "6.3.16", - "karma-chrome-launcher": "^3.1.1", - "karma-coverage-istanbul-reporter": "3.0.3", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "mocha": "7.2.0", - "nyc": "15.1.0", - "rimraf": "5.0.1", - "sinon": "15.0.1", - "ts-loader": "8.3.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.7.2", - "webpack-merge": "5.8.0" - }, - "dependencies": { - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/instrumentation-document-load": "^0.33.0", - "@opentelemetry/instrumentation-fetch": "^0.41.2", - "@opentelemetry/instrumentation-user-interaction": "^0.33.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.2" - } -} diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/package.json b/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/package.json deleted file mode 100644 index 3abf89be2..000000000 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "name": "@opentelemetry/instrumentation-document-load", - "version": "0.33.0", - "description": "OpenTelemetry document-load automatic instrumentation package.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", - "scripts": { - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-document-load --include-dependencies", - "prewatch": "npm run precompile", - "version:update": "node ../../../scripts/version-update.js", - "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", - "tdd": "karma start", - "test:browser": "nyc karma start --single-run", - "watch": "tsc --build -watch tsconfig.json tsconfig.esm.json" - }, - "keywords": [ - "opentelemetry", - "document-load", - "web", - "tracing", - "profiling", - "plugin" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.map", - "build/esm/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "^1.3.0", - "@types/mocha": "8.2.3", - "@types/node": "18.16.19", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.2", - "babel-loader": "8.2.2", - "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "karma": "6.3.16", - "karma-chrome-launcher": "^3.1.1", - "karma-coverage-istanbul-reporter": "3.0.3", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "mocha": "7.2.0", - "nyc": "15.1.0", - "rimraf": "5.0.1", - "sinon": "15.0.1", - "ts-loader": "8.3.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.7.2", - "webpack-merge": "5.8.0" - }, - "dependencies": { - "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/sdk-trace-base": "^1.0.0", - "@opentelemetry/sdk-trace-web": "^1.15.0", - "@opentelemetry/semantic-conventions": "^1.0.0" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load#readme" -} diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/package.json b/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/package.json deleted file mode 100644 index b78a6af9c..000000000 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "@opentelemetry/instrumentation-long-task", - "version": "0.33.0", - "description": "OpenTelemetry long task API automatic instrumentation package.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", - "scripts": { - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction --include-dependencies", - "prewatch": "npm run precompile", - "version:update": "node ../../../scripts/version-update.js", - "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", - "tdd": "karma start", - "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" - }, - "keywords": [ - "opentelemetry", - "web", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.map", - "build/esm/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.16", - "@types/mocha": "7.0.2", - "@types/node": "18.16.19", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.2", - "babel-loader": "8.2.2", - "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "karma": "6.3.16", - "karma-chrome-launcher": "^3.1.1", - "karma-coverage-istanbul-reporter": "3.0.3", - "karma-jquery": "0.2.4", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "mocha": "7.2.0", - "nyc": "15.1.0", - "rimraf": "5.0.1", - "sinon": "15.0.1", - "ts-loader": "8.3.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.7.2", - "webpack-merge": "5.8.0", - "zone.js": "0.11.4" - }, - "dependencies": { - "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/sdk-trace-web": "^1.8.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - }, - "sideEffects": false, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-long-task#readme" -} diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/package.json deleted file mode 100644 index bae699622..000000000 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "name": "@opentelemetry/instrumentation-user-interaction", - "version": "0.33.0", - "description": "OpenTelemetry UserInteraction automatic instrumentation package.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", - "scripts": { - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction --include-dependencies", - "prewatch": "npm run precompile", - "version:update": "node ../../../scripts/version-update.js", - "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", - "tdd": "karma start", - "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" - }, - "keywords": [ - "opentelemetry", - "web", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.map", - "build/esm/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone-peer-dep": "^1.8.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.41.2", - "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.16", - "@types/mocha": "7.0.2", - "@types/node": "18.16.19", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.2", - "babel-loader": "8.2.2", - "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "karma": "6.3.16", - "karma-chrome-launcher": "^3.1.1", - "karma-coverage-istanbul-reporter": "3.0.3", - "karma-jquery": "0.2.4", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "mocha": "7.2.0", - "nyc": "15.1.0", - "rimraf": "5.0.1", - "sinon": "15.0.1", - "ts-loader": "8.3.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.7.2", - "webpack-merge": "5.8.0", - "zone.js": "0.11.4" - }, - "dependencies": { - "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.41.2", - "@opentelemetry/sdk-trace-web": "^1.8.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0", - "zone.js": "0.11.4" - }, - "sideEffects": false, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-user-interaction#readme" -} diff --git a/auto-merge/js/examples/opentelemetry-web/package.json b/auto-merge/js/examples/opentelemetry-web/package.json deleted file mode 100644 index 2b79e07cc..000000000 --- a/auto-merge/js/examples/opentelemetry-web/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "web-opentelemetry-example", - "private": true, - "version": "0.41.2", - "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", - "main": "index.js", - "scripts": { - "start": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --compress", - "start-nc": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --no-compress", - "start-prod": "webpack serve --progress --color --port 8090 --config webpack.prod.config.js --hot --host 0.0.0.0 --compress", - "start-prodnc": "webpack serve --progress --color --port 8090 --config webpack.prod.config.js --hot --host 0.0.0.0 --no-compress", - "docker:start": "cd ./docker && docker-compose down && docker-compose up", - "docker:startd": "cd ./docker && docker-compose down && docker-compose up -d", - "docker:stop": "cd ./docker && docker-compose down" - }, - "repository": { - "type": "git", - "url": "git+ssh://git@github.com/open-telemetry/opentelemetry-js.git" - }, - "keywords": [ - "opentelemetry", - "tracing", - "metrics", - "web" - ], - "engines": { - "node": ">=14" - }, - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/open-telemetry/opentelemetry-js/issues" - }, - "devDependencies": { - "@babel/core": "^7.6.0", - "babel-loader": "^8.0.6", - "ts-loader": "^9.2.6", - "typescript": "^4.5.2", - "webpack": "^5.65.0", - "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.5.0", - "webpack-merge": "^5.8.0" - }, - "dependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-zone": "1.15.2", - "@opentelemetry/core": "1.15.2", - "@opentelemetry/exporter-metrics-otlp-http": "0.41.2", - "@opentelemetry/exporter-trace-otlp-http": "0.41.2", - "@opentelemetry/exporter-trace-otlp-proto": "0.41.2", - "@opentelemetry/exporter-zipkin": "1.15.2", - "@opentelemetry/instrumentation": "0.41.2", - "@opentelemetry/instrumentation-fetch": "0.41.2", - "@opentelemetry/instrumentation-xml-http-request": "0.41.2", - "@opentelemetry/propagator-b3": "1.15.2", - "@opentelemetry/sdk-metrics": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", - "@opentelemetry/sdk-trace-web": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" -} diff --git a/auto-merge/js/experimental/packages/api-events/package.json b/auto-merge/js/experimental/packages/api-events/package.json deleted file mode 100644 index 23d69298f..000000000 --- a/auto-merge/js/experimental/packages/api-events/package.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "@opentelemetry/api-events", - "version": "0.41.2", - "description": "Public events API for OpenTelemetry", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", - "test:browser": "karma start --single-run", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "build": "npm run compile", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../../scripts/version-update.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "browser", - "profiling", - "events", - "stats", - "monitoring" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "devDependencies": { - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-events", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/api-logs/package.json b/auto-merge/js/experimental/packages/api-logs/package.json deleted file mode 100644 index 06d473b6b..000000000 --- a/auto-merge/js/experimental/packages/api-logs/package.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "@opentelemetry/api-logs", - "version": "0.41.2", - "description": "Public logs API for OpenTelemetry", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", - "test:browser": "karma start --single-run", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "build": "npm run compile", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../../scripts/version-update.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "browser", - "profiling", - "logs", - "stats", - "monitoring" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "devDependencies": { - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-logs", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json deleted file mode 100644 index 5abf5d1b6..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "name": "@opentelemetry/exporter-logs-otlp-http", - "version": "0.41.2", - "publishConfig": { - "access": "public" - }, - "description": "OpenTelemetry Collector Logs Exporter allows user to send collected logs to the OpenTelemetry Collector", - "author": "OpenTelemetry Authors", - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-http", - "license": "Apache-2.0", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/open-telemetry/opentelemetry-js.git" - }, - "bugs": { - "url": "https://github.com/open-telemetry/opentelemetry-js/issues" - }, - "engines": { - "node": ">=14" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "browser", - "tracing", - "profiling", - "logs", - "stats" - ], - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "sideEffects": false, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@opentelemetry/api-logs": "0.41.2", - "@opentelemetry/resources": "1.15.2", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cpx": "1.5.0", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api-logs": ">=0.38.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/otlp-exporter-base": "0.41.2", - "@opentelemetry/otlp-transformer": "0.41.2", - "@opentelemetry/sdk-logs": "0.41.2" - } -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json deleted file mode 100644 index 0edcb89fa..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../api-logs" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json deleted file mode 100644 index 0c19aa0aa..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../api-logs" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.json deleted file mode 100644 index 96f229bb8..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/tsconfig.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../api-logs" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/package.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/package.json deleted file mode 100644 index 4a210f122..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/package.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "name": "@opentelemetry/exporter-logs-otlp-proto", - "version": "0.41.2", - "description": "An OTLP exporter to send logs using protobuf over HTTP", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "protobuf", - "tracing", - "profiling", - "metrics", - "stats", - "logs" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "build/protos/**/*.proto", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cpx": "1.5.0", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/api-logs": "0.41.2", - "@opentelemetry/core": "1.15.2", - "@opentelemetry/otlp-exporter-base": "0.41.2", - "@opentelemetry/otlp-proto-exporter-base": "0.41.2", - "@opentelemetry/otlp-transformer": "0.41.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/sdk-logs": "0.41.2", - "@opentelemetry/sdk-trace-base": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esm.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esm.json deleted file mode 100644 index 5eba4694b..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esm.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../api-logs" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-proto-exporter-base" - }, - { - "path": "../otlp-transformer" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esnext.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esnext.json deleted file mode 100644 index b37520a70..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.esnext.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../api-logs" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-proto-exporter-base" - }, - { - "path": "../otlp-transformer" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.json b/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.json deleted file mode 100644 index 2349f8706..000000000 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/tsconfig.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../api-logs" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-proto-exporter-base" - }, - { - "path": "../otlp-transformer" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/package.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-http/package.json deleted file mode 100644 index 8bed923c8..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/package.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.41.2", - "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "browser", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cpx": "1.5.0", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/otlp-exporter-base": "0.41.2", - "@opentelemetry/otlp-transformer": "0.41.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json deleted file mode 100644 index 8647f6ec5..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json deleted file mode 100644 index b85acc27d..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.json deleted file mode 100644 index 6beb818c1..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/tsconfig.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/package.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/package.json deleted file mode 100644 index 1b143605c..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/package.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.41.2", - "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "protobuf", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "build/protos/**/*.proto", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cpx": "1.5.0", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/otlp-exporter-base": "0.41.2", - "@opentelemetry/otlp-proto-exporter-base": "0.41.2", - "@opentelemetry/otlp-transformer": "0.41.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json deleted file mode 100644 index 22887f7b0..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-proto-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json deleted file mode 100644 index 199ea3b32..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-proto-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.json b/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.json deleted file mode 100644 index cf9d8d1ec..000000000 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/tsconfig.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-proto-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/package.json b/auto-merge/js/experimental/packages/opentelemetry-browser-detector/package.json deleted file mode 100644 index c5c56290b..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/package.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "@opentelemetry/opentelemetry-browser-detector", - "version": "0.41.2", - "description": "OpenTelemetry Resource Detector for Browser", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "karma start --single-run", - "tdd": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "browser", - "resource", - "detector" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json b/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json deleted file mode 100644 index 28f110901..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json b/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json deleted file mode 100644 index ae74c831f..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.json b/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.json deleted file mode 100644 index 3dbac0564..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json deleted file mode 100644 index 8a5b59077..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/sdk-metrics" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json deleted file mode 100644 index 75da61114..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/sdk-metrics" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json b/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json deleted file mode 100644 index d6e465343..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/sdk-metrics" - }, - { - "path": "../otlp-exporter-base" - }, - { - "path": "../otlp-transformer" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/package.json deleted file mode 100644 index 2b219797d..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "name": "@opentelemetry/instrumentation-fetch", - "version": "0.41.2", - "description": "OpenTelemetry fetch automatic instrumentation package.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "version": "node ../../../scripts/version-update.js", - "tdd": "karma start", - "test:browser": "karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../../scripts/version-update.js", - "peer-api-check": "node ../../../scripts/peer-api-check.js" - }, - "keywords": [ - "fetch", - "opentelemetry", - "browser", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.15.2", - "@opentelemetry/propagator-b3": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/instrumentation": "0.41.2", - "@opentelemetry/sdk-trace-web": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json deleted file mode 100644 index bdaa95d3e..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-context-zone" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-propagator-b3" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-web" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - }, - { - "path": "../opentelemetry-instrumentation" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json deleted file mode 100644 index 825401c45..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-context-zone" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-propagator-b3" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-web" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - }, - { - "path": "../opentelemetry-instrumentation" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json deleted file mode 100644 index d531cbbb4..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-context-zone" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-propagator-b3" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-web" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - }, - { - "path": "../opentelemetry-instrumentation" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json deleted file mode 100644 index 2b12f444d..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.41.2", - "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "version": "node ../../../scripts/version-update.js", - "tdd": "karma start", - "test:browser": "karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../../scripts/version-update.js", - "peer-api-check": "node ../../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "browser", - "tracing", - "profiling", - "metrics", - "XMLHttpRequest", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@opentelemetry/context-zone": "1.15.2", - "@opentelemetry/propagator-b3": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/instrumentation": "0.41.2", - "@opentelemetry/sdk-trace-web": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json deleted file mode 100644 index bdaa95d3e..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-context-zone" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-propagator-b3" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-web" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - }, - { - "path": "../opentelemetry-instrumentation" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json deleted file mode 100644 index 825401c45..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-context-zone" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-propagator-b3" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-web" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - }, - { - "path": "../opentelemetry-instrumentation" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json deleted file mode 100644 index d531cbbb4..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-context-zone" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-propagator-b3" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-web" - }, - { - "path": "../../../packages/opentelemetry-semantic-conventions" - }, - { - "path": "../opentelemetry-instrumentation" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json deleted file mode 100644 index a673b4648..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/sdk-metrics" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json deleted file mode 100644 index f70e767a6..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/sdk-metrics" - } - ] -} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.json b/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.json deleted file mode 100644 index 668bce742..000000000 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/sdk-metrics" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/package.json b/auto-merge/js/experimental/packages/otlp-exporter-base/package.json deleted file mode 100644 index 9896eaaf8..000000000 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/package.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "name": "@opentelemetry/otlp-exporter-base", - "version": "0.41.2", - "description": "OpenTelemetry OTLP Exporter base (for internal use only)", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "profiling", - "metrics", - "stats", - "monitoring" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-exporter-base", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esm.json b/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esm.json deleted file mode 100644 index ae4740333..000000000 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esnext.json b/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esnext.json deleted file mode 100644 index 5f6cf572d..000000000 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.esnext.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.json b/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.json deleted file mode 100644 index 6feabd646..000000000 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/package.json b/auto-merge/js/experimental/packages/otlp-proto-exporter-base/package.json deleted file mode 100644 index 6426bf9eb..000000000 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/package.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "name": "@opentelemetry/otlp-proto-exporter-base", - "version": "0.41.2", - "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "npm run protos && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "protos": "npm run submodule && npm run protos:generate", - "protos:generate": "node ../../../scripts/generate-protos.js", - "submodule": "git submodule sync --recursive && git submodule update --init --recursive", - "version": "node ../../../scripts/version-update.js", - "watch": "npm run protos && tsc -w tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "protobuf", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "protobufjs-cli": "1.1.1", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/otlp-exporter-base": "0.41.2", - "protobufjs": "^7.2.3" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json b/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json deleted file mode 100644 index d5c055a84..000000000 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "allowJs": true, - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts", - "src/generated/*.js" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../otlp-exporter-base" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json b/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json deleted file mode 100644 index 2eeda32b2..000000000 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "allowJs": true, - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts", - "src/generated/*.js" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../otlp-exporter-base" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.json b/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.json deleted file mode 100644 index 442b34dd3..000000000 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/tsconfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "allowJs": true, - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "src/generated/*.js", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../otlp-exporter-base" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-transformer/package.json b/auto-merge/js/experimental/packages/otlp-transformer/package.json deleted file mode 100644 index 6b48eacda..000000000 --- a/auto-merge/js/experimental/packages/otlp-transformer/package.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "name": "@opentelemetry/otlp-transformer", - "private": false, - "publishConfig": { - "access": "public" - }, - "version": "0.41.2", - "description": "Transform OpenTelemetry SDK data into OTLP", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "main": "build/src/index.js", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "karma start --single-run", - "prewatch": "node ../../../scripts/version-update.js", - "watch": "tsc --build -w tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "grpc", - "protobuf", - "otlp", - "tracing", - "metrics" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "LICENSE", - "README.md" - ], - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.5.0" - }, - "devDependencies": { - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0" - }, - "dependencies": { - "@opentelemetry/api-logs": "0.41.2", - "@opentelemetry/core": "1.15.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/sdk-logs": "0.41.2", - "@opentelemetry/sdk-metrics": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", - "sideEffects": false -} diff --git a/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esm.json b/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esm.json deleted file mode 100644 index 0dc676825..000000000 --- a/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esm.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/sdk-metrics" - }, - { - "path": "../api-logs" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esnext.json b/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esnext.json deleted file mode 100644 index 56f7465ce..000000000 --- a/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.esnext.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/sdk-metrics" - }, - { - "path": "../api-logs" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.json b/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.json deleted file mode 100644 index cb92fea57..000000000 --- a/auto-merge/js/experimental/packages/otlp-transformer/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../../../packages/opentelemetry-sdk-trace-base" - }, - { - "path": "../../../packages/sdk-metrics" - }, - { - "path": "../api-logs" - }, - { - "path": "../sdk-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/sdk-logs/package.json b/auto-merge/js/experimental/packages/sdk-logs/package.json deleted file mode 100644 index 5c53b8417..000000000 --- a/auto-merge/js/experimental/packages/sdk-logs/package.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "name": "@opentelemetry/sdk-logs", - "version": "0.41.2", - "publishConfig": { - "access": "public" - }, - "description": "OpenTelemetry logs SDK", - "author": "OpenTelemetry Authors", - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/sdk-logs", - "license": "Apache-2.0", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/open-telemetry/opentelemetry-js.git" - }, - "bugs": { - "url": "https://github.com/open-telemetry/opentelemetry-js/issues" - }, - "engines": { - "node": ">=14" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "karma start --single-run", - "tdd": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../../scripts/version-update.js", - "peer-api-check": "node ../../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "logs", - "stats", - "profiling" - ], - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "sideEffects": false, - "peerDependencies": { - "@opentelemetry/api": ">=1.4.0 <1.5.0", - "@opentelemetry/api-logs": ">=0.39.1" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": ">=1.4.0 <1.5.0", - "@opentelemetry/api-logs": "0.41.2", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/resources": "1.15.2" - } -} diff --git a/auto-merge/js/experimental/packages/sdk-logs/tsconfig.esm.json b/auto-merge/js/experimental/packages/sdk-logs/tsconfig.esm.json deleted file mode 100644 index 54150ddeb..000000000 --- a/auto-merge/js/experimental/packages/sdk-logs/tsconfig.esm.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../api-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/sdk-logs/tsconfig.esnext.json b/auto-merge/js/experimental/packages/sdk-logs/tsconfig.esnext.json deleted file mode 100644 index 8cdb32ae0..000000000 --- a/auto-merge/js/experimental/packages/sdk-logs/tsconfig.esnext.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../api-logs" - } - ] -} diff --git a/auto-merge/js/experimental/packages/sdk-logs/tsconfig.json b/auto-merge/js/experimental/packages/sdk-logs/tsconfig.json deleted file mode 100644 index 25205b8cf..000000000 --- a/auto-merge/js/experimental/packages/sdk-logs/tsconfig.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - }, - { - "path": "../../../packages/opentelemetry-core" - }, - { - "path": "../../../packages/opentelemetry-resources" - }, - { - "path": "../api-logs" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/package.json b/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/package.json deleted file mode 100644 index ba41bbe51..000000000 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/package.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "name": "@opentelemetry/context-zone-peer-dep", - "version": "1.15.2", - "description": "OpenTelemetry Context Zone with peer dependency for zone.js", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "version": "node ../../scripts/version-update.js", - "tdd": "karma start", - "test:browser": "karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "web", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "@types/zone.js": "0.5.12", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "zone.js": "0.11.4" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "zone.js": "^0.10.2 || ^0.11.0" - }, - "sideEffects": false, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep" -} diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json deleted file mode 100644 index 971caf60a..000000000 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "files": [ - "node_modules/zone.js/dist/zone.js.d.ts" - ], - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-context-zone/.eslintrc.js b/auto-merge/js/packages/opentelemetry-context-zone/.eslintrc.js deleted file mode 100644 index a374ccda6..000000000 --- a/auto-merge/js/packages/opentelemetry-context-zone/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "browser": true, - "commonjs": true - }, - ...require('../../eslint.base.js') -} diff --git a/auto-merge/js/packages/opentelemetry-context-zone/package.json b/auto-merge/js/packages/opentelemetry-context-zone/package.json deleted file mode 100644 index 5b9581933..000000000 --- a/auto-merge/js/packages/opentelemetry-context-zone/package.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "@opentelemetry/context-zone", - "version": "1.15.2", - "description": "OpenTelemetry Context Zone", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "web", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.2", - "zone.js": "^0.11.0" - }, - "sideEffects": true, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone" -} diff --git a/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esm.json deleted file mode 100644 index 01f05a6dc..000000000 --- a/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "files": [ - "node_modules/zone.js/dist/zone.js.d.ts" - ], - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone-peer-dep" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esnext.json b/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esnext.json deleted file mode 100644 index 0f34342c6..000000000 --- a/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.esnext.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "files": [ - "node_modules/zone.js/dist/zone.js.d.ts" - ], - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone-peer-dep" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-core/package.json b/auto-merge/js/packages/opentelemetry-core/package.json deleted file mode 100644 index 061821f18..000000000 --- a/auto-merge/js/packages/opentelemetry-core/package.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "name": "@opentelemetry/core", - "version": "1.15.2", - "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts --exclude 'test/platform/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "tdd": "npm run tdd:node", - "tdd:node": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "browser", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - }, - "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", - "sideEffects": false -} diff --git a/auto-merge/js/packages/opentelemetry-core/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-core/tsconfig.esm.json deleted file mode 100644 index fdabf4b57..000000000 --- a/auto-merge/js/packages/opentelemetry-core/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-core/tsconfig.esnext.json b/auto-merge/js/packages/opentelemetry-core/tsconfig.esnext.json deleted file mode 100644 index 3d3cb45fd..000000000 --- a/auto-merge/js/packages/opentelemetry-core/tsconfig.esnext.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/karma.conf.js b/auto-merge/js/packages/opentelemetry-exporter-zipkin/karma.conf.js deleted file mode 100644 index 455b1437c..000000000 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/karma.conf.js +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * 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 - * - * 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. - */ - -const karmaWebpackConfig = require('../../karma.webpack'); -const karmaBaseConfig = require('../../karma.base'); - -module.exports = (config) => { - config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig, - files: ['test/browser/index-webpack.ts'], - preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] } - })) -}; diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/package.json b/auto-merge/js/packages/opentelemetry-exporter-zipkin/package.json deleted file mode 100644 index c68c7eb44..000000000 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/package.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "name": "@opentelemetry/exporter-zipkin", - "version": "1.15.2", - "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "browser", - "tracing", - "profiling" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nock": "13.3.2", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", - "sideEffects": false -} diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json deleted file mode 100644 index 56cf35eea..000000000 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json b/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json deleted file mode 100644 index 5d9a60ea2..000000000 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.json b/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.json deleted file mode 100644 index c8b602f0e..000000000 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/tsconfig.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/package.json b/auto-merge/js/packages/opentelemetry-propagator-b3/package.json deleted file mode 100644 index 2a50fd93e..000000000 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/package.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "name": "@opentelemetry/propagator-b3", - "version": "1.15.2", - "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "profiling", - "monitoring", - "b3" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3", - "sideEffects": false -} diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json deleted file mode 100644 index 76f5aed50..000000000 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-resources/package.json b/auto-merge/js/packages/opentelemetry-resources/package.json deleted file mode 100644 index bed20a954..000000000 --- a/auto-merge/js/packages/opentelemetry-resources/package.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "name": "@opentelemetry/resources", - "version": "1.15.2", - "description": "OpenTelemetry SDK resources", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "karma start --single-run", - "test:webworker": "karma start karma.worker.js --single-run", - "tdd": "npm run test -- --watch-extensions ts --watch", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "version": "node ../../scripts/version-update.js", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "resources", - "stats", - "profiling" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-mocha-webworker": "1.3.0", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nock": "13.3.2", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", - "sideEffects": false -} diff --git a/auto-merge/js/packages/opentelemetry-resources/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-resources/tsconfig.esm.json deleted file mode 100644 index dc247ea71..000000000 --- a/auto-merge/js/packages/opentelemetry-resources/tsconfig.esm.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-resources/tsconfig.esnext.json b/auto-merge/js/packages/opentelemetry-resources/tsconfig.esnext.json deleted file mode 100644 index df87d6341..000000000 --- a/auto-merge/js/packages/opentelemetry-resources/tsconfig.esnext.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-resources/tsconfig.json b/auto-merge/js/packages/opentelemetry-resources/tsconfig.json deleted file mode 100644 index 873053f07..000000000 --- a/auto-merge/js/packages/opentelemetry-resources/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/package.json b/auto-merge/js/packages/opentelemetry-sdk-trace-base/package.json deleted file mode 100644 index 2e741d532..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/package.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "name": "@opentelemetry/sdk-trace-base", - "version": "1.15.2", - "description": "OpenTelemetry Tracing", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "test:webworker": "karma start karma.worker.js --single-run", - "tdd": "npm run tdd:node", - "tdd:node": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-mocha-webworker": "1.3.0", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", - "sideEffects": false -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json deleted file mode 100644 index 8c54819c4..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json b/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json deleted file mode 100644 index 5ec46d315..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.json b/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.json deleted file mode 100644 index 2d87ab62f..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/package.json b/auto-merge/js/packages/opentelemetry-sdk-trace-web/package.json deleted file mode 100644 index 1d31e720e..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/package.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "name": "@opentelemetry/sdk-trace-web", - "version": "1.15.2", - "description": "OpenTelemetry Web Tracer", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "version": "node ../../scripts/version-update.js", - "tdd": "karma start", - "test:browser": "karma start --single-run", - "test:webworker": "karma start karma.worker.js --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "web", - "tracing", - "profiling", - "metrics", - "stats" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": ">=1.0.0 <1.5.0", - "@opentelemetry/context-zone": "1.15.2", - "@opentelemetry/propagator-b3": "1.15.2", - "@opentelemetry/resources": "1.15.2", - "@types/jquery": "3.5.16", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "@types/webpack-env": "1.16.3", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-jquery": "0.2.4", - "karma-mocha": "2.0.1", - "karma-mocha-webworker": "1.3.0", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", - "@opentelemetry/semantic-conventions": "1.15.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", - "sideEffects": false -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json b/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json deleted file mode 100644 index b4393361b..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-context-zone" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-propagator-b3" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json b/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json deleted file mode 100644 index db7a907a8..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-context-zone" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-propagator-b3" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.json b/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.json deleted file mode 100644 index 121903616..000000000 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-context-zone" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-propagator-b3" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js b/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js deleted file mode 100644 index 36847df9f..000000000 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "commonjs": true, - "node": true, - "browser": true - }, - ...require('../../eslint.base.js') -} diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/package.json b/auto-merge/js/packages/opentelemetry-semantic-conventions/package.json deleted file mode 100644 index bca2bd960..000000000 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/package.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "name": "@opentelemetry/semantic-conventions", - "version": "1.15.2", - "description": "OpenTelemetry semantic conventions", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "attributes", - "semantic conventions" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nock": "13.3.2", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-mocha": "10.0.0", - "typescript": "4.4.4" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions", - "sideEffects": false -} diff --git a/auto-merge/js/packages/sdk-metrics/.eslintrc.js b/auto-merge/js/packages/sdk-metrics/.eslintrc.js deleted file mode 100644 index 3d9af536b..000000000 --- a/auto-merge/js/packages/sdk-metrics/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../eslint.base.js') -} diff --git a/auto-merge/js/packages/sdk-metrics/package.json b/auto-merge/js/packages/sdk-metrics/package.json deleted file mode 100644 index 7de85fe7e..000000000 --- a/auto-merge/js/packages/sdk-metrics/package.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "name": "@opentelemetry/sdk-metrics", - "version": "1.15.2", - "description": "OpenTelemetry metrics SDK", - "main": "build/src/index.js", - "module": "build/esm/index.js", - "esnext": "build/esnext/index.js", - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:browser": "karma start --single-run", - "tdd": "npm run test -- --watch-extensions ts --watch", - "tdd:browser": "karma start", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../scripts/version-update.js", - "peer-api-check": "node ../../scripts/peer-api-check.js" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "metrics", - "stats", - "profiling" - ], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "files": [ - "build/esm/**/*.js", - "build/esm/**/*.js.map", - "build/esm/**/*.d.ts", - "build/esnext/**/*.js", - "build/esnext/**/*.js.map", - "build/esnext/**/*.d.ts", - "build/src/**/*.js", - "build/src/**/*.js.map", - "build/src/**/*.d.ts", - "doc", - "LICENSE", - "README.md" - ], - "publishConfig": { - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.22.10", - "@opentelemetry/api": ">=1.3.0 <1.5.0", - "@types/lodash.merge": "4.6.7", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", - "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "karma": "6.4.2", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", - "ts-loader": "8.4.0", - "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.9.0" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.5.0" - }, - "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/resources": "1.15.2", - "lodash.merge": "^4.6.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", - "sideEffects": false -} diff --git a/auto-merge/js/packages/sdk-metrics/tsconfig.esm.json b/auto-merge/js/packages/sdk-metrics/tsconfig.esm.json deleted file mode 100644 index 013c8cd68..000000000 --- a/auto-merge/js/packages/sdk-metrics/tsconfig.esm.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "outDir": "build/esm", - "rootDir": "src", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - } - ] -} diff --git a/auto-merge/js/packages/sdk-metrics/tsconfig.esnext.json b/auto-merge/js/packages/sdk-metrics/tsconfig.esnext.json deleted file mode 100644 index 98ffec480..000000000 --- a/auto-merge/js/packages/sdk-metrics/tsconfig.esnext.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.esnext.json", - "compilerOptions": { - "outDir": "build/esnext", - "rootDir": "src", - "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - } - ] -} diff --git a/auto-merge/js/packages/sdk-metrics/tsconfig.json b/auto-merge/js/packages/sdk-metrics/tsconfig.json deleted file mode 100644 index aea59db32..000000000 --- a/auto-merge/js/packages/sdk-metrics/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "build", - "rootDir": "." - }, - "files": [], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - } - ] -} diff --git a/auto-merge/js/eslint.base.js b/eslint.base.js similarity index 100% rename from auto-merge/js/eslint.base.js rename to eslint.base.js diff --git a/auto-merge/js/examples/opentelemetry-web/.eslintrc.js b/examples/web/js/.eslintrc.js similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/.eslintrc.js rename to examples/web/js/.eslintrc.js diff --git a/auto-merge/js/examples/opentelemetry-web/README.md b/examples/web/js/README.md similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/README.md rename to examples/web/js/README.md diff --git a/auto-merge/js/examples/opentelemetry-web/docker/collector-config.yaml b/examples/web/js/docker/collector-config.yaml similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/docker/collector-config.yaml rename to examples/web/js/docker/collector-config.yaml diff --git a/auto-merge/js/examples/opentelemetry-web/docker/docker-compose.yaml b/examples/web/js/docker/docker-compose.yaml similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/docker/docker-compose.yaml rename to examples/web/js/docker/docker-compose.yaml diff --git a/auto-merge/js/examples/opentelemetry-web/docker/prometheus.yaml b/examples/web/js/docker/prometheus.yaml similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/docker/prometheus.yaml rename to examples/web/js/docker/prometheus.yaml diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetch-proto/index.html b/examples/web/js/examples/fetch-proto/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/fetch-proto/index.html rename to examples/web/js/examples/fetch-proto/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetch-proto/index.js b/examples/web/js/examples/fetch-proto/index.js similarity index 79% rename from auto-merge/js/examples/opentelemetry-web/examples/fetch-proto/index.js rename to examples/web/js/examples/fetch-proto/index.js index 9a9e85184..dadf79fa1 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/fetch-proto/index.js +++ b/examples/web/js/examples/fetch-proto/index.js @@ -1,11 +1,11 @@ -const { context, trace } = require("@opentelemetry/api"); -const { ConsoleSpanExporter, SimpleSpanProcessor} = require("@opentelemetry/sdk-trace-base"); -const { WebTracerProvider } = require("@opentelemetry/sdk-trace-web"); -const { FetchInstrumentation } = require("@opentelemetry/instrumentation-fetch"); -const { ZoneContextManager } = require("@opentelemetry/context-zone"); -const { B3Propagator } = require("@opentelemetry/propagator-b3"); -const { registerInstrumentations } = require("@opentelemetry/instrumentation"); -const { OTLPTraceExporter: OTLPTraceExporterProto } = require("@opentelemetry/exporter-trace-otlp-proto"); +const { context, trace } = require("@opentelemetry/sandbox-api"); +const { ConsoleSpanExporter, SimpleSpanProcessor} = require("@opentelemetry/sandbox-sdk-trace-base"); +const { WebTracerProvider } = require("@opentelemetry/sandbox-sdk-trace-web"); +const { FetchInstrumentation } = require("@opentelemetry/sandbox-instrumentation-fetch"); +const { ZoneContextManager } = require("@opentelemetry/sandbox-context-zone"); +const { B3Propagator } = require("@opentelemetry/sandbox-propagator-b3"); +const { registerInstrumentations } = require("@opentelemetry/sandbox-instrumentation"); +const { OTLPTraceExporter: OTLPTraceExporterProto } = require("@opentelemetry/sandbox-exporter-trace-otlp-proto"); const provider = new WebTracerProvider(); diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetch/index.html b/examples/web/js/examples/fetch/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/fetch/index.html rename to examples/web/js/examples/fetch/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetch/index.js b/examples/web/js/examples/fetch/index.js similarity index 77% rename from auto-merge/js/examples/opentelemetry-web/examples/fetch/index.js rename to examples/web/js/examples/fetch/index.js index f2632b2e4..518721d6d 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/fetch/index.js +++ b/examples/web/js/examples/fetch/index.js @@ -1,11 +1,11 @@ -const { context, trace } = require( '@opentelemetry/api'); -const { ConsoleSpanExporter, SimpleSpanProcessor } = require( '@opentelemetry/sdk-trace-base'); -const { OTLPTraceExporter } = require( '@opentelemetry/exporter-trace-otlp-http'); -const { WebTracerProvider } = require( '@opentelemetry/sdk-trace-web'); -const { FetchInstrumentation } = require( '@opentelemetry/instrumentation-fetch'); -const { ZoneContextManager } = require( '@opentelemetry/context-zone'); -const { B3Propagator } = require( '@opentelemetry/propagator-b3'); -const { registerInstrumentations } = require( '@opentelemetry/instrumentation'); +const { context, trace } = require( '@opentelemetry/sandbox-api'); +const { ConsoleSpanExporter, SimpleSpanProcessor } = require( '@opentelemetry/sandbox-sdk-trace-base'); +const { OTLPTraceExporter } = require( '@opentelemetry/sandbox-exporter-trace-otlp-http'); +const { WebTracerProvider } = require( '@opentelemetry/sandbox-sdk-trace-web'); +const { FetchInstrumentation } = require( '@opentelemetry/sandbox-instrumentation-fetch'); +const { ZoneContextManager } = require( '@opentelemetry/sandbox-context-zone'); +const { B3Propagator } = require( '@opentelemetry/sandbox-propagator-b3'); +const { registerInstrumentations } = require( '@opentelemetry/sandbox-instrumentation'); const provider = new WebTracerProvider(); diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetchXhr/index.html b/examples/web/js/examples/fetchXhr/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/fetchXhr/index.html rename to examples/web/js/examples/fetchXhr/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetchXhr/index.js b/examples/web/js/examples/fetchXhr/index.js similarity index 83% rename from auto-merge/js/examples/opentelemetry-web/examples/fetchXhr/index.js rename to examples/web/js/examples/fetchXhr/index.js index 8e266f78a..70b0a6e20 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/fetchXhr/index.js +++ b/examples/web/js/examples/fetchXhr/index.js @@ -1,11 +1,11 @@ -const { context, trace } = require('@opentelemetry/api'); -const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base'); -const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http'); -const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web'); -const { FetchInstrumentation } = require('@opentelemetry/instrumentation-fetch'); -const { XMLHttpRequestInstrumentation } = require('@opentelemetry/instrumentation-xml-http-request'); -const { ZoneContextManager } = require('@opentelemetry/context-zone'); -const { registerInstrumentations } = require('@opentelemetry/instrumentation'); +const { context, trace } = require('@opentelemetry/sandbox-api'); +const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sandbox-sdk-trace-base'); +const { OTLPTraceExporter } = require('@opentelemetry/sandbox-exporter-trace-otlp-http'); +const { WebTracerProvider } = require('@opentelemetry/sandbox-sdk-trace-web'); +const { FetchInstrumentation } = require('@opentelemetry/sandbox-instrumentation-fetch'); +const { XMLHttpRequestInstrumentation } = require('@opentelemetry/sandbox-instrumentation-xml-http-request'); +const { ZoneContextManager } = require('@opentelemetry/sandbox-context-zone'); +const { registerInstrumentations } = require('@opentelemetry/sandbox-instrumentation'); const provider = new WebTracerProvider(); diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetchXhrB3/index.html b/examples/web/js/examples/fetchXhrB3/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/fetchXhrB3/index.html rename to examples/web/js/examples/fetchXhrB3/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/fetchXhrB3/index.js b/examples/web/js/examples/fetchXhrB3/index.js similarity index 81% rename from auto-merge/js/examples/opentelemetry-web/examples/fetchXhrB3/index.js rename to examples/web/js/examples/fetchXhrB3/index.js index 64afe58d4..f42b20662 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/fetchXhrB3/index.js +++ b/examples/web/js/examples/fetchXhrB3/index.js @@ -1,12 +1,12 @@ -const { context, trace } = require( '@opentelemetry/api'); -const { ConsoleSpanExporter, SimpleSpanProcessor } = require( '@opentelemetry/sdk-trace-base'); -const { OTLPTraceExporter } = require( '@opentelemetry/exporter-trace-otlp-http'); -const { WebTracerProvider } = require( '@opentelemetry/sdk-trace-web'); -const { FetchInstrumentation } = require( '@opentelemetry/instrumentation-fetch'); -const { XMLHttpRequestInstrumentation } = require( '@opentelemetry/instrumentation-xml-http-request'); -const { ZoneContextManager } = require( '@opentelemetry/context-zone'); -const { B3Propagator } = require( '@opentelemetry/propagator-b3'); -const { registerInstrumentations } = require( '@opentelemetry/instrumentation'); +const { context, trace } = require( '@opentelemetry/sandbox-api'); +const { ConsoleSpanExporter, SimpleSpanProcessor } = require( '@opentelemetry/sandbox-sdk-trace-base'); +const { OTLPTraceExporter } = require( '@opentelemetry/sandbox-exporter-trace-otlp-http'); +const { WebTracerProvider } = require( '@opentelemetry/sandbox-sdk-trace-web'); +const { FetchInstrumentation } = require( '@opentelemetry/sandbox-instrumentation-fetch'); +const { XMLHttpRequestInstrumentation } = require( '@opentelemetry/sandbox-instrumentation-xml-http-request'); +const { ZoneContextManager } = require( '@opentelemetry/sandbox-context-zone'); +const { B3Propagator } = require( '@opentelemetry/sandbox-propagator-b3'); +const { registerInstrumentations } = require( '@opentelemetry/sandbox-instrumentation'); const provider = new WebTracerProvider(); diff --git a/auto-merge/js/examples/opentelemetry-web/examples/metrics/index.html b/examples/web/js/examples/metrics/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/metrics/index.html rename to examples/web/js/examples/metrics/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/metrics/index.js b/examples/web/js/examples/metrics/index.js similarity index 90% rename from auto-merge/js/examples/opentelemetry-web/examples/metrics/index.js rename to examples/web/js/examples/metrics/index.js index c3f86cfbe..53c803931 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/metrics/index.js +++ b/examples/web/js/examples/metrics/index.js @@ -1,6 +1,6 @@ -const { DiagConsoleLogger, DiagLogLevel, diag, metrics } = require('@opentelemetry/api'); -const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-http'); -const { MeterProvider, PeriodicExportingMetricReader } = require('@opentelemetry/sdk-metrics'); +const { DiagConsoleLogger, DiagLogLevel, diag, metrics } = require('@opentelemetry/sandbox-api'); +const { OTLPMetricExporter } = require('@opentelemetry/sandbox-exporter-metrics-otlp-http'); +const { MeterProvider, PeriodicExportingMetricReader } = require('@opentelemetry/sandbox-sdk-metrics'); // Optional and only needed to see the internal diagnostic logging (during development) diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG); diff --git a/auto-merge/js/examples/opentelemetry-web/examples/xml-http-request/index.html b/examples/web/js/examples/xml-http-request/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/xml-http-request/index.html rename to examples/web/js/examples/xml-http-request/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/xml-http-request/index.js b/examples/web/js/examples/xml-http-request/index.js similarity index 79% rename from auto-merge/js/examples/opentelemetry-web/examples/xml-http-request/index.js rename to examples/web/js/examples/xml-http-request/index.js index ff2b173bc..0006fda11 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/xml-http-request/index.js +++ b/examples/web/js/examples/xml-http-request/index.js @@ -1,11 +1,11 @@ -const { context, trace } = require('@opentelemetry/api'); -const { ConsoleSpanExporter, SimpleSpanProcessor } = require( '@opentelemetry/sdk-trace-base'); -const { WebTracerProvider } = require( '@opentelemetry/sdk-trace-web'); -const { XMLHttpRequestInstrumentation } = require( '@opentelemetry/instrumentation-xml-http-request'); -const { ZoneContextManager } = require( '@opentelemetry/context-zone'); -const { OTLPTraceExporter } = require( '@opentelemetry/exporter-trace-otlp-http'); -const { B3Propagator } = require( '@opentelemetry/propagator-b3'); -const { registerInstrumentations } = require( '@opentelemetry/instrumentation'); +const { context, trace } = require('@opentelemetry/sandbox-api'); +const { ConsoleSpanExporter, SimpleSpanProcessor } = require( '@opentelemetry/sandbox-sdk-trace-base'); +const { WebTracerProvider } = require( '@opentelemetry/sandbox-sdk-trace-web'); +const { XMLHttpRequestInstrumentation } = require( '@opentelemetry/sandbox-instrumentation-xml-http-request'); +const { ZoneContextManager } = require( '@opentelemetry/sandbox-context-zone'); +const { OTLPTraceExporter } = require( '@opentelemetry/sandbox-exporter-trace-otlp-http'); +const { B3Propagator } = require( '@opentelemetry/sandbox-propagator-b3'); +const { registerInstrumentations } = require( '@opentelemetry/sandbox-instrumentation'); const providerWithZone = new WebTracerProvider(); diff --git a/auto-merge/js/examples/opentelemetry-web/examples/zipkin/index.html b/examples/web/js/examples/zipkin/index.html similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/examples/zipkin/index.html rename to examples/web/js/examples/zipkin/index.html diff --git a/auto-merge/js/examples/opentelemetry-web/examples/zipkin/index.js b/examples/web/js/examples/zipkin/index.js similarity index 79% rename from auto-merge/js/examples/opentelemetry-web/examples/zipkin/index.js rename to examples/web/js/examples/zipkin/index.js index aa01c595c..60b4d4e41 100644 --- a/auto-merge/js/examples/opentelemetry-web/examples/zipkin/index.js +++ b/examples/web/js/examples/zipkin/index.js @@ -1,6 +1,6 @@ -const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base'); -const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web'); -const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin'); +const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sandbox-sdk-trace-base'); +const { WebTracerProvider } = require('@opentelemetry/sandbox-sdk-trace-web'); +const { ZipkinExporter } = require('@opentelemetry/sandbox-exporter-zipkin'); const provider = new WebTracerProvider(); provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); diff --git a/auto-merge/js/examples/opentelemetry-web/images/xml-http-request.png b/examples/web/js/images/xml-http-request.png similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/images/xml-http-request.png rename to examples/web/js/images/xml-http-request.png diff --git a/examples/web/js/package.json b/examples/web/js/package.json new file mode 100644 index 000000000..3fc8bcb39 --- /dev/null +++ b/examples/web/js/package.json @@ -0,0 +1,111 @@ +{ + "name": "web-opentelemetry-example", + "private": true, + "version": "0.41.2", + "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", + "main": "index.js", + "scripts": { + "build": "", + "clean": "", + "compile": "", + "docker:start": "cd ./docker && docker-compose down && docker-compose up", + "docker:startd": "cd ./docker && docker-compose down && docker-compose up -d", + "docker:stop": "cd ./docker && docker-compose down", + "lint": "", + "lint:fix": "", + "lint:fix-quiet": "", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "rebuild": "npm run clean && npm run build", + "start": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --compress", + "start-nc": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --no-compress", + "start-prod": "webpack serve --progress --color --port 8090 --config webpack.prod.config.js --hot --host 0.0.0.0 --compress", + "start-prodnc": "webpack serve --progress --color --port 8090 --config webpack.prod.config.js --hot --host 0.0.0.0 --no-compress", + "test": "", + "test:browser": "", + "test:debug": "", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "", + "watch": "npm run version && tsc --build --watch " + }, + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/open-telemetry/opentelemetry-js.git" + }, + "keywords": [ + "opentelemetry", + "tracing", + "metrics", + "web" + ], + "engines": { + "node": ">=14" + }, + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js/issues" + }, + "devDependencies": { + "@babel/core": "^7.6.0", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "^8.0.6", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "^4.10.0", + "webpack-dev-server": "^4.5.0", + "webpack-merge": "^5.8.0" + }, + "dependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-context-zone": "1.15.2", + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-exporter-metrics-otlp-http": "0.41.2", + "@opentelemetry/sandbox-exporter-trace-otlp-http": "0.41.2", + "@opentelemetry/sandbox-exporter-trace-otlp-proto": "0.41.2", + "@opentelemetry/sandbox-exporter-zipkin": "1.15.2", + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-instrumentation-fetch": "0.41.2", + "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.41.2", + "@opentelemetry/sandbox-propagator-b3": "1.15.2", + "@opentelemetry/sandbox-sdk-metrics": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-web": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" +} \ No newline at end of file diff --git a/examples/web/js/rollup.config.js b/examples/web/js/rollup.config.js new file mode 100644 index 000000000..4b9b0a1b7 --- /dev/null +++ b/examples/web/js/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/src/index.js"; + +export default createConfig("opentelemetry.sandbox.js.examples", inputName, "otel-sndbx.js-examples", version); diff --git a/auto-merge/js/examples/opentelemetry-web/webpack.dev.config.js b/examples/web/js/webpack.dev.config.js similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/webpack.dev.config.js rename to examples/web/js/webpack.dev.config.js diff --git a/auto-merge/js/examples/opentelemetry-web/webpack.prod.config.js b/examples/web/js/webpack.prod.config.js similarity index 100% rename from auto-merge/js/examples/opentelemetry-web/webpack.prod.config.js rename to examples/web/js/webpack.prod.config.js diff --git a/auto-merge/js/karma.base.js b/karma.base.js similarity index 100% rename from auto-merge/js/karma.base.js rename to karma.base.js diff --git a/karma.debug.js b/karma.debug.js new file mode 100644 index 000000000..7494600e7 --- /dev/null +++ b/karma.debug.js @@ -0,0 +1,57 @@ +/*! + * 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 + * + * 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. +*/ + +const baseConfig = require("./karma.base"); + +// Copied from karma/lib/constants.js (https://github.com/karma-runner/karma/blob/master/lib/constants.js) +const LOG_DEBUG = "DEBUG"; +const LOG_INFO = "INFO"; +const LOG_WARN = "WARN"; +const LOG_ERROR = "ERROR"; +const LOG_DISABLE = "OFF"; + +process.env.CHROME_BIN = require("puppeteer").executablePath(); + +// Default to using edge locally -- choose your own browser as required +// process.env.CHROME_BIN = "C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"; + +module.exports = { + ...baseConfig, + browsers: ["Chromium_without_security"], + karmaTypescriptConfig: { + tsconfig: "./tsconfig.test.json", + compilerOptions: { + sourceMap: true + }, + bundlerOptions: { + sourceMap: true + }, + coverageOptions: { + instrumentation: false, + sourceMap: true + } + }, + + reporters: [ "spec" ], + + customLaunchers: { + Chromium_without_security: { + base: "Chrome", + flags: ["--disable-web-security", "--disable-site-isolation-trials"] + } + }, + logLevel: LOG_DEBUG +}; diff --git a/auto-merge/js/karma.webpack.js b/karma.webpack.js similarity index 100% rename from auto-merge/js/karma.webpack.js rename to karma.webpack.js diff --git a/auto-merge/js/karma.worker.js b/karma.worker.js similarity index 100% rename from auto-merge/js/karma.worker.js rename to karma.worker.js diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/.eslintignore b/pkgs/api-events/.eslintignore similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/.eslintignore rename to pkgs/api-events/.eslintignore diff --git a/auto-merge/js/experimental/packages/api-events/.eslintrc.js b/pkgs/api-events/.eslintrc.js similarity index 74% rename from auto-merge/js/experimental/packages/api-events/.eslintrc.js rename to pkgs/api-events/.eslintrc.js index 5cb19b029..f99cd2a53 100644 --- a/auto-merge/js/experimental/packages/api-events/.eslintrc.js +++ b/pkgs/api-events/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.base.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/api/LICENSE b/pkgs/api-events/LICENSE similarity index 100% rename from auto-merge/js/api/LICENSE rename to pkgs/api-events/LICENSE diff --git a/auto-merge/js/experimental/packages/api-events/README.md b/pkgs/api-events/README.md similarity index 98% rename from auto-merge/js/experimental/packages/api-events/README.md rename to pkgs/api-events/README.md index 3aff88eff..21dd58869 100644 --- a/auto-merge/js/experimental/packages/api-events/README.md +++ b/pkgs/api-events/README.md @@ -26,7 +26,7 @@ If you are writing an instrumentation library, or prefer to call the API methods - [Events API Documentation][events-api-docs] ```javascript -const api = require("@opentelemetry/api-events"); +const api = require("@opentelemetry/sandbox-api-events"); /* A specific implementation of EventEmitterProvider comes from an SDK */ const eventEmitterProvider = createEventEmitterProvider(); diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/karma.conf.js b/pkgs/api-events/karma.conf.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/karma.conf.js rename to pkgs/api-events/karma.conf.js diff --git a/pkgs/api-events/karma.debug.conf.js b/pkgs/api-events/karma.debug.conf.js new file mode 100644 index 000000000..e2d096d8e --- /dev/null +++ b/pkgs/api-events/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/api-events/package.json b/pkgs/api-events/package.json new file mode 100644 index 000000000..72fd6174b --- /dev/null +++ b/pkgs/api-events/package.json @@ -0,0 +1,115 @@ +{ + "name": "@opentelemetry/sandbox-api-events", + "version": "0.41.2", + "description": "Public events API for OpenTelemetry", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "browser", + "profiling", + "events", + "stats", + "monitoring" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "devDependencies": { + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-events", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/api-events/rollup.config.js b/pkgs/api-events/rollup.config.js new file mode 100644 index 000000000..78e7ddad8 --- /dev/null +++ b/pkgs/api-events/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.api-events", inputName, "otel-sndbx.api-events", version); diff --git a/auto-merge/js/experimental/packages/api-events/src/NoopEventEmitter.ts b/pkgs/api-events/src/NoopEventEmitter.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/NoopEventEmitter.ts rename to pkgs/api-events/src/NoopEventEmitter.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/NoopEventEmitterProvider.ts b/pkgs/api-events/src/NoopEventEmitterProvider.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/NoopEventEmitterProvider.ts rename to pkgs/api-events/src/NoopEventEmitterProvider.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/api/events.ts b/pkgs/api-events/src/api/events.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/api/events.ts rename to pkgs/api-events/src/api/events.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/index.ts b/pkgs/api-events/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/index.ts rename to pkgs/api-events/src/index.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/internal/global-utils.ts b/pkgs/api-events/src/internal/global-utils.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/internal/global-utils.ts rename to pkgs/api-events/src/internal/global-utils.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/platform/browser/globalThis.ts b/pkgs/api-events/src/platform/browser/globalThis.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/platform/browser/globalThis.ts rename to pkgs/api-events/src/platform/browser/globalThis.ts diff --git a/auto-merge/js/api/src/platform/browser/index.ts b/pkgs/api-events/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/api/src/platform/browser/index.ts rename to pkgs/api-events/src/platform/browser/index.ts diff --git a/auto-merge/js/api/src/platform/index.ts b/pkgs/api-events/src/platform/index.ts similarity index 100% rename from auto-merge/js/api/src/platform/index.ts rename to pkgs/api-events/src/platform/index.ts diff --git a/auto-merge/js/api/src/platform/node/globalThis.ts b/pkgs/api-events/src/platform/node/globalThis.ts similarity index 100% rename from auto-merge/js/api/src/platform/node/globalThis.ts rename to pkgs/api-events/src/platform/node/globalThis.ts diff --git a/auto-merge/js/api/src/platform/node/index.ts b/pkgs/api-events/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/api/src/platform/node/index.ts rename to pkgs/api-events/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/types/Event.ts b/pkgs/api-events/src/types/Event.ts similarity index 95% rename from auto-merge/js/experimental/packages/api-events/src/types/Event.ts rename to pkgs/api-events/src/types/Event.ts index 03e4ef89d..6ec1e2915 100644 --- a/auto-merge/js/experimental/packages/api-events/src/types/Event.ts +++ b/pkgs/api-events/src/types/Event.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Attributes } from '@opentelemetry/api'; +import { Attributes } from '@opentelemetry/sandbox-api'; export interface Event { /** diff --git a/auto-merge/js/experimental/packages/api-events/src/types/EventEmitter.ts b/pkgs/api-events/src/types/EventEmitter.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/types/EventEmitter.ts rename to pkgs/api-events/src/types/EventEmitter.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/types/EventEmitterOptions.ts b/pkgs/api-events/src/types/EventEmitterOptions.ts similarity index 93% rename from auto-merge/js/experimental/packages/api-events/src/types/EventEmitterOptions.ts rename to pkgs/api-events/src/types/EventEmitterOptions.ts index f5b983884..9144c9d17 100644 --- a/auto-merge/js/experimental/packages/api-events/src/types/EventEmitterOptions.ts +++ b/pkgs/api-events/src/types/EventEmitterOptions.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Attributes } from '@opentelemetry/api'; +import { Attributes } from '@opentelemetry/sandbox-api'; export interface EventEmitterOptions { /** diff --git a/auto-merge/js/experimental/packages/api-events/src/types/EventEmitterProvider.ts b/pkgs/api-events/src/types/EventEmitterProvider.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/types/EventEmitterProvider.ts rename to pkgs/api-events/src/types/EventEmitterProvider.ts diff --git a/auto-merge/js/experimental/packages/api-events/test/api/api.test.ts b/pkgs/api-events/test/api/api.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/test/api/api.test.ts rename to pkgs/api-events/test/api/api.test.ts diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/test/index-webpack.ts b/pkgs/api-events/test/index-webpack.ts similarity index 100% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/test/index-webpack.ts rename to pkgs/api-events/test/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/api-events/test/internal/global.test.ts b/pkgs/api-events/test/internal/global.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/test/internal/global.test.ts rename to pkgs/api-events/test/internal/global.test.ts diff --git a/auto-merge/js/experimental/packages/api-events/test/noop-implementations/noop-event-emitter-provider.test.ts b/pkgs/api-events/test/noop-implementations/noop-event-emitter-provider.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/test/noop-implementations/noop-event-emitter-provider.test.ts rename to pkgs/api-events/test/noop-implementations/noop-event-emitter-provider.test.ts diff --git a/auto-merge/js/experimental/packages/api-events/test/noop-implementations/noop-event-emitter.test.ts b/pkgs/api-events/test/noop-implementations/noop-event-emitter.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/test/noop-implementations/noop-event-emitter.test.ts rename to pkgs/api-events/test/noop-implementations/noop-event-emitter.test.ts diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.esm.json b/pkgs/api-events/tsconfig.esm.json similarity index 89% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.esm.json rename to pkgs/api-events/tsconfig.esm.json index c43ba03ff..6f96cbec1 100644 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.esm.json +++ b/pkgs/api-events/tsconfig.esm.json @@ -7,6 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [] -} + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json b/pkgs/api-events/tsconfig.esnext.json similarity index 89% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json rename to pkgs/api-events/tsconfig.esnext.json index 6eaaaf7d0..2525ac36a 100644 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json +++ b/pkgs/api-events/tsconfig.esnext.json @@ -7,6 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [] -} + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.json b/pkgs/api-events/tsconfig.json similarity index 87% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.json rename to pkgs/api-events/tsconfig.json index d6e4e25ca..cb48d4258 100644 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/tsconfig.json +++ b/pkgs/api-events/tsconfig.json @@ -8,6 +8,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [] -} + ] +} \ No newline at end of file diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/.eslintignore b/pkgs/api-logs/.eslintignore similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/.eslintignore rename to pkgs/api-logs/.eslintignore diff --git a/auto-merge/js/experimental/packages/api-logs/.eslintrc.js b/pkgs/api-logs/.eslintrc.js similarity index 74% rename from auto-merge/js/experimental/packages/api-logs/.eslintrc.js rename to pkgs/api-logs/.eslintrc.js index 5cb19b029..f99cd2a53 100644 --- a/auto-merge/js/experimental/packages/api-logs/.eslintrc.js +++ b/pkgs/api-logs/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.base.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/api-events/LICENSE b/pkgs/api-logs/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/api-events/LICENSE rename to pkgs/api-logs/LICENSE diff --git a/auto-merge/js/experimental/packages/api-logs/README.md b/pkgs/api-logs/README.md similarity index 98% rename from auto-merge/js/experimental/packages/api-logs/README.md rename to pkgs/api-logs/README.md index a4e3459f0..6d5f03d85 100644 --- a/auto-merge/js/experimental/packages/api-logs/README.md +++ b/pkgs/api-logs/README.md @@ -32,7 +32,7 @@ If you are writing an instrumentation library, or prefer to call the API methods - [Logs API Documentation][logs-api-docs] ```javascript -const api = require("@opentelemetry/api-logs"); +const api = require("@opentelemetry/sandbox-api-logs"); /* A specific implementation of LoggerProvider comes from an SDK */ const loggerProvider = createLoggerProvider(); diff --git a/auto-merge/js/packages/opentelemetry-resources/karma.conf.js b/pkgs/api-logs/karma.conf.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/karma.conf.js rename to pkgs/api-logs/karma.conf.js diff --git a/pkgs/api-logs/karma.debug.conf.js b/pkgs/api-logs/karma.debug.conf.js new file mode 100644 index 000000000..e2d096d8e --- /dev/null +++ b/pkgs/api-logs/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/api-logs/package.json b/pkgs/api-logs/package.json new file mode 100644 index 000000000..abc47e4ba --- /dev/null +++ b/pkgs/api-logs/package.json @@ -0,0 +1,115 @@ +{ + "name": "@opentelemetry/sandbox-api-logs", + "version": "0.41.2", + "description": "Public logs API for OpenTelemetry", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "browser", + "profiling", + "logs", + "stats", + "monitoring" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "devDependencies": { + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-logs", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/api-logs/rollup.config.js b/pkgs/api-logs/rollup.config.js new file mode 100644 index 000000000..0f8b372be --- /dev/null +++ b/pkgs/api-logs/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.api-logs", inputName, "otel-sndbx.api-logs", version); diff --git a/auto-merge/js/experimental/packages/api-logs/src/NoopLogger.ts b/pkgs/api-logs/src/NoopLogger.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/NoopLogger.ts rename to pkgs/api-logs/src/NoopLogger.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/NoopLoggerProvider.ts b/pkgs/api-logs/src/NoopLoggerProvider.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/NoopLoggerProvider.ts rename to pkgs/api-logs/src/NoopLoggerProvider.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/api/logs.ts b/pkgs/api-logs/src/api/logs.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/api/logs.ts rename to pkgs/api-logs/src/api/logs.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/index.ts b/pkgs/api-logs/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/index.ts rename to pkgs/api-logs/src/index.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/internal/global-utils.ts b/pkgs/api-logs/src/internal/global-utils.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/internal/global-utils.ts rename to pkgs/api-logs/src/internal/global-utils.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/platform/browser/globalThis.ts b/pkgs/api-logs/src/platform/browser/globalThis.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/platform/browser/globalThis.ts rename to pkgs/api-logs/src/platform/browser/globalThis.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/platform/browser/index.ts b/pkgs/api-logs/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/platform/browser/index.ts rename to pkgs/api-logs/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/platform/index.ts b/pkgs/api-logs/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/platform/index.ts rename to pkgs/api-logs/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/platform/node/globalThis.ts b/pkgs/api-logs/src/platform/node/globalThis.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/platform/node/globalThis.ts rename to pkgs/api-logs/src/platform/node/globalThis.ts diff --git a/auto-merge/js/experimental/packages/api-events/src/platform/node/index.ts b/pkgs/api-logs/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/src/platform/node/index.ts rename to pkgs/api-logs/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/types/LogRecord.ts b/pkgs/api-logs/src/types/LogRecord.ts similarity index 96% rename from auto-merge/js/experimental/packages/api-logs/src/types/LogRecord.ts rename to pkgs/api-logs/src/types/LogRecord.ts index 59718aa30..0947cd0d2 100644 --- a/auto-merge/js/experimental/packages/api-logs/src/types/LogRecord.ts +++ b/pkgs/api-logs/src/types/LogRecord.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { AttributeValue, Context } from '@opentelemetry/api'; +import { AttributeValue, Context } from '@opentelemetry/sandbox-api'; export type LogAttributeValue = AttributeValue | LogAttributes; export interface LogAttributes { diff --git a/auto-merge/js/experimental/packages/api-logs/src/types/Logger.ts b/pkgs/api-logs/src/types/Logger.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/types/Logger.ts rename to pkgs/api-logs/src/types/Logger.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/types/LoggerOptions.ts b/pkgs/api-logs/src/types/LoggerOptions.ts similarity index 94% rename from auto-merge/js/experimental/packages/api-logs/src/types/LoggerOptions.ts rename to pkgs/api-logs/src/types/LoggerOptions.ts index fdcedcb46..43706bc24 100644 --- a/auto-merge/js/experimental/packages/api-logs/src/types/LoggerOptions.ts +++ b/pkgs/api-logs/src/types/LoggerOptions.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Attributes } from '@opentelemetry/api'; +import { Attributes } from '@opentelemetry/sandbox-api'; export interface LoggerOptions { /** * The schemaUrl of the tracer or instrumentation library diff --git a/auto-merge/js/experimental/packages/api-logs/src/types/LoggerProvider.ts b/pkgs/api-logs/src/types/LoggerProvider.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/types/LoggerProvider.ts rename to pkgs/api-logs/src/types/LoggerProvider.ts diff --git a/auto-merge/js/experimental/packages/api-logs/test/api/api.test.ts b/pkgs/api-logs/test/api/api.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/test/api/api.test.ts rename to pkgs/api-logs/test/api/api.test.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/test/index-webpack.ts b/pkgs/api-logs/test/index-webpack.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/test/index-webpack.ts rename to pkgs/api-logs/test/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/api-logs/test/internal/global.test.ts b/pkgs/api-logs/test/internal/global.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/test/internal/global.test.ts rename to pkgs/api-logs/test/internal/global.test.ts diff --git a/auto-merge/js/experimental/packages/api-logs/test/noop-implementations/noop-logger-provider.test.ts b/pkgs/api-logs/test/noop-implementations/noop-logger-provider.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/test/noop-implementations/noop-logger-provider.test.ts rename to pkgs/api-logs/test/noop-implementations/noop-logger-provider.test.ts diff --git a/auto-merge/js/experimental/packages/api-logs/test/noop-implementations/noop-logger.test.ts b/pkgs/api-logs/test/noop-implementations/noop-logger.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/test/noop-implementations/noop-logger.test.ts rename to pkgs/api-logs/test/noop-implementations/noop-logger.test.ts diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esm.json b/pkgs/api-logs/tsconfig.esm.json similarity index 88% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esm.json rename to pkgs/api-logs/tsconfig.esm.json index 356b6d030..6f96cbec1 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esm.json +++ b/pkgs/api-logs/tsconfig.esm.json @@ -1,12 +1,11 @@ { "extends": "../../tsconfig.base.esm.json", "compilerOptions": { - "rootDir": "src", "outDir": "build/esm", - "skipLibCheck": true, + "rootDir": "src", "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, "include": [ "src/**/*.ts" ] -} +} \ No newline at end of file diff --git a/auto-merge/js/api/tsconfig.esnext.json b/pkgs/api-logs/tsconfig.esnext.json similarity index 71% rename from auto-merge/js/api/tsconfig.esnext.json rename to pkgs/api-logs/tsconfig.esnext.json index 54d1d053d..2525ac36a 100644 --- a/auto-merge/js/api/tsconfig.esnext.json +++ b/pkgs/api-logs/tsconfig.esnext.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.base.esnext.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "outDir": "build/esnext", "rootDir": "src", @@ -7,6 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [] -} + ] +} \ No newline at end of file diff --git a/auto-merge/js/api/tsconfig.json b/pkgs/api-logs/tsconfig.json similarity index 68% rename from auto-merge/js/api/tsconfig.json rename to pkgs/api-logs/tsconfig.json index 9622af53c..cb48d4258 100644 --- a/auto-merge/js/api/tsconfig.json +++ b/pkgs/api-logs/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "outDir": "build", "rootDir": "." @@ -8,6 +8,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [] -} + ] +} \ No newline at end of file diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintignore b/pkgs/api/.eslintignore similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintignore rename to pkgs/api/.eslintignore diff --git a/auto-merge/js/api/.eslintrc.js b/pkgs/api/.eslintrc.js similarity index 76% rename from auto-merge/js/api/.eslintrc.js rename to pkgs/api/.eslintrc.js index 08f88d491..f91d07d4f 100644 --- a/auto-merge/js/api/.eslintrc.js +++ b/pkgs/api/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../eslint.base.js') + ...require('../../eslint.base.js') } diff --git a/auto-merge/js/api/CHANGELOG.md b/pkgs/api/CHANGELOG.md similarity index 100% rename from auto-merge/js/api/CHANGELOG.md rename to pkgs/api/CHANGELOG.md diff --git a/auto-merge/js/experimental/packages/api-logs/LICENSE b/pkgs/api/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/LICENSE rename to pkgs/api/LICENSE diff --git a/auto-merge/js/api/README.md b/pkgs/api/README.md similarity index 98% rename from auto-merge/js/api/README.md rename to pkgs/api/README.md index 56dd23d17..3c74aee7e 100644 --- a/auto-merge/js/api/README.md +++ b/pkgs/api/README.md @@ -41,8 +41,8 @@ In order to get started with tracing, you will need to first register an SDK. Th Once you have registered an SDK, you can start and end spans. A simple example of basic SDK registration and tracing a simple operation is below. The example should export spans to the console once per second. For more information, see the [tracing documentation][docs-tracing]. ```javascript -const { trace } = require("@opentelemetry/api"); -const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require("@opentelemetry/sdk-trace-base"); +const { trace } = require("@opentelemetry/sandbox-api"); +const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require("@opentelemetry/sandbox-sdk-trace-base"); // Create and register an SDK const provider = new BasicTracerProvider(); diff --git a/auto-merge/js/packages/opentelemetry-core/karma.conf.js b/pkgs/api/karma.conf.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/karma.conf.js rename to pkgs/api/karma.conf.js diff --git a/pkgs/api/karma.debug.conf.js b/pkgs/api/karma.debug.conf.js new file mode 100644 index 000000000..e2d096d8e --- /dev/null +++ b/pkgs/api/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/karma.worker.js b/pkgs/api/karma.worker.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/karma.worker.js rename to pkgs/api/karma.worker.js diff --git a/auto-merge/js/api/package.json b/pkgs/api/package.json similarity index 50% rename from auto-merge/js/api/package.json rename to pkgs/api/package.json index d2e4572f5..fbc27e925 100644 --- a/auto-merge/js/api/package.json +++ b/pkgs/api/package.json @@ -1,5 +1,5 @@ { - "name": "@opentelemetry/api", + "name": "@opentelemetry/sandbox-api", "version": "1.4.1", "description": "Public API for OpenTelemetry", "main": "build/src/index.js", @@ -12,26 +12,30 @@ }, "repository": "open-telemetry/opentelemetry-js", "scripts": { + "build": "npm run compile && npm run package", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../", "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "cycle-check": "dpdm --exit-code circular:1 src/index.ts", "docs": "typedoc", "docs:deploy": "gh-pages --dist docs/out", "docs:test": "linkinator docs/out --silent && linkinator docs/*.md *.md --markdown --silent", - "lint:fix": "eslint . --ext .ts --fix", "lint": "eslint . --ext .ts", - "test:browser": "karma start --single-run", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../scripts/peer-api-check.js", + "rebuild": "npm run clean && npm run build", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", "test:eol": "ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "test:webworker": "karma start karma.worker.js --single-run", - "cycle-check": "dpdm --exit-code circular:1 src/index.ts", - "version": "node ../scripts/version-update.js", - "prewatch": "npm run precompile", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "peer-api-check": "node ../scripts/peer-api-check.js" + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" }, "keywords": [ "opentelemetry", @@ -61,33 +65,52 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", "@types/webpack": "4.41.33", "@types/webpack-env": "1.16.3", - "codecov": "3.8.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", "cross-var": "1.1.0", "dpdm": "3.13.1", - "babel-plugin-istanbul": "6.1.1", - "karma": "6.4.2", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", "karma-mocha-webworker": "1.3.0", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", "memfs": "3.5.3", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", "unionfs": "4.5.1", - "webpack": "4.46.0" + "webpack": "^4.46.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api", "sideEffects": false -} +} \ No newline at end of file diff --git a/pkgs/api/rollup.config.js b/pkgs/api/rollup.config.js new file mode 100644 index 000000000..fb492c728 --- /dev/null +++ b/pkgs/api/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.api", inputName, "otel-sndbx.api", version); diff --git a/auto-merge/js/api/src/api/context.ts b/pkgs/api/src/api/context.ts similarity index 100% rename from auto-merge/js/api/src/api/context.ts rename to pkgs/api/src/api/context.ts diff --git a/auto-merge/js/api/src/api/diag.ts b/pkgs/api/src/api/diag.ts similarity index 100% rename from auto-merge/js/api/src/api/diag.ts rename to pkgs/api/src/api/diag.ts diff --git a/auto-merge/js/api/src/api/metrics.ts b/pkgs/api/src/api/metrics.ts similarity index 100% rename from auto-merge/js/api/src/api/metrics.ts rename to pkgs/api/src/api/metrics.ts diff --git a/auto-merge/js/api/src/api/propagation.ts b/pkgs/api/src/api/propagation.ts similarity index 100% rename from auto-merge/js/api/src/api/propagation.ts rename to pkgs/api/src/api/propagation.ts diff --git a/auto-merge/js/api/src/api/trace.ts b/pkgs/api/src/api/trace.ts similarity index 100% rename from auto-merge/js/api/src/api/trace.ts rename to pkgs/api/src/api/trace.ts diff --git a/auto-merge/js/api/src/baggage/context-helpers.ts b/pkgs/api/src/baggage/context-helpers.ts similarity index 100% rename from auto-merge/js/api/src/baggage/context-helpers.ts rename to pkgs/api/src/baggage/context-helpers.ts diff --git a/auto-merge/js/api/src/baggage/internal/baggage-impl.ts b/pkgs/api/src/baggage/internal/baggage-impl.ts similarity index 100% rename from auto-merge/js/api/src/baggage/internal/baggage-impl.ts rename to pkgs/api/src/baggage/internal/baggage-impl.ts diff --git a/auto-merge/js/api/src/baggage/internal/symbol.ts b/pkgs/api/src/baggage/internal/symbol.ts similarity index 100% rename from auto-merge/js/api/src/baggage/internal/symbol.ts rename to pkgs/api/src/baggage/internal/symbol.ts diff --git a/auto-merge/js/api/src/baggage/types.ts b/pkgs/api/src/baggage/types.ts similarity index 100% rename from auto-merge/js/api/src/baggage/types.ts rename to pkgs/api/src/baggage/types.ts diff --git a/auto-merge/js/api/src/baggage/utils.ts b/pkgs/api/src/baggage/utils.ts similarity index 100% rename from auto-merge/js/api/src/baggage/utils.ts rename to pkgs/api/src/baggage/utils.ts diff --git a/auto-merge/js/api/src/common/Attributes.ts b/pkgs/api/src/common/Attributes.ts similarity index 100% rename from auto-merge/js/api/src/common/Attributes.ts rename to pkgs/api/src/common/Attributes.ts diff --git a/auto-merge/js/api/src/common/Exception.ts b/pkgs/api/src/common/Exception.ts similarity index 100% rename from auto-merge/js/api/src/common/Exception.ts rename to pkgs/api/src/common/Exception.ts diff --git a/auto-merge/js/api/src/common/Time.ts b/pkgs/api/src/common/Time.ts similarity index 100% rename from auto-merge/js/api/src/common/Time.ts rename to pkgs/api/src/common/Time.ts diff --git a/auto-merge/js/api/src/context-api.ts b/pkgs/api/src/context-api.ts similarity index 100% rename from auto-merge/js/api/src/context-api.ts rename to pkgs/api/src/context-api.ts diff --git a/auto-merge/js/api/src/context/NoopContextManager.ts b/pkgs/api/src/context/NoopContextManager.ts similarity index 100% rename from auto-merge/js/api/src/context/NoopContextManager.ts rename to pkgs/api/src/context/NoopContextManager.ts diff --git a/auto-merge/js/api/src/context/context.ts b/pkgs/api/src/context/context.ts similarity index 100% rename from auto-merge/js/api/src/context/context.ts rename to pkgs/api/src/context/context.ts diff --git a/auto-merge/js/api/src/context/types.ts b/pkgs/api/src/context/types.ts similarity index 100% rename from auto-merge/js/api/src/context/types.ts rename to pkgs/api/src/context/types.ts diff --git a/auto-merge/js/api/src/diag-api.ts b/pkgs/api/src/diag-api.ts similarity index 100% rename from auto-merge/js/api/src/diag-api.ts rename to pkgs/api/src/diag-api.ts diff --git a/auto-merge/js/api/src/diag/ComponentLogger.ts b/pkgs/api/src/diag/ComponentLogger.ts similarity index 97% rename from auto-merge/js/api/src/diag/ComponentLogger.ts rename to pkgs/api/src/diag/ComponentLogger.ts index 225350186..b636ab584 100644 --- a/auto-merge/js/api/src/diag/ComponentLogger.ts +++ b/pkgs/api/src/diag/ComponentLogger.ts @@ -22,7 +22,7 @@ import { ComponentLoggerOptions, DiagLogger, DiagLogFunction } from './types'; * will add automatically additional namespace in front of the log message. * It will then forward all message to global diag logger * @example - * const cLogger = diag.createComponentLogger({ namespace: '@opentelemetry/instrumentation-http' }); + * const cLogger = diag.createComponentLogger({ namespace: '@opentelemetry/sandbox-instrumentation-http' }); * cLogger.debug('test'); * // @opentelemetry/instrumentation-http test */ diff --git a/auto-merge/js/api/src/diag/consoleLogger.ts b/pkgs/api/src/diag/consoleLogger.ts similarity index 100% rename from auto-merge/js/api/src/diag/consoleLogger.ts rename to pkgs/api/src/diag/consoleLogger.ts diff --git a/auto-merge/js/api/src/diag/internal/logLevelLogger.ts b/pkgs/api/src/diag/internal/logLevelLogger.ts similarity index 100% rename from auto-merge/js/api/src/diag/internal/logLevelLogger.ts rename to pkgs/api/src/diag/internal/logLevelLogger.ts diff --git a/auto-merge/js/api/src/diag/internal/noopLogger.ts b/pkgs/api/src/diag/internal/noopLogger.ts similarity index 100% rename from auto-merge/js/api/src/diag/internal/noopLogger.ts rename to pkgs/api/src/diag/internal/noopLogger.ts diff --git a/auto-merge/js/api/src/diag/types.ts b/pkgs/api/src/diag/types.ts similarity index 100% rename from auto-merge/js/api/src/diag/types.ts rename to pkgs/api/src/diag/types.ts diff --git a/auto-merge/js/api/src/index.ts b/pkgs/api/src/index.ts similarity index 100% rename from auto-merge/js/api/src/index.ts rename to pkgs/api/src/index.ts diff --git a/auto-merge/js/api/src/internal/global-utils.ts b/pkgs/api/src/internal/global-utils.ts similarity index 100% rename from auto-merge/js/api/src/internal/global-utils.ts rename to pkgs/api/src/internal/global-utils.ts diff --git a/auto-merge/js/api/src/internal/semver.ts b/pkgs/api/src/internal/semver.ts similarity index 100% rename from auto-merge/js/api/src/internal/semver.ts rename to pkgs/api/src/internal/semver.ts diff --git a/auto-merge/js/api/src/metrics-api.ts b/pkgs/api/src/metrics-api.ts similarity index 100% rename from auto-merge/js/api/src/metrics-api.ts rename to pkgs/api/src/metrics-api.ts diff --git a/auto-merge/js/api/src/metrics/Meter.ts b/pkgs/api/src/metrics/Meter.ts similarity index 100% rename from auto-merge/js/api/src/metrics/Meter.ts rename to pkgs/api/src/metrics/Meter.ts diff --git a/auto-merge/js/api/src/metrics/MeterProvider.ts b/pkgs/api/src/metrics/MeterProvider.ts similarity index 100% rename from auto-merge/js/api/src/metrics/MeterProvider.ts rename to pkgs/api/src/metrics/MeterProvider.ts diff --git a/auto-merge/js/api/src/metrics/Metric.ts b/pkgs/api/src/metrics/Metric.ts similarity index 100% rename from auto-merge/js/api/src/metrics/Metric.ts rename to pkgs/api/src/metrics/Metric.ts diff --git a/auto-merge/js/api/src/metrics/NoopMeter.ts b/pkgs/api/src/metrics/NoopMeter.ts similarity index 100% rename from auto-merge/js/api/src/metrics/NoopMeter.ts rename to pkgs/api/src/metrics/NoopMeter.ts diff --git a/auto-merge/js/api/src/metrics/NoopMeterProvider.ts b/pkgs/api/src/metrics/NoopMeterProvider.ts similarity index 100% rename from auto-merge/js/api/src/metrics/NoopMeterProvider.ts rename to pkgs/api/src/metrics/NoopMeterProvider.ts diff --git a/auto-merge/js/api/src/metrics/ObservableResult.ts b/pkgs/api/src/metrics/ObservableResult.ts similarity index 100% rename from auto-merge/js/api/src/metrics/ObservableResult.ts rename to pkgs/api/src/metrics/ObservableResult.ts diff --git a/auto-merge/js/api/src/platform/browser/globalThis.ts b/pkgs/api/src/platform/browser/globalThis.ts similarity index 100% rename from auto-merge/js/api/src/platform/browser/globalThis.ts rename to pkgs/api/src/platform/browser/globalThis.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/platform/browser/index.ts b/pkgs/api/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/platform/browser/index.ts rename to pkgs/api/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/platform/index.ts b/pkgs/api/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/platform/index.ts rename to pkgs/api/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/platform/node/globalThis.ts b/pkgs/api/src/platform/node/globalThis.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/platform/node/globalThis.ts rename to pkgs/api/src/platform/node/globalThis.ts diff --git a/auto-merge/js/experimental/packages/api-logs/src/platform/node/index.ts b/pkgs/api/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/src/platform/node/index.ts rename to pkgs/api/src/platform/node/index.ts diff --git a/auto-merge/js/api/src/propagation-api.ts b/pkgs/api/src/propagation-api.ts similarity index 100% rename from auto-merge/js/api/src/propagation-api.ts rename to pkgs/api/src/propagation-api.ts diff --git a/auto-merge/js/api/src/propagation/NoopTextMapPropagator.ts b/pkgs/api/src/propagation/NoopTextMapPropagator.ts similarity index 100% rename from auto-merge/js/api/src/propagation/NoopTextMapPropagator.ts rename to pkgs/api/src/propagation/NoopTextMapPropagator.ts diff --git a/auto-merge/js/api/src/propagation/TextMapPropagator.ts b/pkgs/api/src/propagation/TextMapPropagator.ts similarity index 100% rename from auto-merge/js/api/src/propagation/TextMapPropagator.ts rename to pkgs/api/src/propagation/TextMapPropagator.ts diff --git a/auto-merge/js/api/src/trace-api.ts b/pkgs/api/src/trace-api.ts similarity index 100% rename from auto-merge/js/api/src/trace-api.ts rename to pkgs/api/src/trace-api.ts diff --git a/auto-merge/js/api/src/trace/NonRecordingSpan.ts b/pkgs/api/src/trace/NonRecordingSpan.ts similarity index 100% rename from auto-merge/js/api/src/trace/NonRecordingSpan.ts rename to pkgs/api/src/trace/NonRecordingSpan.ts diff --git a/auto-merge/js/api/src/trace/NoopTracer.ts b/pkgs/api/src/trace/NoopTracer.ts similarity index 100% rename from auto-merge/js/api/src/trace/NoopTracer.ts rename to pkgs/api/src/trace/NoopTracer.ts diff --git a/auto-merge/js/api/src/trace/NoopTracerProvider.ts b/pkgs/api/src/trace/NoopTracerProvider.ts similarity index 100% rename from auto-merge/js/api/src/trace/NoopTracerProvider.ts rename to pkgs/api/src/trace/NoopTracerProvider.ts diff --git a/auto-merge/js/api/src/trace/ProxyTracer.ts b/pkgs/api/src/trace/ProxyTracer.ts similarity index 100% rename from auto-merge/js/api/src/trace/ProxyTracer.ts rename to pkgs/api/src/trace/ProxyTracer.ts diff --git a/auto-merge/js/api/src/trace/ProxyTracerProvider.ts b/pkgs/api/src/trace/ProxyTracerProvider.ts similarity index 100% rename from auto-merge/js/api/src/trace/ProxyTracerProvider.ts rename to pkgs/api/src/trace/ProxyTracerProvider.ts diff --git a/auto-merge/js/api/src/trace/Sampler.ts b/pkgs/api/src/trace/Sampler.ts similarity index 100% rename from auto-merge/js/api/src/trace/Sampler.ts rename to pkgs/api/src/trace/Sampler.ts diff --git a/auto-merge/js/api/src/trace/SamplingResult.ts b/pkgs/api/src/trace/SamplingResult.ts similarity index 100% rename from auto-merge/js/api/src/trace/SamplingResult.ts rename to pkgs/api/src/trace/SamplingResult.ts diff --git a/auto-merge/js/api/src/trace/SpanOptions.ts b/pkgs/api/src/trace/SpanOptions.ts similarity index 100% rename from auto-merge/js/api/src/trace/SpanOptions.ts rename to pkgs/api/src/trace/SpanOptions.ts diff --git a/auto-merge/js/api/src/trace/attributes.ts b/pkgs/api/src/trace/attributes.ts similarity index 100% rename from auto-merge/js/api/src/trace/attributes.ts rename to pkgs/api/src/trace/attributes.ts diff --git a/auto-merge/js/api/src/trace/context-utils.ts b/pkgs/api/src/trace/context-utils.ts similarity index 100% rename from auto-merge/js/api/src/trace/context-utils.ts rename to pkgs/api/src/trace/context-utils.ts diff --git a/auto-merge/js/api/src/trace/internal/tracestate-impl.ts b/pkgs/api/src/trace/internal/tracestate-impl.ts similarity index 100% rename from auto-merge/js/api/src/trace/internal/tracestate-impl.ts rename to pkgs/api/src/trace/internal/tracestate-impl.ts diff --git a/auto-merge/js/api/src/trace/internal/tracestate-validators.ts b/pkgs/api/src/trace/internal/tracestate-validators.ts similarity index 100% rename from auto-merge/js/api/src/trace/internal/tracestate-validators.ts rename to pkgs/api/src/trace/internal/tracestate-validators.ts diff --git a/auto-merge/js/api/src/trace/internal/utils.ts b/pkgs/api/src/trace/internal/utils.ts similarity index 100% rename from auto-merge/js/api/src/trace/internal/utils.ts rename to pkgs/api/src/trace/internal/utils.ts diff --git a/auto-merge/js/api/src/trace/invalid-span-constants.ts b/pkgs/api/src/trace/invalid-span-constants.ts similarity index 100% rename from auto-merge/js/api/src/trace/invalid-span-constants.ts rename to pkgs/api/src/trace/invalid-span-constants.ts diff --git a/auto-merge/js/api/src/trace/link.ts b/pkgs/api/src/trace/link.ts similarity index 100% rename from auto-merge/js/api/src/trace/link.ts rename to pkgs/api/src/trace/link.ts diff --git a/auto-merge/js/api/src/trace/span.ts b/pkgs/api/src/trace/span.ts similarity index 100% rename from auto-merge/js/api/src/trace/span.ts rename to pkgs/api/src/trace/span.ts diff --git a/auto-merge/js/api/src/trace/span_context.ts b/pkgs/api/src/trace/span_context.ts similarity index 100% rename from auto-merge/js/api/src/trace/span_context.ts rename to pkgs/api/src/trace/span_context.ts diff --git a/auto-merge/js/api/src/trace/span_kind.ts b/pkgs/api/src/trace/span_kind.ts similarity index 100% rename from auto-merge/js/api/src/trace/span_kind.ts rename to pkgs/api/src/trace/span_kind.ts diff --git a/auto-merge/js/api/src/trace/spancontext-utils.ts b/pkgs/api/src/trace/spancontext-utils.ts similarity index 100% rename from auto-merge/js/api/src/trace/spancontext-utils.ts rename to pkgs/api/src/trace/spancontext-utils.ts diff --git a/auto-merge/js/api/src/trace/status.ts b/pkgs/api/src/trace/status.ts similarity index 100% rename from auto-merge/js/api/src/trace/status.ts rename to pkgs/api/src/trace/status.ts diff --git a/auto-merge/js/api/src/trace/trace_flags.ts b/pkgs/api/src/trace/trace_flags.ts similarity index 100% rename from auto-merge/js/api/src/trace/trace_flags.ts rename to pkgs/api/src/trace/trace_flags.ts diff --git a/auto-merge/js/api/src/trace/trace_state.ts b/pkgs/api/src/trace/trace_state.ts similarity index 100% rename from auto-merge/js/api/src/trace/trace_state.ts rename to pkgs/api/src/trace/trace_state.ts diff --git a/auto-merge/js/api/src/trace/tracer.ts b/pkgs/api/src/trace/tracer.ts similarity index 100% rename from auto-merge/js/api/src/trace/tracer.ts rename to pkgs/api/src/trace/tracer.ts diff --git a/auto-merge/js/api/src/trace/tracer_options.ts b/pkgs/api/src/trace/tracer_options.ts similarity index 100% rename from auto-merge/js/api/src/trace/tracer_options.ts rename to pkgs/api/src/trace/tracer_options.ts diff --git a/auto-merge/js/api/src/trace/tracer_provider.ts b/pkgs/api/src/trace/tracer_provider.ts similarity index 100% rename from auto-merge/js/api/src/trace/tracer_provider.ts rename to pkgs/api/src/trace/tracer_provider.ts diff --git a/auto-merge/js/api/test/common/api/api.test.ts b/pkgs/api/test/common/api/api.test.ts similarity index 100% rename from auto-merge/js/api/test/common/api/api.test.ts rename to pkgs/api/test/common/api/api.test.ts diff --git a/auto-merge/js/api/test/common/baggage/Baggage.test.ts b/pkgs/api/test/common/baggage/Baggage.test.ts similarity index 100% rename from auto-merge/js/api/test/common/baggage/Baggage.test.ts rename to pkgs/api/test/common/baggage/Baggage.test.ts diff --git a/auto-merge/js/api/test/common/context/NoopContextManager.test.ts b/pkgs/api/test/common/context/NoopContextManager.test.ts similarity index 100% rename from auto-merge/js/api/test/common/context/NoopContextManager.test.ts rename to pkgs/api/test/common/context/NoopContextManager.test.ts diff --git a/auto-merge/js/api/test/common/diag/ComponentLogger.test.ts b/pkgs/api/test/common/diag/ComponentLogger.test.ts similarity index 100% rename from auto-merge/js/api/test/common/diag/ComponentLogger.test.ts rename to pkgs/api/test/common/diag/ComponentLogger.test.ts diff --git a/auto-merge/js/api/test/common/diag/consoleLogger.test.ts b/pkgs/api/test/common/diag/consoleLogger.test.ts similarity index 100% rename from auto-merge/js/api/test/common/diag/consoleLogger.test.ts rename to pkgs/api/test/common/diag/consoleLogger.test.ts diff --git a/auto-merge/js/api/test/common/diag/logLevel.test.ts b/pkgs/api/test/common/diag/logLevel.test.ts similarity index 100% rename from auto-merge/js/api/test/common/diag/logLevel.test.ts rename to pkgs/api/test/common/diag/logLevel.test.ts diff --git a/auto-merge/js/api/test/common/diag/logger.test.ts b/pkgs/api/test/common/diag/logger.test.ts similarity index 100% rename from auto-merge/js/api/test/common/diag/logger.test.ts rename to pkgs/api/test/common/diag/logger.test.ts diff --git a/auto-merge/js/api/test/common/internal/global.test.ts b/pkgs/api/test/common/internal/global.test.ts similarity index 100% rename from auto-merge/js/api/test/common/internal/global.test.ts rename to pkgs/api/test/common/internal/global.test.ts diff --git a/auto-merge/js/api/test/common/internal/semver.test.ts b/pkgs/api/test/common/internal/semver.test.ts similarity index 100% rename from auto-merge/js/api/test/common/internal/semver.test.ts rename to pkgs/api/test/common/internal/semver.test.ts diff --git a/auto-merge/js/api/test/common/internal/version.test.ts b/pkgs/api/test/common/internal/version.test.ts similarity index 100% rename from auto-merge/js/api/test/common/internal/version.test.ts rename to pkgs/api/test/common/internal/version.test.ts diff --git a/auto-merge/js/api/test/common/metrics/Metric.test.ts b/pkgs/api/test/common/metrics/Metric.test.ts similarity index 100% rename from auto-merge/js/api/test/common/metrics/Metric.test.ts rename to pkgs/api/test/common/metrics/Metric.test.ts diff --git a/auto-merge/js/api/test/common/noop-implementations/noop-meter.test.ts b/pkgs/api/test/common/noop-implementations/noop-meter.test.ts similarity index 100% rename from auto-merge/js/api/test/common/noop-implementations/noop-meter.test.ts rename to pkgs/api/test/common/noop-implementations/noop-meter.test.ts diff --git a/auto-merge/js/api/test/common/noop-implementations/noop-span.test.ts b/pkgs/api/test/common/noop-implementations/noop-span.test.ts similarity index 100% rename from auto-merge/js/api/test/common/noop-implementations/noop-span.test.ts rename to pkgs/api/test/common/noop-implementations/noop-span.test.ts diff --git a/auto-merge/js/api/test/common/noop-implementations/noop-tracer-provider.test.ts b/pkgs/api/test/common/noop-implementations/noop-tracer-provider.test.ts similarity index 100% rename from auto-merge/js/api/test/common/noop-implementations/noop-tracer-provider.test.ts rename to pkgs/api/test/common/noop-implementations/noop-tracer-provider.test.ts diff --git a/auto-merge/js/api/test/common/noop-implementations/noop-tracer.test.ts b/pkgs/api/test/common/noop-implementations/noop-tracer.test.ts similarity index 100% rename from auto-merge/js/api/test/common/noop-implementations/noop-tracer.test.ts rename to pkgs/api/test/common/noop-implementations/noop-tracer.test.ts diff --git a/auto-merge/js/api/test/common/proxy-implementations/proxy-tracer.test.ts b/pkgs/api/test/common/proxy-implementations/proxy-tracer.test.ts similarity index 100% rename from auto-merge/js/api/test/common/proxy-implementations/proxy-tracer.test.ts rename to pkgs/api/test/common/proxy-implementations/proxy-tracer.test.ts diff --git a/auto-merge/js/api/test/common/trace/spancontext-utils.test.ts b/pkgs/api/test/common/trace/spancontext-utils.test.ts similarity index 100% rename from auto-merge/js/api/test/common/trace/spancontext-utils.test.ts rename to pkgs/api/test/common/trace/spancontext-utils.test.ts diff --git a/auto-merge/js/api/test/common/trace/tracestate-validators.test.ts b/pkgs/api/test/common/trace/tracestate-validators.test.ts similarity index 100% rename from auto-merge/js/api/test/common/trace/tracestate-validators.test.ts rename to pkgs/api/test/common/trace/tracestate-validators.test.ts diff --git a/auto-merge/js/api/test/common/trace/tracestate.test.ts b/pkgs/api/test/common/trace/tracestate.test.ts similarity index 100% rename from auto-merge/js/api/test/common/trace/tracestate.test.ts rename to pkgs/api/test/common/trace/tracestate.test.ts diff --git a/auto-merge/js/api/test/index-webpack.ts b/pkgs/api/test/index-webpack.ts similarity index 100% rename from auto-merge/js/api/test/index-webpack.ts rename to pkgs/api/test/index-webpack.ts diff --git a/auto-merge/js/api/test/index-webpack.worker.ts b/pkgs/api/test/index-webpack.worker.ts similarity index 100% rename from auto-merge/js/api/test/index-webpack.worker.ts rename to pkgs/api/test/index-webpack.worker.ts diff --git a/auto-merge/js/api/test/tree-shaking/tree-shaking.test.ts b/pkgs/api/test/tree-shaking/tree-shaking.test.ts similarity index 100% rename from auto-merge/js/api/test/tree-shaking/tree-shaking.test.ts rename to pkgs/api/test/tree-shaking/tree-shaking.test.ts diff --git a/pkgs/api/tsconfig.esm.json b/pkgs/api/tsconfig.esm.json new file mode 100644 index 000000000..6f96cbec1 --- /dev/null +++ b/pkgs/api/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esnext.json b/pkgs/api/tsconfig.esnext.json similarity index 67% rename from auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esnext.json rename to pkgs/api/tsconfig.esnext.json index 4b926c1c8..2525ac36a 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esnext.json +++ b/pkgs/api/tsconfig.esnext.json @@ -7,13 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.json b/pkgs/api/tsconfig.json similarity index 61% rename from auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.json rename to pkgs/api/tsconfig.json index d01ca872e..cb48d4258 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.json +++ b/pkgs/api/tsconfig.json @@ -8,13 +8,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-core" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/api/.eslintignore b/pkgs/context/zone-peer-dep/.eslintignore similarity index 100% rename from auto-merge/js/api/.eslintignore rename to pkgs/context/zone-peer-dep/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js b/pkgs/context/zone-peer-dep/.eslintrc.js similarity index 79% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js rename to pkgs/context/zone-peer-dep/.eslintrc.js index 7561e7f83..e732cabf1 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js +++ b/pkgs/context/zone-peer-dep/.eslintrc.js @@ -7,5 +7,5 @@ module.exports = { "globals": { "Zone": "readonly" }, - ...require('../../eslint.base.js') + ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/LICENSE b/pkgs/context/zone-peer-dep/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/LICENSE rename to pkgs/context/zone-peer-dep/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/README.md b/pkgs/context/zone-peer-dep/README.md similarity index 93% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/README.md rename to pkgs/context/zone-peer-dep/README.md index a505b9fbd..8d1d0b967 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/README.md +++ b/pkgs/context/zone-peer-dep/README.md @@ -19,13 +19,13 @@ npm install --save @opentelemetry/context-zone-peer-dep ## Usage ```js -import { context, trace } from '@opentelemetry/api'; +import { context, trace } from '@opentelemetry/sandbox-api'; import { ConsoleSpanExporter, SimpleSpanProcessor, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; -import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep'; +} from '@opentelemetry/sandbox-sdk-trace-web'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone-peer-dep'; const providerWithZone = new WebTracerProvider(); providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/karma.conf.js b/pkgs/context/zone-peer-dep/karma.conf.js similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/karma.conf.js rename to pkgs/context/zone-peer-dep/karma.conf.js diff --git a/pkgs/context/zone-peer-dep/karma.debug.conf.js b/pkgs/context/zone-peer-dep/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/context/zone-peer-dep/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/context/zone-peer-dep/package.json b/pkgs/context/zone-peer-dep/package.json new file mode 100644 index 000000000..53e26bb04 --- /dev/null +++ b/pkgs/context/zone-peer-dep/package.json @@ -0,0 +1,115 @@ +{ + "name": "@opentelemetry/sandbox-context-zone-peer-dep", + "version": "1.15.2", + "description": "OpenTelemetry Context Zone with peer dependency for zone.js", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "web", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@types/zone.js": "0.5.12", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "zone.js": "^0.11.4" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "zone.js": "^0.11.4" + }, + "sideEffects": false, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep" +} \ No newline at end of file diff --git a/pkgs/context/zone-peer-dep/rollup.config.js b/pkgs/context/zone-peer-dep/rollup.config.js new file mode 100644 index 000000000..c7cf63c80 --- /dev/null +++ b/pkgs/context/zone-peer-dep/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.context-zone-peer-dep", inputName, "otel-sndbx.context-zone-peer-dep", version); diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts b/pkgs/context/zone-peer-dep/src/ZoneContextManager.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts rename to pkgs/context/zone-peer-dep/src/ZoneContextManager.ts index 3f5c8c71c..8895fbf60 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts +++ b/pkgs/context/zone-peer-dep/src/ZoneContextManager.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/api'; +import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; import { TargetWithEvents } from './types'; import { isListenerObject } from './util'; diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/index.ts b/pkgs/context/zone-peer-dep/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/index.ts rename to pkgs/context/zone-peer-dep/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/types.ts b/pkgs/context/zone-peer-dep/src/types.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/types.ts rename to pkgs/context/zone-peer-dep/src/types.ts diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/util.ts b/pkgs/context/zone-peer-dep/src/util.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/src/util.ts rename to pkgs/context/zone-peer-dep/src/util.ts diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts b/pkgs/context/zone-peer-dep/test/ZoneContextManager.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts rename to pkgs/context/zone-peer-dep/test/ZoneContextManager.test.ts index aea0dacb2..bb5f91f3b 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts +++ b/pkgs/context/zone-peer-dep/test/ZoneContextManager.test.ts @@ -18,7 +18,7 @@ import 'zone.js'; import * as sinon from 'sinon'; import * as assert from 'assert'; import { ZoneContextManager } from '../src'; -import { ROOT_CONTEXT, createContextKey } from '@opentelemetry/api'; +import { ROOT_CONTEXT, createContextKey } from '@opentelemetry/sandbox-api'; let clock: any; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/index-webpack.ts b/pkgs/context/zone-peer-dep/test/index-webpack.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/index-webpack.ts rename to pkgs/context/zone-peer-dep/test/index-webpack.ts diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/utils.test.ts b/pkgs/context/zone-peer-dep/test/utils.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/utils.test.ts rename to pkgs/context/zone-peer-dep/test/utils.test.ts diff --git a/auto-merge/js/experimental/packages/api-events/tsconfig.esm.json b/pkgs/context/zone-peer-dep/tsconfig.esm.json similarity index 78% rename from auto-merge/js/experimental/packages/api-events/tsconfig.esm.json rename to pkgs/context/zone-peer-dep/tsconfig.esm.json index f0383c004..6142ec2ba 100644 --- a/auto-merge/js/experimental/packages/api-events/tsconfig.esm.json +++ b/pkgs/context/zone-peer-dep/tsconfig.esm.json @@ -5,12 +5,10 @@ "rootDir": "src", "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/api-logs/tsconfig.esnext.json b/pkgs/context/zone-peer-dep/tsconfig.esnext.json similarity index 79% rename from auto-merge/js/experimental/packages/api-logs/tsconfig.esnext.json rename to pkgs/context/zone-peer-dep/tsconfig.esnext.json index 218899ff2..a96a05e1d 100644 --- a/auto-merge/js/experimental/packages/api-logs/tsconfig.esnext.json +++ b/pkgs/context/zone-peer-dep/tsconfig.esnext.json @@ -5,12 +5,10 @@ "rootDir": "src", "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.json b/pkgs/context/zone-peer-dep/tsconfig.json similarity index 64% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.json rename to pkgs/context/zone-peer-dep/tsconfig.json index a4adfa3f7..8abdec5ba 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.json +++ b/pkgs/context/zone-peer-dep/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "outDir": "build", "rootDir": "." @@ -10,10 +10,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/api-events/.eslintignore b/pkgs/context/zone/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/api-events/.eslintignore rename to pkgs/context/zone/.eslintignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js b/pkgs/context/zone/.eslintrc.js similarity index 81% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js rename to pkgs/context/zone/.eslintrc.js index 7364a382d..e108d0905 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js +++ b/pkgs/context/zone/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { "env": { - "mocha": true, "browser": true, + "commonjs": true }, ...require('../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/LICENSE b/pkgs/context/zone/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/LICENSE rename to pkgs/context/zone/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-context-zone/README.md b/pkgs/context/zone/README.md similarity index 93% rename from auto-merge/js/packages/opentelemetry-context-zone/README.md rename to pkgs/context/zone/README.md index 0162f9645..04e67bd58 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone/README.md +++ b/pkgs/context/zone/README.md @@ -16,13 +16,13 @@ npm install --save @opentelemetry/context-zone ## Usage ```js -import { context, trace } from '@opentelemetry/api'; +import { context, trace } from '@opentelemetry/sandbox-api'; import { ConsoleSpanExporter, SimpleSpanProcessor, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; +} from '@opentelemetry/sandbox-sdk-trace-web'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; const providerWithZone = new WebTracerProvider(); providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); diff --git a/pkgs/context/zone/package.json b/pkgs/context/zone/package.json new file mode 100644 index 000000000..534580ab5 --- /dev/null +++ b/pkgs/context/zone/package.json @@ -0,0 +1,110 @@ +{ + "name": "@opentelemetry/sandbox-context-zone", + "version": "1.15.2", + "description": "OpenTelemetry Context Zone", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "test": "", + "test:browser": "", + "test:debug": "", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "web", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "dependencies": { + "@opentelemetry/sandbox-context-zone-peer-dep": "1.15.2", + "zone.js": "^0.11.4" + }, + "sideEffects": true, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone" +} \ No newline at end of file diff --git a/pkgs/context/zone/rollup.config.js b/pkgs/context/zone/rollup.config.js new file mode 100644 index 000000000..d46e0be0c --- /dev/null +++ b/pkgs/context/zone/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.context-zone", inputName, "otel-sndbx.context-zone", version); diff --git a/auto-merge/js/packages/opentelemetry-context-zone/src/index.ts b/pkgs/context/zone/src/index.ts similarity index 90% rename from auto-merge/js/packages/opentelemetry-context-zone/src/index.ts rename to pkgs/context/zone/src/index.ts index ba99ea33b..d255fcec7 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone/src/index.ts +++ b/pkgs/context/zone/src/index.ts @@ -14,5 +14,5 @@ * limitations under the License. */ -export * from '@opentelemetry/context-zone-peer-dep'; +export * from '@opentelemetry/sandbox-context-zone-peer-dep'; import 'zone.js'; diff --git a/auto-merge/js/experimental/packages/api-logs/tsconfig.esm.json b/pkgs/context/zone/tsconfig.esm.json similarity index 78% rename from auto-merge/js/experimental/packages/api-logs/tsconfig.esm.json rename to pkgs/context/zone/tsconfig.esm.json index f0383c004..6142ec2ba 100644 --- a/auto-merge/js/experimental/packages/api-logs/tsconfig.esm.json +++ b/pkgs/context/zone/tsconfig.esm.json @@ -5,12 +5,10 @@ "rootDir": "src", "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/api-events/tsconfig.esnext.json b/pkgs/context/zone/tsconfig.esnext.json similarity index 79% rename from auto-merge/js/experimental/packages/api-events/tsconfig.esnext.json rename to pkgs/context/zone/tsconfig.esnext.json index 218899ff2..a96a05e1d 100644 --- a/auto-merge/js/experimental/packages/api-events/tsconfig.esnext.json +++ b/pkgs/context/zone/tsconfig.esnext.json @@ -5,12 +5,10 @@ "rootDir": "src", "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.json b/pkgs/context/zone/tsconfig.json similarity index 59% rename from auto-merge/js/packages/opentelemetry-context-zone/tsconfig.json rename to pkgs/context/zone/tsconfig.json index 0a1a4e353..8abdec5ba 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone/tsconfig.json +++ b/pkgs/context/zone/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "outDir": "build", "rootDir": "." @@ -10,10 +10,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone-peer-dep" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/api-logs/.eslintignore b/pkgs/core/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/.eslintignore rename to pkgs/core/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-core/.eslintrc.js b/pkgs/core/.eslintrc.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/.eslintrc.js rename to pkgs/core/.eslintrc.js diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/.npmignore b/pkgs/core/.npmignore similarity index 100% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/.npmignore rename to pkgs/core/.npmignore diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/LICENSE b/pkgs/core/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/LICENSE rename to pkgs/core/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-core/README.md b/pkgs/core/README.md similarity index 86% rename from auto-merge/js/packages/opentelemetry-core/README.md rename to pkgs/core/README.md index 1d543dca2..8cd13e7c7 100644 --- a/auto-merge/js/packages/opentelemetry-core/README.md +++ b/pkgs/core/README.md @@ -23,8 +23,8 @@ This package provides default implementations of the OpenTelemetry API for trace OpenTelemetry provides a text-based approach to propagate context to remote services using the [W3C Trace Context](https://www.w3.org/TR/trace-context/) HTTP headers. ```js -const api = require("@opentelemetry/api"); -const { W3CTraceContextPropagator } = require("@opentelemetry/core"); +const api = require("@opentelemetry/sandbox-api"); +const { W3CTraceContextPropagator } = require("@opentelemetry/sandbox-core"); /* Set Global Propagator */ api.propagation.setGlobalPropagator(new W3CTraceContextPropagator()); @@ -37,8 +37,8 @@ Combines multiple propagators into a single propagator. > This is used as a default Propagator ```js -const api = require("@opentelemetry/api"); -const { CompositePropagator } = require("@opentelemetry/core"); +const api = require("@opentelemetry/sandbox-api"); +const { CompositePropagator } = require("@opentelemetry/sandbox-core"); /* Set Global Propagator */ api.propagation.setGlobalPropagator(new CompositePropagator()); @@ -49,8 +49,8 @@ api.propagation.setGlobalPropagator(new CompositePropagator()); Provides a text-based approach to propagate [baggage](https://w3c.github.io/baggage/) to remote services using the [OpenTelemetry Baggage Propagation](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/baggage/api.md#baggage-propagation) HTTP headers. ```js -const api = require("@opentelemetry/api"); -const { W3CBaggagePropagator } = require("@opentelemetry/core"); +const api = require("@opentelemetry/sandbox-api"); +const { W3CBaggagePropagator } = require("@opentelemetry/sandbox-core"); /* Set Global Propagator */ api.propagation.setGlobalPropagator(new W3CBaggagePropagator()); diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/karma.conf.js b/pkgs/core/karma.conf.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/karma.conf.js rename to pkgs/core/karma.conf.js diff --git a/pkgs/core/karma.debug.conf.js b/pkgs/core/karma.debug.conf.js new file mode 100644 index 000000000..e2d096d8e --- /dev/null +++ b/pkgs/core/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/core/karma.webpack.js b/pkgs/core/karma.webpack.js new file mode 100644 index 000000000..eda8fd79a --- /dev/null +++ b/pkgs/core/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/karma.worker.js b/pkgs/core/karma.worker.js similarity index 89% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/karma.worker.js rename to pkgs/core/karma.worker.js index d392e58ba..02428c5c3 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/karma.worker.js +++ b/pkgs/core/karma.worker.js @@ -12,13 +12,13 @@ * 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. - */ +*/ const karmaWebpackConfig = require('../../karma.webpack'); const karmaBaseConfig = require('../../karma.worker'); module.exports = (config) => { - config.set(Object.assign({}, karmaBaseConfig, { - webpack: karmaWebpackConfig - })) + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) }; diff --git a/pkgs/core/package.json b/pkgs/core/package.json new file mode 100644 index 000000000..5952f35f2 --- /dev/null +++ b/pkgs/core/package.json @@ -0,0 +1,123 @@ +{ + "name": "@opentelemetry/sandbox-core", + "version": "1.15.2", + "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run tdd:node", + "tdd:browser": "karma start", + "tdd:node": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "browser", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/core/rollup.config.js b/pkgs/core/rollup.config.js new file mode 100644 index 000000000..cd05469be --- /dev/null +++ b/pkgs/core/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.core", inputName, "otel-sndbx.core", version); diff --git a/auto-merge/js/packages/opentelemetry-core/src/ExportResult.ts b/pkgs/core/src/ExportResult.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/ExportResult.ts rename to pkgs/core/src/ExportResult.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/baggage/constants.ts b/pkgs/core/src/baggage/constants.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/baggage/constants.ts rename to pkgs/core/src/baggage/constants.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts b/pkgs/core/src/baggage/propagation/W3CBaggagePropagator.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts rename to pkgs/core/src/baggage/propagation/W3CBaggagePropagator.ts index 8a20dedca..82a847425 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/baggage/propagation/W3CBaggagePropagator.ts +++ b/pkgs/core/src/baggage/propagation/W3CBaggagePropagator.ts @@ -21,7 +21,7 @@ import { TextMapGetter, TextMapPropagator, TextMapSetter, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { isTracingSuppressed } from '../../trace/suppress-tracing'; import { diff --git a/auto-merge/js/packages/opentelemetry-core/src/baggage/utils.ts b/pkgs/core/src/baggage/utils.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/src/baggage/utils.ts rename to pkgs/core/src/baggage/utils.ts index bb8b4b015..ec761ba78 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/baggage/utils.ts +++ b/pkgs/core/src/baggage/utils.ts @@ -17,7 +17,7 @@ import { Baggage, BaggageEntryMetadata, baggageEntryMetadataFromString, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { BAGGAGE_ITEMS_SEPARATOR, BAGGAGE_PROPERTIES_SEPARATOR, diff --git a/auto-merge/js/packages/opentelemetry-core/src/common/anchored-clock.ts b/pkgs/core/src/common/anchored-clock.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/common/anchored-clock.ts rename to pkgs/core/src/common/anchored-clock.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/common/attributes.ts b/pkgs/core/src/common/attributes.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/src/common/attributes.ts rename to pkgs/core/src/common/attributes.ts index 0726acd58..c6142e1ca 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/common/attributes.ts +++ b/pkgs/core/src/common/attributes.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { diag, SpanAttributeValue, SpanAttributes } from '@opentelemetry/api'; +import { diag, SpanAttributeValue, SpanAttributes } from '@opentelemetry/sandbox-api'; export function sanitizeAttributes(attributes: unknown): SpanAttributes { const out: SpanAttributes = {}; diff --git a/auto-merge/js/packages/opentelemetry-core/src/common/global-error-handler.ts b/pkgs/core/src/common/global-error-handler.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-core/src/common/global-error-handler.ts rename to pkgs/core/src/common/global-error-handler.ts index 9ef103e40..d9398060d 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/common/global-error-handler.ts +++ b/pkgs/core/src/common/global-error-handler.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Exception } from '@opentelemetry/api'; +import { Exception } from '@opentelemetry/sandbox-api'; import { loggingErrorHandler } from './logging-error-handler'; import { ErrorHandler } from './types'; diff --git a/auto-merge/js/packages/opentelemetry-core/src/common/logging-error-handler.ts b/pkgs/core/src/common/logging-error-handler.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-core/src/common/logging-error-handler.ts rename to pkgs/core/src/common/logging-error-handler.ts index bb3b187d9..3b3dd1834 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/common/logging-error-handler.ts +++ b/pkgs/core/src/common/logging-error-handler.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { diag, Exception } from '@opentelemetry/api'; +import { diag, Exception } from '@opentelemetry/sandbox-api'; import { ErrorHandler } from './types'; /** diff --git a/auto-merge/js/packages/opentelemetry-core/src/common/time.ts b/pkgs/core/src/common/time.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/src/common/time.ts rename to pkgs/core/src/common/time.ts index 8d3051b00..d88c1fd5c 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/common/time.ts +++ b/pkgs/core/src/common/time.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { otperformance as performance } from '../platform'; import { TimeOriginLegacy } from './types'; diff --git a/auto-merge/js/packages/opentelemetry-core/src/common/types.ts b/pkgs/core/src/common/types.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-core/src/common/types.ts rename to pkgs/core/src/common/types.ts index 2c6d9b7d5..5022b7fd8 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/common/types.ts +++ b/pkgs/core/src/common/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Exception } from '@opentelemetry/api'; +import { Exception } from '@opentelemetry/sandbox-api'; /** * This interface defines a fallback to read a timeOrigin when it is not available on performance.timeOrigin, diff --git a/auto-merge/js/packages/opentelemetry-core/src/index.ts b/pkgs/core/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/index.ts rename to pkgs/core/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/internal/exporter.ts b/pkgs/core/src/internal/exporter.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-core/src/internal/exporter.ts rename to pkgs/core/src/internal/exporter.ts index 28061f5ee..14874e4a2 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/internal/exporter.ts +++ b/pkgs/core/src/internal/exporter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { context } from '@opentelemetry/api'; +import { context } from '@opentelemetry/sandbox-api'; import { ExportResult } from '../ExportResult'; import { suppressTracing } from '../trace/suppress-tracing'; diff --git a/auto-merge/js/packages/opentelemetry-core/src/internal/validators.ts b/pkgs/core/src/internal/validators.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/internal/validators.ts rename to pkgs/core/src/internal/validators.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/RandomIdGenerator.ts b/pkgs/core/src/platform/browser/RandomIdGenerator.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/RandomIdGenerator.ts rename to pkgs/core/src/platform/browser/RandomIdGenerator.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/environment.ts b/pkgs/core/src/platform/browser/environment.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/environment.ts rename to pkgs/core/src/platform/browser/environment.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/globalThis.ts b/pkgs/core/src/platform/browser/globalThis.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/globalThis.ts rename to pkgs/core/src/platform/browser/globalThis.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/hex-to-base64.ts b/pkgs/core/src/platform/browser/hex-to-base64.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/hex-to-base64.ts rename to pkgs/core/src/platform/browser/hex-to-base64.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/index.ts b/pkgs/core/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/index.ts rename to pkgs/core/src/platform/browser/index.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/performance.ts b/pkgs/core/src/platform/browser/performance.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/performance.ts rename to pkgs/core/src/platform/browser/performance.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/sdk-info.ts b/pkgs/core/src/platform/browser/sdk-info.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/sdk-info.ts rename to pkgs/core/src/platform/browser/sdk-info.ts index b804cd3c8..c043b1417 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/sdk-info.ts +++ b/pkgs/core/src/platform/browser/sdk-info.ts @@ -18,7 +18,7 @@ import { VERSION } from '../../version'; import { TelemetrySdkLanguageValues, SemanticResourceAttributes, -} from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-semantic-conventions'; /** Constants describing the SDK in use */ export const SDK_INFO = { diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/browser/timer-util.ts b/pkgs/core/src/platform/browser/timer-util.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/browser/timer-util.ts rename to pkgs/core/src/platform/browser/timer-util.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/index.ts b/pkgs/core/src/platform/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/index.ts rename to pkgs/core/src/platform/index.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/RandomIdGenerator.ts b/pkgs/core/src/platform/node/RandomIdGenerator.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/RandomIdGenerator.ts rename to pkgs/core/src/platform/node/RandomIdGenerator.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/environment.ts b/pkgs/core/src/platform/node/environment.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/environment.ts rename to pkgs/core/src/platform/node/environment.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/globalThis.ts b/pkgs/core/src/platform/node/globalThis.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/globalThis.ts rename to pkgs/core/src/platform/node/globalThis.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/hex-to-base64.ts b/pkgs/core/src/platform/node/hex-to-base64.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/hex-to-base64.ts rename to pkgs/core/src/platform/node/hex-to-base64.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/index.ts b/pkgs/core/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/index.ts rename to pkgs/core/src/platform/node/index.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/performance.ts b/pkgs/core/src/platform/node/performance.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/performance.ts rename to pkgs/core/src/platform/node/performance.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/sdk-info.ts b/pkgs/core/src/platform/node/sdk-info.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/sdk-info.ts rename to pkgs/core/src/platform/node/sdk-info.ts index 6c7c4c5f0..214f8174e 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/platform/node/sdk-info.ts +++ b/pkgs/core/src/platform/node/sdk-info.ts @@ -18,7 +18,7 @@ import { VERSION } from '../../version'; import { TelemetrySdkLanguageValues, SemanticResourceAttributes, -} from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-semantic-conventions'; /** Constants describing the SDK in use */ export const SDK_INFO = { diff --git a/auto-merge/js/packages/opentelemetry-core/src/platform/node/timer-util.ts b/pkgs/core/src/platform/node/timer-util.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/platform/node/timer-util.ts rename to pkgs/core/src/platform/node/timer-util.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/propagation/composite.ts b/pkgs/core/src/propagation/composite.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/src/propagation/composite.ts rename to pkgs/core/src/propagation/composite.ts index 245507a11..da9c9a2dd 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/propagation/composite.ts +++ b/pkgs/core/src/propagation/composite.ts @@ -20,7 +20,7 @@ import { TextMapPropagator, diag, TextMapSetter, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; /** Configuration object for composite propagator */ export interface CompositePropagatorConfig { diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/IdGenerator.ts b/pkgs/core/src/trace/IdGenerator.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/trace/IdGenerator.ts rename to pkgs/core/src/trace/IdGenerator.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/TraceState.ts b/pkgs/core/src/trace/TraceState.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/src/trace/TraceState.ts rename to pkgs/core/src/trace/TraceState.ts index 0d881b15c..ee32d6769 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/TraceState.ts +++ b/pkgs/core/src/trace/TraceState.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { validateKey, validateValue } from '../internal/validators'; const MAX_TRACE_STATE_ITEMS = 32; diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts b/pkgs/core/src/trace/W3CTraceContextPropagator.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts rename to pkgs/core/src/trace/W3CTraceContextPropagator.ts index 7925e7481..52a297b32 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/W3CTraceContextPropagator.ts +++ b/pkgs/core/src/trace/W3CTraceContextPropagator.ts @@ -23,7 +23,7 @@ import { TextMapSetter, trace, TraceFlags, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { isTracingSuppressed } from './suppress-tracing'; import { TraceState } from './TraceState'; diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/rpc-metadata.ts b/pkgs/core/src/trace/rpc-metadata.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/src/trace/rpc-metadata.ts rename to pkgs/core/src/trace/rpc-metadata.ts index 8e3cbf7be..00a390e23 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/rpc-metadata.ts +++ b/pkgs/core/src/trace/rpc-metadata.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, createContextKey, Span } from '@opentelemetry/api'; +import { Context, createContextKey, Span } from '@opentelemetry/sandbox-api'; const RPC_METADATA_KEY = createContextKey( 'OpenTelemetry SDK Context Key RPC_METADATA' diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/AlwaysOffSampler.ts b/pkgs/core/src/trace/sampler/AlwaysOffSampler.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-core/src/trace/sampler/AlwaysOffSampler.ts rename to pkgs/core/src/trace/sampler/AlwaysOffSampler.ts index ebe824d90..3cbe34d73 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/AlwaysOffSampler.ts +++ b/pkgs/core/src/trace/sampler/AlwaysOffSampler.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Sampler, SamplingDecision, SamplingResult } from '@opentelemetry/api'; +import { Sampler, SamplingDecision, SamplingResult } from '@opentelemetry/sandbox-api'; /** * @deprecated Use the one defined in @opentelemetry/sdk-trace-base instead. diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/AlwaysOnSampler.ts b/pkgs/core/src/trace/sampler/AlwaysOnSampler.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-core/src/trace/sampler/AlwaysOnSampler.ts rename to pkgs/core/src/trace/sampler/AlwaysOnSampler.ts index 8967d4964..8a5421682 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/AlwaysOnSampler.ts +++ b/pkgs/core/src/trace/sampler/AlwaysOnSampler.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Sampler, SamplingDecision, SamplingResult } from '@opentelemetry/api'; +import { Sampler, SamplingDecision, SamplingResult } from '@opentelemetry/sandbox-api'; /** * @deprecated Use the one defined in @opentelemetry/sdk-trace-base instead. diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/ParentBasedSampler.ts b/pkgs/core/src/trace/sampler/ParentBasedSampler.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/src/trace/sampler/ParentBasedSampler.ts rename to pkgs/core/src/trace/sampler/ParentBasedSampler.ts index a3abf53bf..99c1b7cf7 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/ParentBasedSampler.ts +++ b/pkgs/core/src/trace/sampler/ParentBasedSampler.ts @@ -24,7 +24,7 @@ import { SpanKind, TraceFlags, trace, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { globalErrorHandler } from '../../common/global-error-handler'; import { AlwaysOffSampler } from './AlwaysOffSampler'; import { AlwaysOnSampler } from './AlwaysOnSampler'; diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/TraceIdRatioBasedSampler.ts b/pkgs/core/src/trace/sampler/TraceIdRatioBasedSampler.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/src/trace/sampler/TraceIdRatioBasedSampler.ts rename to pkgs/core/src/trace/sampler/TraceIdRatioBasedSampler.ts index c4928d1cf..2afeefc24 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/sampler/TraceIdRatioBasedSampler.ts +++ b/pkgs/core/src/trace/sampler/TraceIdRatioBasedSampler.ts @@ -19,7 +19,7 @@ import { SamplingDecision, SamplingResult, isValidTraceId, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; /** * @deprecated Use the one defined in @opentelemetry/sdk-trace-base instead. diff --git a/auto-merge/js/packages/opentelemetry-core/src/trace/suppress-tracing.ts b/pkgs/core/src/trace/suppress-tracing.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-core/src/trace/suppress-tracing.ts rename to pkgs/core/src/trace/suppress-tracing.ts index a48c01dcd..9794fcd1a 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/trace/suppress-tracing.ts +++ b/pkgs/core/src/trace/suppress-tracing.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, createContextKey } from '@opentelemetry/api'; +import { Context, createContextKey } from '@opentelemetry/sandbox-api'; const SUPPRESS_TRACING_KEY = createContextKey( 'OpenTelemetry SDK Context Key SUPPRESS_TRACING' diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/callback.ts b/pkgs/core/src/utils/callback.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/callback.ts rename to pkgs/core/src/utils/callback.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/environment.ts b/pkgs/core/src/utils/environment.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/src/utils/environment.ts rename to pkgs/core/src/utils/environment.ts index fda6e103b..c1135703e 100644 --- a/auto-merge/js/packages/opentelemetry-core/src/utils/environment.ts +++ b/pkgs/core/src/utils/environment.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { DiagLogLevel } from '@opentelemetry/api'; +import { DiagLogLevel } from '@opentelemetry/sandbox-api'; import { TracesSamplerValues } from './sampling'; import { _globalThis } from '../platform/browser/globalThis'; diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/lodash.merge.ts b/pkgs/core/src/utils/lodash.merge.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/lodash.merge.ts rename to pkgs/core/src/utils/lodash.merge.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/merge.ts b/pkgs/core/src/utils/merge.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/merge.ts rename to pkgs/core/src/utils/merge.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/promise.ts b/pkgs/core/src/utils/promise.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/promise.ts rename to pkgs/core/src/utils/promise.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/sampling.ts b/pkgs/core/src/utils/sampling.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/sampling.ts rename to pkgs/core/src/utils/sampling.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/timeout.ts b/pkgs/core/src/utils/timeout.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/timeout.ts rename to pkgs/core/src/utils/timeout.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/url.ts b/pkgs/core/src/utils/url.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/url.ts rename to pkgs/core/src/utils/url.ts diff --git a/auto-merge/js/packages/opentelemetry-core/src/utils/wrap.ts b/pkgs/core/src/utils/wrap.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/src/utils/wrap.ts rename to pkgs/core/src/utils/wrap.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts b/pkgs/core/test/baggage/W3CBaggagePropagator.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts rename to pkgs/core/test/baggage/W3CBaggagePropagator.test.ts index 801496513..2e7669ee4 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/baggage/W3CBaggagePropagator.test.ts +++ b/pkgs/core/test/baggage/W3CBaggagePropagator.test.ts @@ -21,8 +21,8 @@ import { defaultTextMapSetter, propagation, baggageEntryMetadataFromString, -} from '@opentelemetry/api'; -import { ROOT_CONTEXT } from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; +import { ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { W3CBaggagePropagator } from '../../src/baggage/propagation/W3CBaggagePropagator'; import { BAGGAGE_HEADER } from '../../src/baggage/constants'; diff --git a/auto-merge/js/packages/opentelemetry-core/test/common/anchored-clock.test.ts b/pkgs/core/test/common/anchored-clock.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/common/anchored-clock.test.ts rename to pkgs/core/test/common/anchored-clock.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/common/attributes.test.ts b/pkgs/core/test/common/attributes.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/common/attributes.test.ts rename to pkgs/core/test/common/attributes.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/common/global-error-handler.test.ts b/pkgs/core/test/common/global-error-handler.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-core/test/common/global-error-handler.test.ts rename to pkgs/core/test/common/global-error-handler.test.ts index 9dcdb3036..ffbb19819 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/common/global-error-handler.test.ts +++ b/pkgs/core/test/common/global-error-handler.test.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { globalErrorHandler, setGlobalErrorHandler } from '../../src'; -import { Exception } from '@opentelemetry/api'; +import { Exception } from '@opentelemetry/sandbox-api'; describe('globalErrorHandler', () => { let defaultHandler: sinon.SinonSpy; diff --git a/auto-merge/js/packages/opentelemetry-core/test/common/logging-error-handler.test.ts b/pkgs/core/test/common/logging-error-handler.test.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-core/test/common/logging-error-handler.test.ts rename to pkgs/core/test/common/logging-error-handler.test.ts index e89a69d03..d3b4882b6 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/common/logging-error-handler.test.ts +++ b/pkgs/core/test/common/logging-error-handler.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { ErrorHandler, loggingErrorHandler } from '../../src'; diff --git a/auto-merge/js/packages/opentelemetry-core/test/common/time.test.ts b/pkgs/core/test/common/time.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/test/common/time.test.ts rename to pkgs/core/test/common/time.test.ts index bf691c707..fe9acc423 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/common/time.test.ts +++ b/pkgs/core/test/common/time.test.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import { otperformance as performance } from '../../src/platform'; import * as sinon from 'sinon'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { hrTime, timeInputToHrTime, diff --git a/auto-merge/js/packages/opentelemetry-core/test/index-webpack.ts b/pkgs/core/test/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/index-webpack.ts rename to pkgs/core/test/index-webpack.ts diff --git a/pkgs/core/test/index-webpack.worker.ts b/pkgs/core/test/index-webpack.worker.ts new file mode 100644 index 000000000..a00999ebd --- /dev/null +++ b/pkgs/core/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./common', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/packages/opentelemetry-core/test/internal/exporter.test.ts b/pkgs/core/test/internal/exporter.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/internal/exporter.test.ts rename to pkgs/core/test/internal/exporter.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/internal/validators.test.ts b/pkgs/core/test/internal/validators.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/internal/validators.test.ts rename to pkgs/core/test/internal/validators.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/platform/RandomIdGenerator.test.ts b/pkgs/core/test/platform/RandomIdGenerator.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/platform/RandomIdGenerator.test.ts rename to pkgs/core/test/platform/RandomIdGenerator.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/platform/browser/environment.test.ts b/pkgs/core/test/platform/browser/environment.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/platform/browser/environment.test.ts rename to pkgs/core/test/platform/browser/environment.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/platform/hex-to-base64.test.ts b/pkgs/core/test/platform/hex-to-base64.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/platform/hex-to-base64.test.ts rename to pkgs/core/test/platform/hex-to-base64.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/propagation/composite.test.ts b/pkgs/core/test/propagation/composite.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-core/test/propagation/composite.test.ts rename to pkgs/core/test/propagation/composite.test.ts index a2bad6f5d..58a6ff054 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/propagation/composite.test.ts +++ b/pkgs/core/test/propagation/composite.test.ts @@ -22,8 +22,8 @@ import { TextMapGetter, TextMapSetter, trace, -} from '@opentelemetry/api'; -import { Context, ROOT_CONTEXT } from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; +import { Context, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { CompositePropagator, diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/test-utils.ts b/pkgs/core/test/test-utils.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/test/test-utils.ts rename to pkgs/core/test/test-utils.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts b/pkgs/core/test/trace/AlwaysOffSampler.test.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts rename to pkgs/core/test/trace/AlwaysOffSampler.test.ts index bda93eddd..7ec7782ca 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts +++ b/pkgs/core/test/trace/AlwaysOffSampler.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { AlwaysOffSampler } from '../../src/trace/sampler/AlwaysOffSampler'; describe('AlwaysOffSampler', () => { diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts b/pkgs/core/test/trace/AlwaysOnSampler.test.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts rename to pkgs/core/test/trace/AlwaysOnSampler.test.ts index fce88b19b..acbdb0de8 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts +++ b/pkgs/core/test/trace/AlwaysOnSampler.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { AlwaysOnSampler } from '../../src/trace/sampler/AlwaysOnSampler'; describe('AlwaysOnSampler', () => { diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts b/pkgs/core/test/trace/ParentBasedSampler.test.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts rename to pkgs/core/test/trace/ParentBasedSampler.test.ts index 828a32fa3..4931797c6 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts +++ b/pkgs/core/test/trace/ParentBasedSampler.test.ts @@ -14,10 +14,10 @@ * limitations under the License. */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { AlwaysOnSampler } from '../../src/trace/sampler/AlwaysOnSampler'; import { ParentBasedSampler } from '../../src/trace/sampler/ParentBasedSampler'; -import { TraceFlags, SpanKind, trace } from '@opentelemetry/api'; +import { TraceFlags, SpanKind, trace } from '@opentelemetry/sandbox-api'; import { AlwaysOffSampler } from '../../src/trace/sampler/AlwaysOffSampler'; import { TraceIdRatioBasedSampler } from '../../src'; diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts b/pkgs/core/test/trace/TraceIdRatioBasedSampler.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts rename to pkgs/core/test/trace/TraceIdRatioBasedSampler.test.ts index c94534c77..66c63015d 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts +++ b/pkgs/core/test/trace/TraceIdRatioBasedSampler.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { TraceIdRatioBasedSampler } from '../../src/trace/sampler/TraceIdRatioBasedSampler'; const spanContext = (traceId = '1') => ({ diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/W3CTraceContextPropagator.test.ts b/pkgs/core/test/trace/W3CTraceContextPropagator.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/test/trace/W3CTraceContextPropagator.test.ts rename to pkgs/core/test/trace/W3CTraceContextPropagator.test.ts index 2df3395f5..ef1c8ee7b 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/trace/W3CTraceContextPropagator.test.ts +++ b/pkgs/core/test/trace/W3CTraceContextPropagator.test.ts @@ -23,7 +23,7 @@ import { SpanContext, trace, TraceFlags, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { W3CTraceContextPropagator, diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/foo/bar/internal.d.ts b/pkgs/core/test/trace/fixtures/test-package/foo/bar/internal.d.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/foo/bar/internal.d.ts rename to pkgs/core/test/trace/fixtures/test-package/foo/bar/internal.d.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/foo/bar/internal.js b/pkgs/core/test/trace/fixtures/test-package/foo/bar/internal.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/foo/bar/internal.js rename to pkgs/core/test/trace/fixtures/test-package/foo/bar/internal.js diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/index.js b/pkgs/core/test/trace/fixtures/test-package/index.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/index.js rename to pkgs/core/test/trace/fixtures/test-package/index.js diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/package.json b/pkgs/core/test/trace/fixtures/test-package/package.json similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/trace/fixtures/test-package/package.json rename to pkgs/core/test/trace/fixtures/test-package/package.json diff --git a/auto-merge/js/packages/opentelemetry-core/test/trace/tracestate.test.ts b/pkgs/core/test/trace/tracestate.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/trace/tracestate.test.ts rename to pkgs/core/test/trace/tracestate.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/utils/callback.test.ts b/pkgs/core/test/utils/callback.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/utils/callback.test.ts rename to pkgs/core/test/utils/callback.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/utils/environment.test.ts b/pkgs/core/test/utils/environment.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-core/test/utils/environment.test.ts rename to pkgs/core/test/utils/environment.test.ts index 8fa8b08f1..40be44f00 100644 --- a/auto-merge/js/packages/opentelemetry-core/test/utils/environment.test.ts +++ b/pkgs/core/test/utils/environment.test.ts @@ -22,7 +22,7 @@ import { } from '../../src/utils/environment'; import * as assert from 'assert'; import * as sinon from 'sinon'; -import { DiagLogLevel } from '@opentelemetry/api'; +import { DiagLogLevel } from '@opentelemetry/sandbox-api'; import { TracesSamplerValues } from '../../src'; let lastMock: RAW_ENVIRONMENT = {}; diff --git a/auto-merge/js/packages/opentelemetry-core/test/utils/merge.test.ts b/pkgs/core/test/utils/merge.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/utils/merge.test.ts rename to pkgs/core/test/utils/merge.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/utils/promise.test.ts b/pkgs/core/test/utils/promise.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/utils/promise.test.ts rename to pkgs/core/test/utils/promise.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/utils/url.test.ts b/pkgs/core/test/utils/url.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/utils/url.test.ts rename to pkgs/core/test/utils/url.test.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/utils/wrap.test.ts b/pkgs/core/test/utils/wrap.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/utils/wrap.test.ts rename to pkgs/core/test/utils/wrap.test.ts diff --git a/pkgs/core/tsconfig.esm.json b/pkgs/core/tsconfig.esm.json new file mode 100644 index 000000000..6f96cbec1 --- /dev/null +++ b/pkgs/core/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json b/pkgs/core/tsconfig.esnext.json similarity index 64% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json rename to pkgs/core/tsconfig.esnext.json index ff768ce18..2525ac36a 100644 --- a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json +++ b/pkgs/core/tsconfig.esnext.json @@ -5,15 +5,7 @@ "rootDir": "src", "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" }, - "files": [ - "node_modules/zone.js/dist/zone.js.d.ts" - ], "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-core/tsconfig.json b/pkgs/core/tsconfig.json similarity index 58% rename from auto-merge/js/packages/opentelemetry-core/tsconfig.json rename to pkgs/core/tsconfig.json index 9c47daec7..cb48d4258 100644 --- a/auto-merge/js/packages/opentelemetry-core/tsconfig.json +++ b/pkgs/core/tsconfig.json @@ -8,13 +8,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../../api" - }, - { - "path": "../opentelemetry-semantic-conventions" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/.eslintignore b/pkgs/detectors/browser/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/.eslintignore rename to pkgs/detectors/browser/.eslintignore diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js b/pkgs/detectors/browser/.eslintrc.js similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js rename to pkgs/detectors/browser/.eslintrc.js diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/.npmignore b/pkgs/detectors/browser/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/.npmignore rename to pkgs/detectors/browser/.npmignore diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/LICENSE b/pkgs/detectors/browser/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/LICENSE rename to pkgs/detectors/browser/LICENSE diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/README.md b/pkgs/detectors/browser/README.md similarity index 85% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/README.md rename to pkgs/detectors/browser/README.md index a1e9002ea..125558d92 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/README.md +++ b/pkgs/detectors/browser/README.md @@ -13,9 +13,9 @@ npm install --save @opentelemetry/opentelemetry-browser-detector ## Usage ```js -import { Resource, detectResources } from '@opentelemetry/resources'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; -import { browserDetector } from '@opentelemetry/opentelemetry-browser-detector'; +import { Resource, detectResources } from '@opentelemetry/sandbox-resources'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; +import { browserDetector } from '@opentelemetry/sandbox-opentelemetry-browser-detector'; async function start(){ let resource= new Resource({ diff --git a/auto-merge/js/experimental/packages/api-events/karma.conf.js b/pkgs/detectors/browser/karma.conf.js similarity index 100% rename from auto-merge/js/experimental/packages/api-events/karma.conf.js rename to pkgs/detectors/browser/karma.conf.js diff --git a/pkgs/detectors/browser/karma.debug.conf.js b/pkgs/detectors/browser/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/detectors/browser/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/detectors/browser/package.json b/pkgs/detectors/browser/package.json new file mode 100644 index 000000000..0dd36f5f6 --- /dev/null +++ b/pkgs/detectors/browser/package.json @@ -0,0 +1,115 @@ +{ + "name": "@opentelemetry/sandbox-opentelemetry-browser-detector", + "version": "0.41.2", + "description": "OpenTelemetry Resource Detector for Browser", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "tdd:browser": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "browser", + "resource", + "detector" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector" +} \ No newline at end of file diff --git a/pkgs/detectors/browser/rollup.config.js b/pkgs/detectors/browser/rollup.config.js new file mode 100644 index 000000000..214421b1e --- /dev/null +++ b/pkgs/detectors/browser/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.detector.browser", inputName, "otel-sndbx.detect-browser", version); diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts b/pkgs/detectors/browser/src/BrowserDetector.ts similarity index 94% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts rename to pkgs/detectors/browser/src/BrowserDetector.ts index 85fdd1cc5..c53900fc2 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/BrowserDetector.ts +++ b/pkgs/detectors/browser/src/BrowserDetector.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { Detector, IResource, Resource, ResourceDetectionConfig, -} from '@opentelemetry/resources'; -import { ResourceAttributes } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-resources'; +import { ResourceAttributes } from '@opentelemetry/sandbox-resources'; import { BROWSER_ATTRIBUTES, UserAgentData } from './types'; /** diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/index.ts b/pkgs/detectors/browser/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/index.ts rename to pkgs/detectors/browser/src/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/types.ts b/pkgs/detectors/browser/src/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/src/types.ts rename to pkgs/detectors/browser/src/types.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/BrowserDetector.test.ts b/pkgs/detectors/browser/test/BrowserDetector.test.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/BrowserDetector.test.ts rename to pkgs/detectors/browser/test/BrowserDetector.test.ts index 727007aa5..385841e82 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/BrowserDetector.test.ts +++ b/pkgs/detectors/browser/test/BrowserDetector.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import * as sinon from 'sinon'; -import { IResource } from '@opentelemetry/resources'; +import { IResource } from '@opentelemetry/sandbox-resources'; import { browserDetector } from '../src/BrowserDetector'; import { describeBrowser, assertResource, assertEmptyResource } from './util'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/index-webpack.ts b/pkgs/detectors/browser/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/index-webpack.ts rename to pkgs/detectors/browser/test/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/util.ts b/pkgs/detectors/browser/test/util.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/util.ts rename to pkgs/detectors/browser/test/util.ts index 3318f4891..6d837e43a 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/test/util.ts +++ b/pkgs/detectors/browser/test/util.ts @@ -16,7 +16,7 @@ import { Suite } from 'mocha'; import * as assert from 'assert'; import { BROWSER_ATTRIBUTES } from '../src/types'; -import { IResource } from '@opentelemetry/resources'; +import { IResource } from '@opentelemetry/sandbox-resources'; export function describeBrowser(title: string, fn: (this: Suite) => void) { title = `Browser: ${title}`; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json b/pkgs/detectors/browser/tsconfig.esm.json similarity index 99% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json rename to pkgs/detectors/browser/tsconfig.esm.json index 379f547a4..d0d0ce24d 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json +++ b/pkgs/detectors/browser/tsconfig.esm.json @@ -1,11 +1,11 @@ { "extends": "../../../tsconfig.base.esm.json", "compilerOptions": { - "rootDir": "src", "outDir": "build/esm", + "rootDir": "src", "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, "include": [ "src/**/*.ts" ] -} +} \ No newline at end of file diff --git a/pkgs/detectors/browser/tsconfig.esnext.json b/pkgs/detectors/browser/tsconfig.esnext.json new file mode 100644 index 000000000..8e1d797d3 --- /dev/null +++ b/pkgs/detectors/browser/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/api-events/tsconfig.json b/pkgs/detectors/browser/tsconfig.json similarity index 74% rename from auto-merge/js/experimental/packages/api-events/tsconfig.json rename to pkgs/detectors/browser/tsconfig.json index 5849e79c0..e4729001d 100644 --- a/auto-merge/js/experimental/packages/api-events/tsconfig.json +++ b/pkgs/detectors/browser/tsconfig.json @@ -8,10 +8,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintignore b/pkgs/exporters/otlp/base/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintignore rename to pkgs/exporters/otlp/base/.eslintignore diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/.eslintrc.js b/pkgs/exporters/otlp/base/.eslintrc.js similarity index 75% rename from auto-merge/js/experimental/packages/otlp-exporter-base/.eslintrc.js rename to pkgs/exporters/otlp/base/.eslintrc.js index c05408904..c3bb93bde 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/.eslintrc.js +++ b/pkgs/exporters/otlp/base/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.base.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.npmignore b/pkgs/exporters/otlp/base/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.npmignore rename to pkgs/exporters/otlp/base/.npmignore diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/LICENSE b/pkgs/exporters/otlp/base/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/LICENSE rename to pkgs/exporters/otlp/base/LICENSE diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/README.md b/pkgs/exporters/otlp/base/README.md similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/README.md rename to pkgs/exporters/otlp/base/README.md diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js b/pkgs/exporters/otlp/base/karma.conf.js similarity index 87% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js rename to pkgs/exporters/otlp/base/karma.conf.js index 4c60b54ed..46080de5d 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/karma.conf.js +++ b/pkgs/exporters/otlp/base/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/exporters/otlp/base/karma.debug.conf.js b/pkgs/exporters/otlp/base/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/exporters/otlp/base/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/base/karma.webpack.js b/pkgs/exporters/otlp/base/karma.webpack.js new file mode 100644 index 000000000..347cb8e58 --- /dev/null +++ b/pkgs/exporters/otlp/base/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/base/karma.worker.js b/pkgs/exporters/otlp/base/karma.worker.js new file mode 100644 index 000000000..adf99bbef --- /dev/null +++ b/pkgs/exporters/otlp/base/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/otlp/base/package.json b/pkgs/exporters/otlp/base/package.json new file mode 100644 index 000000000..d3c7c13a4 --- /dev/null +++ b/pkgs/exporters/otlp/base/package.json @@ -0,0 +1,123 @@ +{ + "name": "@opentelemetry/sandbox-otlp-exporter-base", + "version": "0.41.2", + "description": "OpenTelemetry OTLP Exporter base (for internal use only)", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "tdd:browser": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "tracing", + "profiling", + "metrics", + "stats", + "monitoring" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-exporter-base", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/base/rollup.config.js b/pkgs/exporters/otlp/base/rollup.config.js new file mode 100644 index 000000000..92f92bfab --- /dev/null +++ b/pkgs/exporters/otlp/base/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.otlp-base", inputName, "otel-exprtr.otlp-base", version); diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts b/pkgs/exporters/otlp/base/src/OTLPExporterBase.ts similarity index 97% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts rename to pkgs/exporters/otlp/base/src/OTLPExporterBase.ts index c96030578..2cfb56d17 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts +++ b/pkgs/exporters/otlp/base/src/OTLPExporterBase.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { ExportResult, ExportResultCode, BindOnceFuture, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { OTLPExporterError, OTLPExporterConfigBase, diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/index.ts b/pkgs/exporters/otlp/base/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/index.ts rename to pkgs/exporters/otlp/base/src/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts b/pkgs/exporters/otlp/base/src/platform/browser/OTLPExporterBrowserBase.ts similarity index 95% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts rename to pkgs/exporters/otlp/base/src/platform/browser/OTLPExporterBrowserBase.ts index 57556d81a..77f67c637 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts +++ b/pkgs/exporters/otlp/base/src/platform/browser/OTLPExporterBrowserBase.ts @@ -19,8 +19,8 @@ import { OTLPExporterConfigBase } from '../../types'; import * as otlpTypes from '../../types'; import { parseHeaders } from '../../util'; import { sendWithBeacon, sendWithXhr } from './util'; -import { diag } from '@opentelemetry/api'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; /** * Collector Metric Exporter abstract base class diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/index.ts b/pkgs/exporters/otlp/base/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/index.ts rename to pkgs/exporters/otlp/base/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/util.ts b/pkgs/exporters/otlp/base/src/platform/browser/util.ts similarity index 98% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/util.ts rename to pkgs/exporters/otlp/base/src/platform/browser/util.ts index fade4afa8..2a1d30ad1 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/browser/util.ts +++ b/pkgs/exporters/otlp/base/src/platform/browser/util.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { OTLPExporterError } from '../../types'; import { DEFAULT_EXPORT_MAX_ATTEMPTS, diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/index.ts b/pkgs/exporters/otlp/base/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/index.ts rename to pkgs/exporters/otlp/base/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts b/pkgs/exporters/otlp/base/src/platform/node/OTLPExporterNodeBase.ts similarity index 95% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts rename to pkgs/exporters/otlp/base/src/platform/node/OTLPExporterNodeBase.ts index 088a0fd0a..b9341e9d1 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts +++ b/pkgs/exporters/otlp/base/src/platform/node/OTLPExporterNodeBase.ts @@ -22,8 +22,8 @@ import { OTLPExporterNodeConfigBase, CompressionAlgorithm } from './types'; import * as otlpTypes from '../../types'; import { parseHeaders } from '../../util'; import { createHttpAgent, sendWithHttp, configureCompression } from './util'; -import { diag } from '@opentelemetry/api'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; /** * Collector Metric Exporter abstract base class diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/index.ts b/pkgs/exporters/otlp/base/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/index.ts rename to pkgs/exporters/otlp/base/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/types.ts b/pkgs/exporters/otlp/base/src/platform/node/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/types.ts rename to pkgs/exporters/otlp/base/src/platform/node/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/util.ts b/pkgs/exporters/otlp/base/src/platform/node/util.ts similarity index 98% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/util.ts rename to pkgs/exporters/otlp/base/src/platform/node/util.ts index fd40981e8..b7558c32b 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/src/platform/node/util.ts +++ b/pkgs/exporters/otlp/base/src/platform/node/util.ts @@ -20,9 +20,9 @@ import * as zlib from 'zlib'; import { Readable } from 'stream'; import { OTLPExporterNodeBase } from './OTLPExporterNodeBase'; import { OTLPExporterNodeConfigBase } from '.'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { CompressionAlgorithm } from './types'; -import { getEnv } from '@opentelemetry/core'; +import { getEnv } from '@opentelemetry/sandbox-core'; import { OTLPExporterError } from '../../types'; import { DEFAULT_EXPORT_MAX_ATTEMPTS, diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/types.ts b/pkgs/exporters/otlp/base/src/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/types.ts rename to pkgs/exporters/otlp/base/src/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/src/util.ts b/pkgs/exporters/otlp/base/src/util.ts similarity index 97% rename from auto-merge/js/experimental/packages/otlp-exporter-base/src/util.ts rename to pkgs/exporters/otlp/base/src/util.ts index f5dc70c9e..0a8b9268d 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/src/util.ts +++ b/pkgs/exporters/otlp/base/src/util.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { getEnv } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { getEnv } from '@opentelemetry/sandbox-core'; const DEFAULT_TRACE_TIMEOUT = 10000; export const DEFAULT_EXPORT_MAX_ATTEMPTS = 5; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/index-webpack.ts b/pkgs/exporters/otlp/base/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/index-webpack.ts rename to pkgs/exporters/otlp/base/test/browser/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/test/browser/util.test.ts b/pkgs/exporters/otlp/base/test/browser/util.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/test/browser/util.test.ts rename to pkgs/exporters/otlp/base/test/browser/util.test.ts diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts b/pkgs/exporters/otlp/base/test/common/CollectorExporter.test.ts similarity index 99% rename from auto-merge/js/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts rename to pkgs/exporters/otlp/base/test/common/CollectorExporter.test.ts index e3b36e704..8744d33a7 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/test/common/CollectorExporter.test.ts +++ b/pkgs/exporters/otlp/base/test/common/CollectorExporter.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResultCode } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { OTLPExporterBase } from '../../src/OTLPExporterBase'; diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/test/common/util.test.ts b/pkgs/exporters/otlp/base/test/common/util.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/otlp-exporter-base/test/common/util.test.ts rename to pkgs/exporters/otlp/base/test/common/util.test.ts index b00d1f36a..30bfc0cd0 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/test/common/util.test.ts +++ b/pkgs/exporters/otlp/base/test/common/util.test.ts @@ -16,7 +16,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { parseHeaders, appendResourcePathToUrl, diff --git a/pkgs/exporters/otlp/base/test/index-webpack.worker.ts b/pkgs/exporters/otlp/base/test/index-webpack.worker.ts new file mode 100644 index 000000000..a00999ebd --- /dev/null +++ b/pkgs/exporters/otlp/base/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./common', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/test/node/util.test.ts b/pkgs/exporters/otlp/base/test/node/util.test.ts similarity index 99% rename from auto-merge/js/experimental/packages/otlp-exporter-base/test/node/util.test.ts rename to pkgs/exporters/otlp/base/test/node/util.test.ts index b279e57b9..1d3f1e0d2 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/test/node/util.test.ts +++ b/pkgs/exporters/otlp/base/test/node/util.test.ts @@ -19,7 +19,7 @@ import { configureExporterTimeout, invalidTimeout } from '../../src/util'; import { sendWithHttp } from '../../src/platform/node/util'; import { CompressionAlgorithm } from '../../src/platform/node/types'; import { configureCompression } from '../../src/platform/node/util'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import * as sinon from 'sinon'; import { OTLPExporterNodeBase } from '../../src/platform/node/OTLPExporterNodeBase'; diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/test/testHelper.ts b/pkgs/exporters/otlp/base/test/testHelper.ts similarity index 97% rename from auto-merge/js/experimental/packages/otlp-exporter-base/test/testHelper.ts rename to pkgs/exporters/otlp/base/test/testHelper.ts index 41b0c9588..cd972f280 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/test/testHelper.ts +++ b/pkgs/exporters/otlp/base/test/testHelper.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; export interface SimpleTestObject { diff --git a/pkgs/exporters/otlp/base/tsconfig.esm.json b/pkgs/exporters/otlp/base/tsconfig.esm.json new file mode 100644 index 000000000..ed5341aa3 --- /dev/null +++ b/pkgs/exporters/otlp/base/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/base/tsconfig.esnext.json b/pkgs/exporters/otlp/base/tsconfig.esnext.json new file mode 100644 index 000000000..2f8a78e6b --- /dev/null +++ b/pkgs/exporters/otlp/base/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/base/tsconfig.json b/pkgs/exporters/otlp/base/tsconfig.json new file mode 100644 index 000000000..33f0e4587 --- /dev/null +++ b/pkgs/exporters/otlp/base/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/.eslintignore b/pkgs/exporters/otlp/logs/http/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/.eslintignore rename to pkgs/exporters/otlp/logs/http/.eslintignore diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/.eslintrc.js b/pkgs/exporters/otlp/logs/http/.eslintrc.js similarity index 69% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/.eslintrc.js rename to pkgs/exporters/otlp/logs/http/.eslintrc.js index 24f29328f..188bbc4bd 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/.eslintrc.js +++ b/pkgs/exporters/otlp/logs/http/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { node: true, browser: true, }, - ...require('../../../eslint.base.js'), + ...require('../../../../../eslint.base.js'), }; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/.npmignore b/pkgs/exporters/otlp/logs/http/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/.npmignore rename to pkgs/exporters/otlp/logs/http/.npmignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/LICENSE b/pkgs/exporters/otlp/logs/http/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/LICENSE rename to pkgs/exporters/otlp/logs/http/LICENSE diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/README.md b/pkgs/exporters/otlp/logs/http/README.md similarity index 94% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/README.md rename to pkgs/exporters/otlp/logs/http/README.md index 24f0d7f4a..f49588a09 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/README.md +++ b/pkgs/exporters/otlp/logs/http/README.md @@ -23,12 +23,12 @@ To see documentation and sample code for the metric exporter, see the [exporter- The OTLPLogExporter in Web expects the endpoint to end in `/v1/logs`. ```js -import { SeverityNumber } from '@opentelemetry/api-logs'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; import { LoggerProvider, BatchLogRecordProcessor, -} from '@opentelemetry/sdk-logs'; -import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; +} from '@opentelemetry/sandbox-sdk-logs'; +import { OTLPLogExporter } from '@opentelemetry/sandbox-exporter-logs-otlp-http'; // exporter options. see all options in OTLPExporterConfigBase const collectorOptions = { @@ -57,8 +57,8 @@ logger.emit({ import { LoggerProvider, BatchLogRecordProcessor, -} from '@opentelemetry/sdk-logs'; -import { OTLPLogsExporter } from '@opentelemetry/exporter-logs-otlp-http'; +} from '@opentelemetry/sandbox-sdk-logs'; +import { OTLPLogsExporter } from '@opentelemetry/sandbox-exporter-logs-otlp-http'; // exporter options. see all options in OTLPExporterNodeConfigBase const collectorOptions = { diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/karma.conf.js b/pkgs/exporters/otlp/logs/http/karma.conf.js similarity index 86% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/karma.conf.js rename to pkgs/exporters/otlp/logs/http/karma.conf.js index bfd7a0332..cfe8e31b1 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/karma.conf.js +++ b/pkgs/exporters/otlp/logs/http/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.base'); module.exports = config => { config.set( diff --git a/pkgs/exporters/otlp/logs/http/karma.debug.conf.js b/pkgs/exporters/otlp/logs/http/karma.debug.conf.js new file mode 100644 index 000000000..a1bfd3bf5 --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/logs/http/karma.webpack.js b/pkgs/exporters/otlp/logs/http/karma.webpack.js new file mode 100644 index 000000000..47c73d721 --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/logs/http/karma.worker.js b/pkgs/exporters/otlp/logs/http/karma.worker.js new file mode 100644 index 000000000..67e01945f --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/otlp/logs/http/package.json b/pkgs/exporters/otlp/logs/http/package.json new file mode 100644 index 000000000..912ce3d32 --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/package.json @@ -0,0 +1,137 @@ +{ + "name": "@opentelemetry/sandbox-exporter-logs-otlp-http", + "version": "0.41.2", + "publishConfig": { + "access": "public" + }, + "description": "OpenTelemetry Collector Logs Exporter allows user to send collected logs to the OpenTelemetry Collector", + "author": "OpenTelemetry Authors", + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-http", + "license": "Apache-2.0", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/open-telemetry/opentelemetry-js.git" + }, + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js/issues" + }, + "engines": { + "node": ">=14" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "tdd:browser": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "browser", + "tracing", + "profiling", + "logs", + "stats" + ], + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "sideEffects": false, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-api-logs": "0.41.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api-logs": "0.41.2" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-otlp-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-transformer": "0.41.2", + "@opentelemetry/sandbox-sdk-logs": "0.41.2" + } +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/http/rollup.config.js b/pkgs/exporters/otlp/logs/http/rollup.config.js new file mode 100644 index 000000000..de7673fdd --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.logs-otlp-http", inputName, "otel-exprtr.logs-otlp-http", version); diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/index.ts b/pkgs/exporters/otlp/logs/http/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/index.ts rename to pkgs/exporters/otlp/logs/http/src/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts b/pkgs/exporters/otlp/logs/http/src/platform/browser/OTLPLogExporter.ts similarity index 76% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts rename to pkgs/exporters/otlp/logs/http/src/platform/browser/OTLPLogExporter.ts index a7ecbbac9..037d22e49 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/browser/OTLPLogExporter.ts +++ b/pkgs/exporters/otlp/logs/http/src/platform/browser/OTLPLogExporter.ts @@ -17,12 +17,12 @@ import type { ReadableLogRecord, LogRecordExporter, -} from '@opentelemetry/sdk-logs'; -import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import type { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { OTLPExporterBrowserBase } from '@opentelemetry/otlp-exporter-base'; -import { baggageUtils, getEnv } from '@opentelemetry/core'; -import { createExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-sdk-logs'; +import type { OTLPExporterConfigBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import type { IExportLogsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; +import { OTLPExporterBrowserBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { baggageUtils, getEnv } from '@opentelemetry/sandbox-core'; +import { createExportLogsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; import { getDefaultUrl } from '../config'; diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/browser/index.ts b/pkgs/exporters/otlp/logs/http/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/browser/index.ts rename to pkgs/exporters/otlp/logs/http/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/config.ts b/pkgs/exporters/otlp/logs/http/src/platform/config.ts similarity index 93% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/config.ts rename to pkgs/exporters/otlp/logs/http/src/platform/config.ts index a41ee9646..7a50b712a 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/config.ts +++ b/pkgs/exporters/otlp/logs/http/src/platform/config.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { getEnv } from '@opentelemetry/core'; +import { getEnv } from '@opentelemetry/sandbox-core'; import { appendResourcePathToUrl, appendRootPathToUrlIfNeeded, OTLPExporterConfigBase, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/logs'; export const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/index.ts b/pkgs/exporters/otlp/logs/http/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/index.ts rename to pkgs/exporters/otlp/logs/http/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts b/pkgs/exporters/otlp/logs/http/src/platform/node/OTLPLogExporter.ts similarity index 79% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts rename to pkgs/exporters/otlp/logs/http/src/platform/node/OTLPLogExporter.ts index a1d101e87..f0d7b6165 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/node/OTLPLogExporter.ts +++ b/pkgs/exporters/otlp/logs/http/src/platform/node/OTLPLogExporter.ts @@ -17,12 +17,12 @@ import type { ReadableLogRecord, LogRecordExporter, -} from '@opentelemetry/sdk-logs'; -import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; -import type { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; -import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base'; -import { createExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-sdk-logs'; +import type { OTLPExporterNodeConfigBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import type { IExportLogsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; +import { OTLPExporterNodeBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { createExportLogsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; import { getDefaultUrl } from '../config'; diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/node/index.ts b/pkgs/exporters/otlp/logs/http/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/src/platform/node/index.ts rename to pkgs/exporters/otlp/logs/http/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts b/pkgs/exporters/otlp/logs/http/test/browser/OTLPLogExporter.test.ts similarity index 95% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts rename to pkgs/exporters/otlp/logs/http/test/browser/OTLPLogExporter.test.ts index 2443c97ef..a4b23647b 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts +++ b/pkgs/exporters/otlp/logs/http/test/browser/OTLPLogExporter.test.ts @@ -18,10 +18,10 @@ import * as sinon from 'sinon'; import * as Config from '../../src/platform/config'; import { OTLPLogExporter } from '../../src/platform/browser'; -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import { OTLPExporterConfigBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; import { mockedReadableLogRecord } from '../logHelper'; -import { ExportResultCode } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; describe('OTLPLogExporter', () => { let envSource: Record; diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/browser/index-webpack.ts b/pkgs/exporters/otlp/logs/http/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/browser/index-webpack.ts rename to pkgs/exporters/otlp/logs/http/test/browser/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/config.test.ts b/pkgs/exporters/otlp/logs/http/test/config.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/config.test.ts rename to pkgs/exporters/otlp/logs/http/test/config.test.ts diff --git a/pkgs/exporters/otlp/logs/http/test/index-webpack.worker.ts b/pkgs/exporters/otlp/logs/http/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts b/pkgs/exporters/otlp/logs/http/test/logHelper.ts similarity index 92% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts rename to pkgs/exporters/otlp/logs/http/test/logHelper.ts index 1d9461f87..05f8e35b3 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/logHelper.ts +++ b/pkgs/exporters/otlp/logs/http/test/logHelper.ts @@ -14,19 +14,19 @@ * limitations under the License. */ -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { Resource } from '@opentelemetry/resources'; +import { HrTime, TraceFlags } from '@opentelemetry/sandbox-api'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; -import { VERSION } from '@opentelemetry/core'; +import { VERSION } from '@opentelemetry/sandbox-core'; import { IAnyValue, IExportLogsServiceRequest, IKeyValue, ILogRecord, IResource, -} from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +} from '@opentelemetry/sandbox-otlp-transformer'; +import { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; export const mockedReadableLogRecord: ReadableLogRecord = { resource: Resource.default().merge( diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts b/pkgs/exporters/otlp/logs/http/test/node/OTLPLogExporter.test.ts similarity index 95% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts rename to pkgs/exporters/otlp/logs/http/test/node/OTLPLogExporter.test.ts index 2ae11142a..00c236ad3 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts +++ b/pkgs/exporters/otlp/logs/http/test/node/OTLPLogExporter.test.ts @@ -14,23 +14,23 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; import * as Config from '../../src/platform/config'; import { OTLPLogExporter } from '../../src/platform/node'; -import { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import { OTLPExporterNodeConfigBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; import { ensureExportLogsServiceRequestIsSet, ensureExportedLogRecordIsCorrect, mockedReadableLogRecord, } from '../logHelper'; import { PassThrough, Stream } from 'stream'; -import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { ExportResultCode } from '@opentelemetry/core'; +import { IExportLogsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; let fakeRequest: PassThrough; diff --git a/pkgs/exporters/otlp/logs/http/tsconfig.esm.json b/pkgs/exporters/otlp/logs/http/tsconfig.esm.json new file mode 100644 index 000000000..79a5d0d30 --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/http/tsconfig.esnext.json b/pkgs/exporters/otlp/logs/http/tsconfig.esnext.json new file mode 100644 index 000000000..39d28b9bc --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/http/tsconfig.json b/pkgs/exporters/otlp/logs/http/tsconfig.json new file mode 100644 index 000000000..d63950bc8 --- /dev/null +++ b/pkgs/exporters/otlp/logs/http/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintignore b/pkgs/exporters/otlp/logs/proto/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintignore rename to pkgs/exporters/otlp/logs/proto/.eslintignore diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js b/pkgs/exporters/otlp/logs/proto/.eslintrc.js similarity index 70% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js rename to pkgs/exporters/otlp/logs/proto/.eslintrc.js index 9cfb3fd42..d0bc5f818 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js +++ b/pkgs/exporters/otlp/logs/proto/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.base.js') + ...require('../../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.npmignore b/pkgs/exporters/otlp/logs/proto/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.npmignore rename to pkgs/exporters/otlp/logs/proto/.npmignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/LICENSE b/pkgs/exporters/otlp/logs/proto/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/LICENSE rename to pkgs/exporters/otlp/logs/proto/LICENSE diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/README.md b/pkgs/exporters/otlp/logs/proto/README.md similarity index 97% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/README.md rename to pkgs/exporters/otlp/logs/proto/README.md index 3a00476c3..3e8447a50 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/README.md +++ b/pkgs/exporters/otlp/logs/proto/README.md @@ -21,8 +21,8 @@ To see documentation and sample code for the metric exporter, see the [exporter- ## Example Setup ```js -const { LoggerProvider, SimpleLogRecordProcessor } = require('@opentelemetry/sdk-logs'); -const { OTLPLogsExporter } = require('@opentelemetry/exporter-logs-otlp-proto'); +const { LoggerProvider, SimpleLogRecordProcessor } = require('@opentelemetry/sandbox-sdk-logs'); +const { OTLPLogsExporter } = require('@opentelemetry/sandbox-exporter-logs-otlp-proto'); const collectorOptions = { url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/logs diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/karma.conf.js b/pkgs/exporters/otlp/logs/proto/karma.conf.js similarity index 86% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/karma.conf.js rename to pkgs/exporters/otlp/logs/proto/karma.conf.js index 4c60b54ed..79e6b5983 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/karma.conf.js +++ b/pkgs/exporters/otlp/logs/proto/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/exporters/otlp/logs/proto/karma.debug.conf.js b/pkgs/exporters/otlp/logs/proto/karma.debug.conf.js new file mode 100644 index 000000000..a1bfd3bf5 --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/logs/proto/karma.webpack.js b/pkgs/exporters/otlp/logs/proto/karma.webpack.js new file mode 100644 index 000000000..47c73d721 --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/logs/proto/karma.worker.js b/pkgs/exporters/otlp/logs/proto/karma.worker.js new file mode 100644 index 000000000..67e01945f --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/otlp/logs/proto/package.json b/pkgs/exporters/otlp/logs/proto/package.json new file mode 100644 index 000000000..e394dced0 --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/package.json @@ -0,0 +1,133 @@ +{ + "name": "@opentelemetry/sandbox-exporter-logs-otlp-proto", + "version": "0.41.2", + "description": "An OTLP exporter to send logs using protobuf over HTTP", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "protobuf", + "tracing", + "profiling", + "metrics", + "stats", + "logs" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "build/protos/**/*.proto", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-api-logs": "0.41.2", + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-otlp-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-proto-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-transformer": "0.41.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-sdk-logs": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/proto/rollup.config.js b/pkgs/exporters/otlp/logs/proto/rollup.config.js new file mode 100644 index 000000000..b6985bffe --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.logs-otlp-proto", inputName, "otel-exprtr.logs-otlp-proto", version); diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/index.ts b/pkgs/exporters/otlp/logs/proto/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/index.ts rename to pkgs/exporters/otlp/logs/proto/src/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts b/pkgs/exporters/otlp/logs/proto/src/platform/browser/OTLPLogsExporter.ts similarity index 89% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts rename to pkgs/exporters/otlp/logs/proto/src/platform/browser/OTLPLogsExporter.ts index 185d5094f..f1b3c71ca 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/OTLPLogsExporter.ts +++ b/pkgs/exporters/otlp/logs/proto/src/platform/browser/OTLPLogsExporter.ts @@ -14,22 +14,22 @@ * limitations under the License. */ -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; import { OTLPExporterConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { OTLPProtoExporterBrowserBase, ServiceClientType, -} from '@opentelemetry/otlp-proto-exporter-base'; +} from '@opentelemetry/sandbox-otlp-proto-exporter-base'; import { createExportLogsServiceRequest, IExportLogsServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; -import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; +import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sandbox-sdk-logs'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/logs'; const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/index.ts b/pkgs/exporters/otlp/logs/proto/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/browser/index.ts rename to pkgs/exporters/otlp/logs/proto/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/index.ts b/pkgs/exporters/otlp/logs/proto/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/index.ts rename to pkgs/exporters/otlp/logs/proto/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts b/pkgs/exporters/otlp/logs/proto/src/platform/node/OTLPLogsExporter.ts similarity index 89% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts rename to pkgs/exporters/otlp/logs/proto/src/platform/node/OTLPLogsExporter.ts index 88d97e21d..6978a62f3 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/OTLPLogsExporter.ts +++ b/pkgs/exporters/otlp/logs/proto/src/platform/node/OTLPLogsExporter.ts @@ -14,22 +14,22 @@ * limitations under the License. */ -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; import { OTLPExporterConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { OTLPProtoExporterNodeBase, ServiceClientType, -} from '@opentelemetry/otlp-proto-exporter-base'; +} from '@opentelemetry/sandbox-otlp-proto-exporter-base'; import { createExportLogsServiceRequest, IExportLogsServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; -import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sdk-logs'; +import { ReadableLogRecord, LogRecordExporter } from '@opentelemetry/sandbox-sdk-logs'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/logs'; const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/index.ts b/pkgs/exporters/otlp/logs/proto/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/src/platform/node/index.ts rename to pkgs/exporters/otlp/logs/proto/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogsExporter.test.ts b/pkgs/exporters/otlp/logs/proto/test/browser/OTLPLogsExporter.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/OTLPLogsExporter.test.ts rename to pkgs/exporters/otlp/logs/proto/test/browser/OTLPLogsExporter.test.ts diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/index-webpack.ts b/pkgs/exporters/otlp/logs/proto/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/browser/index-webpack.ts rename to pkgs/exporters/otlp/logs/proto/test/browser/index-webpack.ts diff --git a/pkgs/exporters/otlp/logs/proto/test/index-webpack.worker.ts b/pkgs/exporters/otlp/logs/proto/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts b/pkgs/exporters/otlp/logs/proto/test/logHelper.ts similarity index 92% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts rename to pkgs/exporters/otlp/logs/proto/test/logHelper.ts index 7b8c8e8b9..168a98760 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts +++ b/pkgs/exporters/otlp/logs/proto/test/logHelper.ts @@ -14,19 +14,19 @@ * limitations under the License. */ -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { Resource } from '@opentelemetry/resources'; +import { HrTime, TraceFlags } from '@opentelemetry/sandbox-api'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; -import { VERSION } from '@opentelemetry/core'; +import { VERSION } from '@opentelemetry/sandbox-core'; import { IAnyValue, IExportLogsServiceRequest, IKeyValue, ILogRecord, IResource, -} from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +} from '@opentelemetry/sandbox-otlp-transformer'; +import { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; import { Stream } from 'stream'; export const mockedReadableLogRecord: ReadableLogRecord = { diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogsExporter.test.ts b/pkgs/exporters/otlp/logs/proto/test/node/OTLPLogsExporter.test.ts similarity index 97% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogsExporter.test.ts rename to pkgs/exporters/otlp/logs/proto/test/node/OTLPLogsExporter.test.ts index 994a2f0ea..0d1a3f72d 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/test/node/OTLPLogsExporter.test.ts +++ b/pkgs/exporters/otlp/logs/proto/test/node/OTLPLogsExporter.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; @@ -32,13 +32,13 @@ import { CompressionAlgorithm, OTLPExporterNodeConfigBase, OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { getExportRequestProto, ServiceClientType, -} from '@opentelemetry/otlp-proto-exporter-base'; -import { IExportLogsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +} from '@opentelemetry/sandbox-otlp-proto-exporter-base'; +import { IExportLogsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; +import { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; let fakeRequest: PassThrough; diff --git a/pkgs/exporters/otlp/logs/proto/tsconfig.esm.json b/pkgs/exporters/otlp/logs/proto/tsconfig.esm.json new file mode 100644 index 000000000..79a5d0d30 --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/proto/tsconfig.esnext.json b/pkgs/exporters/otlp/logs/proto/tsconfig.esnext.json new file mode 100644 index 000000000..39d28b9bc --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/logs/proto/tsconfig.json b/pkgs/exporters/otlp/logs/proto/tsconfig.json new file mode 100644 index 000000000..d63950bc8 --- /dev/null +++ b/pkgs/exporters/otlp/logs/proto/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintignore b/pkgs/exporters/otlp/metrics/http/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintignore rename to pkgs/exporters/otlp/metrics/http/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/.eslintrc.js b/pkgs/exporters/otlp/metrics/http/.eslintrc.js similarity index 73% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/.eslintrc.js rename to pkgs/exporters/otlp/metrics/http/.eslintrc.js index 36847df9f..f99de8141 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/.eslintrc.js +++ b/pkgs/exporters/otlp/metrics/http/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.base.js') + ...require('../../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/.npmignore b/pkgs/exporters/otlp/metrics/http/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/.npmignore rename to pkgs/exporters/otlp/metrics/http/.npmignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/LICENSE b/pkgs/exporters/otlp/metrics/http/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/LICENSE rename to pkgs/exporters/otlp/metrics/http/LICENSE diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/pkgs/exporters/otlp/metrics/http/README.md similarity index 96% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md rename to pkgs/exporters/otlp/metrics/http/README.md index ba449280b..3d8b5f4b9 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md +++ b/pkgs/exporters/otlp/metrics/http/README.md @@ -26,8 +26,8 @@ the [Collector Trace Exporter for web and node][trace-exporter-url]. The OTLPMetricExporter in Web expects the endpoint to end in `/v1/metrics`. ```js -import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics'; -import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'; +import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sandbox-sdk-metrics'; +import { OTLPMetricExporter } from '@opentelemetry/sandbox-exporter-metrics-otlp-http'; const collectorOptions = { url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/metrics @@ -51,8 +51,8 @@ counter.add(10, { 'key': 'value' }); ## Metrics in Node ```js -const { MeterProvider, PeriodicExportingMetricReader } = require('@opentelemetry/sdk-metrics'); -const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-http'); +const { MeterProvider, PeriodicExportingMetricReader } = require('@opentelemetry/sandbox-sdk-metrics'); +const { OTLPMetricExporter } = require('@opentelemetry/sandbox-exporter-metrics-otlp-http'); const collectorOptions = { url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/metrics concurrencyLimit: 1, // an optional limit on pending requests diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/karma.conf.js b/pkgs/exporters/otlp/metrics/http/karma.conf.js similarity index 86% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/karma.conf.js rename to pkgs/exporters/otlp/metrics/http/karma.conf.js index 4c60b54ed..79e6b5983 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/karma.conf.js +++ b/pkgs/exporters/otlp/metrics/http/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/exporters/otlp/metrics/http/karma.debug.conf.js b/pkgs/exporters/otlp/metrics/http/karma.debug.conf.js new file mode 100644 index 000000000..a1bfd3bf5 --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/metrics/http/karma.webpack.js b/pkgs/exporters/otlp/metrics/http/karma.webpack.js new file mode 100644 index 000000000..47c73d721 --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/metrics/http/karma.worker.js b/pkgs/exporters/otlp/metrics/http/karma.worker.js new file mode 100644 index 000000000..67e01945f --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/pkgs/exporters/otlp/metrics/http/package.json similarity index 50% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json rename to pkgs/exporters/otlp/metrics/http/package.json index 6cfc836a0..0e407f872 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/pkgs/exporters/otlp/metrics/http/package.json @@ -1,5 +1,5 @@ { - "name": "@opentelemetry/exporter-metrics-otlp-http", + "name": "@opentelemetry/sandbox-exporter-metrics-otlp-http", "version": "0.41.2", "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", @@ -14,22 +14,27 @@ "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "build": "npm run compile && npm run package", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:browser": "karma start --single-run", - "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "npm run precompile", - "peer-api-check": "node ../../../scripts/peer-api-check.js", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" }, "keywords": [ "opentelemetry", @@ -64,43 +69,62 @@ }, "devDependencies": { "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", + "chromium": "^3.0.3", + "codecov": "^3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "karma": "6.4.2", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", "webpack-cli": "4.10.0", "webpack-merge": "5.9.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "@opentelemetry/sandbox-api": "1.4.1" }, "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/otlp-exporter-base": "0.41.2", - "@opentelemetry/otlp-transformer": "0.41.2", - "@opentelemetry/resources": "1.15.2", - "@opentelemetry/sdk-metrics": "1.15.2" + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-otlp-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-transformer": "0.41.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-sdk-metrics": "1.15.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http", "sideEffects": false -} +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/metrics/http/rollup.config.js b/pkgs/exporters/otlp/metrics/http/rollup.config.js new file mode 100644 index 000000000..79f9d1b6b --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.metrics-otlp-http", inputName, "otel-exprtr.metrics-otlp-http", version); diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts b/pkgs/exporters/otlp/metrics/http/src/OTLPMetricExporterBase.ts similarity index 92% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts rename to pkgs/exporters/otlp/metrics/http/src/OTLPMetricExporterBase.ts index 21177777f..f853bb70c 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/pkgs/exporters/otlp/metrics/http/src/OTLPMetricExporterBase.ts @@ -14,21 +14,21 @@ * limitations under the License. */ -import { ExportResult, getEnv } from '@opentelemetry/core'; +import { ExportResult, getEnv } from '@opentelemetry/sandbox-core'; import { AggregationTemporality, AggregationTemporalitySelector, InstrumentType, PushMetricExporter, ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; +} from '@opentelemetry/sandbox-sdk-metrics'; import { AggregationTemporalityPreference, OTLPMetricExporterOptions, } from './OTLPMetricExporterOptions'; -import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; -import { diag } from '@opentelemetry/api'; +import { OTLPExporterBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { IExportMetricsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; +import { diag } from '@opentelemetry/sandbox-api'; export const CumulativeTemporalitySelector: AggregationTemporalitySelector = () => AggregationTemporality.CUMULATIVE; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts b/pkgs/exporters/otlp/metrics/http/src/OTLPMetricExporterOptions.ts similarity index 84% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts rename to pkgs/exporters/otlp/metrics/http/src/OTLPMetricExporterOptions.ts index e03bde4e7..e4d353628 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts +++ b/pkgs/exporters/otlp/metrics/http/src/OTLPMetricExporterOptions.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { AggregationTemporality } from '@opentelemetry/sdk-metrics'; +import { OTLPExporterConfigBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { AggregationTemporality } from '@opentelemetry/sandbox-sdk-metrics'; export interface OTLPMetricExporterOptions extends OTLPExporterConfigBase { temporalityPreference?: diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/index.ts b/pkgs/exporters/otlp/metrics/http/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/index.ts rename to pkgs/exporters/otlp/metrics/http/src/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/pkgs/exporters/otlp/metrics/http/src/platform/browser/OTLPMetricExporter.ts similarity index 90% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts rename to pkgs/exporters/otlp/metrics/http/src/platform/browser/OTLPMetricExporter.ts index 73c99a069..1b38d819b 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/OTLPMetricExporter.ts +++ b/pkgs/exporters/otlp/metrics/http/src/platform/browser/OTLPMetricExporter.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import { baggageUtils, getEnv } from '@opentelemetry/core'; +import { ResourceMetrics } from '@opentelemetry/sandbox-sdk-metrics'; +import { baggageUtils, getEnv } from '@opentelemetry/sandbox-core'; import { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; import { OTLPMetricExporterBase } from '../../OTLPMetricExporterBase'; import { @@ -23,11 +23,11 @@ import { OTLPExporterConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { createExportMetricsServiceRequest, IExportMetricsServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/metrics'; const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/index.ts b/pkgs/exporters/otlp/metrics/http/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/browser/index.ts rename to pkgs/exporters/otlp/metrics/http/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/index.ts b/pkgs/exporters/otlp/metrics/http/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/index.ts rename to pkgs/exporters/otlp/metrics/http/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts b/pkgs/exporters/otlp/metrics/http/src/platform/node/OTLPMetricExporter.ts similarity index 91% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts rename to pkgs/exporters/otlp/metrics/http/src/platform/node/OTLPMetricExporter.ts index f83e414e7..65aa1c211 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/OTLPMetricExporter.ts +++ b/pkgs/exporters/otlp/metrics/http/src/platform/node/OTLPMetricExporter.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { ResourceMetrics } from '@opentelemetry/sandbox-sdk-metrics'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; import { OTLPMetricExporterOptions } from '../../OTLPMetricExporterOptions'; import { OTLPMetricExporterBase } from '../../OTLPMetricExporterBase'; import { @@ -23,11 +23,11 @@ import { OTLPExporterNodeConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { createExportMetricsServiceRequest, IExportMetricsServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; import { VERSION } from '../../version'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/metrics'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/index.ts b/pkgs/exporters/otlp/metrics/http/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/node/index.ts rename to pkgs/exporters/otlp/metrics/http/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts b/pkgs/exporters/otlp/metrics/http/test/browser/CollectorMetricExporter.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts rename to pkgs/exporters/otlp/metrics/http/test/browser/CollectorMetricExporter.test.ts index 053376b03..4876e19a4 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts +++ b/pkgs/exporters/otlp/metrics/http/test/browser/CollectorMetricExporter.test.ts @@ -20,9 +20,9 @@ import { DiagLogLevel, Counter, Histogram, -} from '@opentelemetry/api'; -import { ExportResultCode, hrTimeToNanoseconds } from '@opentelemetry/core'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; +} from '@opentelemetry/sandbox-api'; +import { ExportResultCode, hrTimeToNanoseconds } from '@opentelemetry/sandbox-core'; +import { ResourceMetrics } from '@opentelemetry/sandbox-sdk-metrics'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { OTLPMetricExporter } from '../../src/platform/browser'; @@ -45,8 +45,8 @@ import { AggregationTemporalityPreference, OTLPMetricExporterOptions, } from '../../src'; -import { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; +import { OTLPExporterConfigBase } from '@opentelemetry/sandbox-otlp-exporter-base'; +import { IExportMetricsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; describe('OTLPMetricExporter - web', () => { let collectorExporter: OTLPMetricExporter; diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/test/browser/index-webpack.ts b/pkgs/exporters/otlp/metrics/http/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/test/browser/index-webpack.ts rename to pkgs/exporters/otlp/metrics/http/test/browser/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts b/pkgs/exporters/otlp/metrics/http/test/common/CollectorMetricExporter.test.ts similarity index 95% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts rename to pkgs/exporters/otlp/metrics/http/test/common/CollectorMetricExporter.test.ts index 963328da7..94b831791 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/common/CollectorMetricExporter.test.ts +++ b/pkgs/exporters/otlp/metrics/http/test/common/CollectorMetricExporter.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { ExportResultCode } from '@opentelemetry/core'; -import { ResourceMetrics } from '@opentelemetry/sdk-metrics'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; +import { ResourceMetrics } from '@opentelemetry/sandbox-sdk-metrics'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { @@ -28,8 +28,8 @@ import { import { OTLPExporterBase, OTLPExporterConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; +import { IExportMetricsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; type CollectorExporterConfig = OTLPExporterConfigBase; diff --git a/pkgs/exporters/otlp/metrics/http/test/index-webpack.worker.ts b/pkgs/exporters/otlp/metrics/http/test/index-webpack.worker.ts new file mode 100644 index 000000000..a00999ebd --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./common', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts b/pkgs/exporters/otlp/metrics/http/test/metricsHelper.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts rename to pkgs/exporters/otlp/metrics/http/test/metricsHelper.ts index 6796c155f..9b46e8023 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts +++ b/pkgs/exporters/otlp/metrics/http/test/metricsHelper.ts @@ -22,22 +22,22 @@ import { ObservableCounter, ObservableGauge, ObservableUpDownCounter, -} from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-api'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; -import { InstrumentationScope, VERSION } from '@opentelemetry/core'; +import { InstrumentationScope, VERSION } from '@opentelemetry/sandbox-core'; import { ExplicitBucketHistogramAggregation, MeterProvider, MetricReader, View, -} from '@opentelemetry/sdk-metrics'; +} from '@opentelemetry/sandbox-sdk-metrics'; import { IExportMetricsServiceRequest, IKeyValue, IMetric, IResource, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; if (typeof Buffer === 'undefined') { (window as any).Buffer = { diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts b/pkgs/exporters/otlp/metrics/http/test/node/CollectorMetricExporter.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts rename to pkgs/exporters/otlp/metrics/http/test/node/CollectorMetricExporter.test.ts index 0844e5a9f..83703937f 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/CollectorMetricExporter.test.ts +++ b/pkgs/exporters/otlp/metrics/http/test/node/CollectorMetricExporter.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag, DiagLogger } from '@opentelemetry/api'; -import * as core from '@opentelemetry/core'; +import { diag, DiagLogger } from '@opentelemetry/sandbox-api'; +import * as core from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; @@ -46,13 +46,13 @@ import { AggregationTemporality, InstrumentType, ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; +} from '@opentelemetry/sandbox-sdk-metrics'; import { PassThrough, Stream } from 'stream'; import { OTLPExporterError, OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; +import { IExportMetricsServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; import { VERSION } from '../../src/version'; let fakeRequest: PassThrough; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts b/pkgs/exporters/otlp/metrics/http/test/node/nodeHelpers.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts rename to pkgs/exporters/otlp/metrics/http/test/node/nodeHelpers.ts diff --git a/pkgs/exporters/otlp/metrics/http/tsconfig.esm.json b/pkgs/exporters/otlp/metrics/http/tsconfig.esm.json new file mode 100644 index 000000000..79a5d0d30 --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/metrics/http/tsconfig.esnext.json b/pkgs/exporters/otlp/metrics/http/tsconfig.esnext.json new file mode 100644 index 000000000..39d28b9bc --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/metrics/http/tsconfig.json b/pkgs/exporters/otlp/metrics/http/tsconfig.json new file mode 100644 index 000000000..1840908a5 --- /dev/null +++ b/pkgs/exporters/otlp/metrics/http/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/.eslintignore b/pkgs/exporters/otlp/proto-base/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/.eslintignore rename to pkgs/exporters/otlp/proto-base/.eslintignore diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintrc.js b/pkgs/exporters/otlp/proto-base/.eslintrc.js similarity index 71% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintrc.js rename to pkgs/exporters/otlp/proto-base/.eslintrc.js index fe91e2104..5310d0835 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintrc.js +++ b/pkgs/exporters/otlp/proto-base/.eslintrc.js @@ -1,8 +1,8 @@ module.exports = { "env": { + "mocha": true, "commonjs": true, "node": true, - "mocha": true, }, - ...require('../../eslint.config.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/.gitignore b/pkgs/exporters/otlp/proto-base/.gitignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/.gitignore rename to pkgs/exporters/otlp/proto-base/.gitignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.npmignore b/pkgs/exporters/otlp/proto-base/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.npmignore rename to pkgs/exporters/otlp/proto-base/.npmignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/LICENSE b/pkgs/exporters/otlp/proto-base/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/LICENSE rename to pkgs/exporters/otlp/proto-base/LICENSE diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/README.md b/pkgs/exporters/otlp/proto-base/README.md similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/README.md rename to pkgs/exporters/otlp/proto-base/README.md diff --git a/pkgs/exporters/otlp/proto-base/package.json b/pkgs/exporters/otlp/proto-base/package.json new file mode 100644 index 000000000..fe80cf14d --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/package.json @@ -0,0 +1,124 @@ +{ + "name": "@opentelemetry/sandbox-otlp-proto-exporter-base", + "version": "0.41.2", + "description": "OpenTelemetry OTLP-HTTP-protobuf Exporter base (for internal use only)", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "compile": "npm run lint:fix-quiet && npm run version && npm run pre-build && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "pre-build": "npm run protos", + "prepublishOnly": "npm run compile", + "protos": "npm run submodule && npm run protos:generate", + "protos:generate": "node ../../../../scripts/generate-protos.js", + "rebuild": "npm run clean && npm run build", + "submodule": "git submodule sync --recursive && git submodule update --init --recursive", + "test": "", + "test:browser": "", + "test:debug": "", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "protobuf", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "protobufjs-cli": "1.1.1", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-otlp-exporter-base": "0.41.2", + "protobufjs": "^7.2.3" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/proto-base/protos b/pkgs/exporters/otlp/proto-base/protos new file mode 160000 index 000000000..81a296f9d --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/protos @@ -0,0 +1 @@ +Subproject commit 81a296f9dba23e32d77f46d58c8ea4244a2157a6 diff --git a/pkgs/exporters/otlp/proto-base/rollup.config.js b/pkgs/exporters/otlp/proto-base/rollup.config.js new file mode 100644 index 000000000..db3b46013 --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.otlp-proto-base", inputName, "otel-exprtr.otlp-proto-base", version); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/.gitkeep b/pkgs/exporters/otlp/proto-base/src/generated/.gitkeep similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/.gitkeep rename to pkgs/exporters/otlp/proto-base/src/generated/.gitkeep diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/index.ts b/pkgs/exporters/otlp/proto-base/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/index.ts rename to pkgs/exporters/otlp/proto-base/src/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts b/pkgs/exporters/otlp/proto-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts similarity index 95% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts rename to pkgs/exporters/otlp/proto-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts index 34c80d6e8..3fa537a19 100644 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts +++ b/pkgs/exporters/otlp/proto-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { ServiceClientType } from '../types'; import { OTLPExporterBrowserBase as OTLPExporterBaseMain, OTLPExporterError, OTLPExporterConfigBase, sendWithXhr, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { getExportRequestProto } from '../util'; diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/browser/index.ts b/pkgs/exporters/otlp/proto-base/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/browser/index.ts rename to pkgs/exporters/otlp/proto-base/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/index.ts b/pkgs/exporters/otlp/proto-base/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/index.ts rename to pkgs/exporters/otlp/proto-base/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts b/pkgs/exporters/otlp/proto-base/src/platform/node/OTLPProtoExporterNodeBase.ts similarity index 96% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts rename to pkgs/exporters/otlp/proto-base/src/platform/node/OTLPProtoExporterNodeBase.ts index c0ff4b6b3..059aa7703 100644 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts +++ b/pkgs/exporters/otlp/proto-base/src/platform/node/OTLPProtoExporterNodeBase.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { ServiceClientType } from '../types'; import { OTLPExporterNodeBase as OTLPExporterBaseMain, CompressionAlgorithm, OTLPExporterError, OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; type SendFn = ( collector: OTLPProtoExporterNodeBase, diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/index.ts b/pkgs/exporters/otlp/proto-base/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/index.ts rename to pkgs/exporters/otlp/proto-base/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/util.ts b/pkgs/exporters/otlp/proto-base/src/platform/node/util.ts similarity index 96% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/util.ts rename to pkgs/exporters/otlp/proto-base/src/platform/node/util.ts index 36fe866d6..202b09b18 100644 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/node/util.ts +++ b/pkgs/exporters/otlp/proto-base/src/platform/node/util.ts @@ -19,7 +19,7 @@ import { CompressionAlgorithm, OTLPExporterError, sendWithHttp, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { getExportRequestProto } from '../util'; diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/types.ts b/pkgs/exporters/otlp/proto-base/src/platform/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/types.ts rename to pkgs/exporters/otlp/proto-base/src/platform/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/util.ts b/pkgs/exporters/otlp/proto-base/src/platform/util.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/platform/util.ts rename to pkgs/exporters/otlp/proto-base/src/platform/util.ts diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/submodule.md b/pkgs/exporters/otlp/proto-base/submodule.md similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/submodule.md rename to pkgs/exporters/otlp/proto-base/submodule.md diff --git a/pkgs/exporters/otlp/proto-base/tsconfig.esm.json b/pkgs/exporters/otlp/proto-base/tsconfig.esm.json new file mode 100644 index 000000000..46366123e --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/tsconfig.esm.json @@ -0,0 +1,13 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "allowJs": true, + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts", + "src/generated/*.js" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/proto-base/tsconfig.esnext.json b/pkgs/exporters/otlp/proto-base/tsconfig.esnext.json new file mode 100644 index 000000000..77eb2e366 --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/tsconfig.esnext.json @@ -0,0 +1,13 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "allowJs": true, + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts", + "src/generated/*.js" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/proto-base/tsconfig.json b/pkgs/exporters/otlp/proto-base/tsconfig.json new file mode 100644 index 000000000..7e929808a --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "allowJs": true, + "outDir": "build", + "rootDir": "." + }, + "include": [ + "src/**/*.ts", + "src/generated/*.js", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintignore b/pkgs/exporters/otlp/trace/http/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintignore rename to pkgs/exporters/otlp/trace/http/.eslintignore diff --git a/pkgs/exporters/otlp/trace/http/.eslintrc.js b/pkgs/exporters/otlp/trace/http/.eslintrc.js new file mode 100644 index 000000000..f99de8141 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/.eslintrc.js @@ -0,0 +1,9 @@ +module.exports = { + "env": { + "mocha": true, + "commonjs": true, + "node": true, + "browser": true + }, + ...require('../../../../../eslint.base.js') +} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.npmignore b/pkgs/exporters/otlp/trace/http/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.npmignore rename to pkgs/exporters/otlp/trace/http/.npmignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/LICENSE b/pkgs/exporters/otlp/trace/http/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/LICENSE rename to pkgs/exporters/otlp/trace/http/LICENSE diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/README.md b/pkgs/exporters/otlp/trace/http/README.md similarity index 96% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/README.md rename to pkgs/exporters/otlp/trace/http/README.md index 141a4a276..db9e2b5be 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/README.md +++ b/pkgs/exporters/otlp/trace/http/README.md @@ -27,8 +27,8 @@ The OTLPTraceExporter in Web expects the endpoint to end in `/v1/traces`. import { BatchSpanProcessor, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; +} from '@opentelemetry/sandbox-sdk-trace-web'; +import { OTLPTraceExporter } from '@opentelemetry/sandbox-exporter-trace-otlp-http'; const collectorOptions = { url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/traces @@ -56,8 +56,8 @@ provider.register(); ## Traces in Node - JSON over http ```js -const { BasicTracerProvider, BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base'); -const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http'); +const { BasicTracerProvider, BatchSpanProcessor } = require('@opentelemetry/sandbox-sdk-trace-base'); +const { OTLPTraceExporter } = require('@opentelemetry/sandbox-exporter-trace-otlp-http'); const collectorOptions = { url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/traces diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/karma.conf.js b/pkgs/exporters/otlp/trace/http/karma.conf.js similarity index 86% rename from auto-merge/js/experimental/packages/otlp-exporter-base/karma.conf.js rename to pkgs/exporters/otlp/trace/http/karma.conf.js index 4c60b54ed..79e6b5983 100644 --- a/auto-merge/js/experimental/packages/otlp-exporter-base/karma.conf.js +++ b/pkgs/exporters/otlp/trace/http/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/exporters/otlp/trace/http/karma.debug.conf.js b/pkgs/exporters/otlp/trace/http/karma.debug.conf.js new file mode 100644 index 000000000..a1bfd3bf5 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/trace/http/karma.webpack.js b/pkgs/exporters/otlp/trace/http/karma.webpack.js new file mode 100644 index 000000000..47c73d721 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/trace/http/karma.worker.js b/pkgs/exporters/otlp/trace/http/karma.worker.js new file mode 100644 index 000000000..67e01945f --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/otlp/trace/http/package.json b/pkgs/exporters/otlp/trace/http/package.json new file mode 100644 index 000000000..06ef94be4 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/package.json @@ -0,0 +1,130 @@ +{ + "name": "@opentelemetry/sandbox-exporter-trace-otlp-http", + "version": "0.41.2", + "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "tdd:browser": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "browser", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-otlp-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-transformer": "0.41.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/trace/http/rollup.config.js b/pkgs/exporters/otlp/trace/http/rollup.config.js new file mode 100644 index 000000000..a008ee34b --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.trace-otlp-http", inputName, "otel-exprtr.trace-otlp-http", version); diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/index.ts b/pkgs/exporters/otlp/trace/http/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/index.ts rename to pkgs/exporters/otlp/trace/http/src/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/pkgs/exporters/otlp/trace/http/src/platform/browser/OTLPTraceExporter.ts similarity index 88% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts rename to pkgs/exporters/otlp/trace/http/src/platform/browser/OTLPTraceExporter.ts index 8a343306c..a59d17fe1 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts +++ b/pkgs/exporters/otlp/trace/http/src/platform/browser/OTLPTraceExporter.ts @@ -14,18 +14,18 @@ * limitations under the License. */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { ReadableSpan, SpanExporter } from '@opentelemetry/sandbox-sdk-trace-base'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; import { OTLPExporterConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, OTLPExporterBrowserBase, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { createExportTraceServiceRequest, IExportTraceServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/browser/index.ts b/pkgs/exporters/otlp/trace/http/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/browser/index.ts rename to pkgs/exporters/otlp/trace/http/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/index.ts b/pkgs/exporters/otlp/trace/http/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/platform/index.ts rename to pkgs/exporters/otlp/trace/http/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts b/pkgs/exporters/otlp/trace/http/src/platform/node/OTLPTraceExporter.ts similarity index 86% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts rename to pkgs/exporters/otlp/trace/http/src/platform/node/OTLPTraceExporter.ts index f10fbd0ec..b623af013 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts +++ b/pkgs/exporters/otlp/trace/http/src/platform/node/OTLPTraceExporter.ts @@ -14,18 +14,18 @@ * limitations under the License. */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; -import { OTLPExporterNodeBase } from '@opentelemetry/otlp-exporter-base'; +import { ReadableSpan, SpanExporter } from '@opentelemetry/sandbox-sdk-trace-base'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; +import { OTLPExporterNodeBase } from '@opentelemetry/sandbox-otlp-exporter-base'; import { OTLPExporterNodeConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { createExportTraceServiceRequest, IExportTraceServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; import { VERSION } from '../../version'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/node/index.ts b/pkgs/exporters/otlp/trace/http/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/src/platform/node/index.ts rename to pkgs/exporters/otlp/trace/http/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts b/pkgs/exporters/otlp/trace/http/test/browser/CollectorTraceExporter.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts rename to pkgs/exporters/otlp/trace/http/test/browser/CollectorTraceExporter.test.ts index 4e8bc1d6e..575e6d15b 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts +++ b/pkgs/exporters/otlp/trace/http/test/browser/CollectorTraceExporter.test.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import * as core from '@opentelemetry/core'; -import { diag, DiagLogger, DiagLogLevel } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import * as core from '@opentelemetry/sandbox-core'; +import { diag, DiagLogger, DiagLogLevel } from '@opentelemetry/sandbox-api'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { OTLPTraceExporter } from '../../src/platform/browser/index'; @@ -31,8 +31,8 @@ import { import { OTLPExporterConfigBase, OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; +import { IExportTraceServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; describe('OTLPTraceExporter - web', () => { let collectorTraceExporter: OTLPTraceExporter; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/browser/index-webpack.ts b/pkgs/exporters/otlp/trace/http/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/browser/index-webpack.ts rename to pkgs/exporters/otlp/trace/http/test/browser/index-webpack.ts diff --git a/pkgs/exporters/otlp/trace/http/test/index-webpack.worker.ts b/pkgs/exporters/otlp/trace/http/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts b/pkgs/exporters/otlp/trace/http/test/node/CollectorTraceExporter.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts rename to pkgs/exporters/otlp/trace/http/test/node/CollectorTraceExporter.test.ts index 9238260d3..24f540cf3 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts +++ b/pkgs/exporters/otlp/trace/http/test/node/CollectorTraceExporter.test.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { diag, DiagLogger } from '@opentelemetry/api'; -import * as core from '@opentelemetry/core'; +import { diag, DiagLogger } from '@opentelemetry/sandbox-api'; +import * as core from '@opentelemetry/sandbox-core'; import { CompressionAlgorithm, OTLPExporterError, OTLPExporterNodeConfigBase, -} from '@opentelemetry/otlp-exporter-base'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; @@ -35,7 +35,7 @@ import { } from '../traceHelper'; import { nextTick } from 'process'; import { MockedResponse } from './nodeHelpers'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; +import { IExportTraceServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; import { VERSION } from '../../src/version'; let fakeRequest: PassThrough; diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts b/pkgs/exporters/otlp/trace/http/test/node/nodeHelpers.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts rename to pkgs/exporters/otlp/trace/http/test/node/nodeHelpers.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/traceHelper.ts b/pkgs/exporters/otlp/trace/http/test/traceHelper.ts similarity index 97% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/traceHelper.ts rename to pkgs/exporters/otlp/trace/http/test/traceHelper.ts index 06e256d25..9920b41c0 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/test/traceHelper.ts +++ b/pkgs/exporters/otlp/trace/http/test/traceHelper.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { SpanStatusCode, TraceFlags } from '@opentelemetry/api'; +import { SpanStatusCode, TraceFlags } from '@opentelemetry/sandbox-api'; import { hexToBase64, InstrumentationLibrary, VERSION, -} from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import { ESpanKind, @@ -31,7 +31,7 @@ import { ILink, IResource, ISpan, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; if (typeof Buffer === 'undefined') { (window as any).Buffer = { diff --git a/pkgs/exporters/otlp/trace/http/tsconfig.esm.json b/pkgs/exporters/otlp/trace/http/tsconfig.esm.json new file mode 100644 index 000000000..79a5d0d30 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/trace/http/tsconfig.esnext.json b/pkgs/exporters/otlp/trace/http/tsconfig.esnext.json new file mode 100644 index 000000000..39d28b9bc --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/trace/http/tsconfig.json b/pkgs/exporters/otlp/trace/http/tsconfig.json new file mode 100644 index 000000000..1840908a5 --- /dev/null +++ b/pkgs/exporters/otlp/trace/http/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintignore b/pkgs/exporters/otlp/trace/proto/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintignore rename to pkgs/exporters/otlp/trace/proto/.eslintignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js b/pkgs/exporters/otlp/trace/proto/.eslintrc.js similarity index 70% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js rename to pkgs/exporters/otlp/trace/proto/.eslintrc.js index 9cfb3fd42..d0bc5f818 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js +++ b/pkgs/exporters/otlp/trace/proto/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../../eslint.base.js') + ...require('../../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.npmignore b/pkgs/exporters/otlp/trace/proto/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.npmignore rename to pkgs/exporters/otlp/trace/proto/.npmignore diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/LICENSE b/pkgs/exporters/otlp/trace/proto/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/LICENSE rename to pkgs/exporters/otlp/trace/proto/LICENSE diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/README.md b/pkgs/exporters/otlp/trace/proto/README.md similarity index 97% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/README.md rename to pkgs/exporters/otlp/trace/proto/README.md index 0be283beb..04133f021 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/README.md +++ b/pkgs/exporters/otlp/trace/proto/README.md @@ -22,8 +22,8 @@ To see documentation and sample code for the metric exporter, see the [exporter- ## Traces in Node - PROTO over http ```js -const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base'); -const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-proto'); +const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sandbox-sdk-trace-base'); +const { OTLPTraceExporter } = require('@opentelemetry/sandbox-exporter-trace-otlp-proto'); const collectorOptions = { url: '', // url is optional and can be omitted - default is http://localhost:4318/v1/traces diff --git a/pkgs/exporters/otlp/trace/proto/karma.conf.js b/pkgs/exporters/otlp/trace/proto/karma.conf.js new file mode 100644 index 000000000..79e6b5983 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/karma.conf.js @@ -0,0 +1,26 @@ +/*! + * 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 + * + * 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. + */ + +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.base'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + files: ['test/browser/index-webpack.ts'], + preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] } + })) +}; diff --git a/pkgs/exporters/otlp/trace/proto/karma.debug.conf.js b/pkgs/exporters/otlp/trace/proto/karma.debug.conf.js new file mode 100644 index 000000000..a1bfd3bf5 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/trace/proto/karma.webpack.js b/pkgs/exporters/otlp/trace/proto/karma.webpack.js new file mode 100644 index 000000000..47c73d721 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/trace/proto/karma.worker.js b/pkgs/exporters/otlp/trace/proto/karma.worker.js new file mode 100644 index 000000000..67e01945f --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/otlp/trace/proto/package.json b/pkgs/exporters/otlp/trace/proto/package.json new file mode 100644 index 000000000..46098c37a --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/package.json @@ -0,0 +1,130 @@ +{ + "name": "@opentelemetry/sandbox-exporter-trace-otlp-proto", + "version": "0.41.2", + "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "protobuf", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "build/protos/**/*.proto", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cpx": "1.5.0", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-otlp-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-proto-exporter-base": "0.41.2", + "@opentelemetry/sandbox-otlp-transformer": "0.41.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/trace/proto/rollup.config.js b/pkgs/exporters/otlp/trace/proto/rollup.config.js new file mode 100644 index 000000000..e98d71709 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.trace-otlp-proto", inputName, "otel-exprtr.trace-otlp-proto", version); diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/index.ts b/pkgs/exporters/otlp/trace/proto/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/index.ts rename to pkgs/exporters/otlp/trace/proto/src/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts b/pkgs/exporters/otlp/trace/proto/src/platform/browser/OTLPTraceExporter.ts similarity index 86% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts rename to pkgs/exporters/otlp/trace/proto/src/platform/browser/OTLPTraceExporter.ts index 890268333..e9e52321c 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts +++ b/pkgs/exporters/otlp/trace/proto/src/platform/browser/OTLPTraceExporter.ts @@ -14,21 +14,21 @@ * limitations under the License. */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { ReadableSpan, SpanExporter } from '@opentelemetry/sandbox-sdk-trace-base'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; import { OTLPExporterConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { OTLPProtoExporterBrowserBase, ServiceClientType, -} from '@opentelemetry/otlp-proto-exporter-base'; +} from '@opentelemetry/sandbox-otlp-proto-exporter-base'; import { createExportTraceServiceRequest, IExportTraceServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/index.ts b/pkgs/exporters/otlp/trace/proto/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/browser/index.ts rename to pkgs/exporters/otlp/trace/proto/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/index.ts b/pkgs/exporters/otlp/trace/proto/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/index.ts rename to pkgs/exporters/otlp/trace/proto/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts b/pkgs/exporters/otlp/trace/proto/src/platform/node/OTLPTraceExporter.ts similarity index 87% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts rename to pkgs/exporters/otlp/trace/proto/src/platform/node/OTLPTraceExporter.ts index 210a16145..a740ce80c 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/node/OTLPTraceExporter.ts +++ b/pkgs/exporters/otlp/trace/proto/src/platform/node/OTLPTraceExporter.ts @@ -14,21 +14,21 @@ * limitations under the License. */ -import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; -import { getEnv, baggageUtils } from '@opentelemetry/core'; +import { ReadableSpan, SpanExporter } from '@opentelemetry/sandbox-sdk-trace-base'; +import { getEnv, baggageUtils } from '@opentelemetry/sandbox-core'; import { OTLPExporterNodeConfigBase, appendResourcePathToUrl, appendRootPathToUrlIfNeeded, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { OTLPProtoExporterNodeBase, ServiceClientType, -} from '@opentelemetry/otlp-proto-exporter-base'; +} from '@opentelemetry/sandbox-otlp-proto-exporter-base'; import { createExportTraceServiceRequest, IExportTraceServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; import { VERSION } from '../../version'; const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/node/index.ts b/pkgs/exporters/otlp/trace/proto/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/src/platform/node/index.ts rename to pkgs/exporters/otlp/trace/proto/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/browser/CollectorTraceExporter.test.ts b/pkgs/exporters/otlp/trace/proto/test/browser/CollectorTraceExporter.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/browser/CollectorTraceExporter.test.ts rename to pkgs/exporters/otlp/trace/proto/test/browser/CollectorTraceExporter.test.ts diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/browser/index-webpack.ts b/pkgs/exporters/otlp/trace/proto/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/browser/index-webpack.ts rename to pkgs/exporters/otlp/trace/proto/test/browser/index-webpack.ts diff --git a/pkgs/exporters/otlp/trace/proto/test/index-webpack.worker.ts b/pkgs/exporters/otlp/trace/proto/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts b/pkgs/exporters/otlp/trace/proto/test/node/OTLPTraceExporter.test.ts similarity index 97% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts rename to pkgs/exporters/otlp/trace/proto/test/node/OTLPTraceExporter.test.ts index c0a604ce9..74f4e33ec 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/node/OTLPTraceExporter.test.ts +++ b/pkgs/exporters/otlp/trace/proto/test/node/OTLPTraceExporter.test.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResultCode } from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import { diag } from '@opentelemetry/sandbox-api'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import * as http from 'http'; import * as sinon from 'sinon'; @@ -33,12 +33,12 @@ import { CompressionAlgorithm, OTLPExporterNodeConfigBase, OTLPExporterError, -} from '@opentelemetry/otlp-exporter-base'; +} from '@opentelemetry/sandbox-otlp-exporter-base'; import { getExportRequestProto, ServiceClientType, -} from '@opentelemetry/otlp-proto-exporter-base'; -import { IExportTraceServiceRequest } from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-proto-exporter-base'; +import { IExportTraceServiceRequest } from '@opentelemetry/sandbox-otlp-transformer'; import { VERSION } from '../../src/version'; let fakeRequest: PassThrough; diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts b/pkgs/exporters/otlp/trace/proto/test/traceHelper.ts similarity index 95% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts rename to pkgs/exporters/otlp/trace/proto/test/traceHelper.ts index 5e2b71c57..aef2155c0 100644 --- a/auto-merge/js/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts +++ b/pkgs/exporters/otlp/trace/proto/test/traceHelper.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { hexToBase64 } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import { SpanStatusCode, TraceFlags } from '@opentelemetry/sandbox-api'; +import { hexToBase64 } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import { Stream } from 'stream'; import { @@ -26,7 +26,7 @@ import { IKeyValue, ILink, ISpan, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; const traceIdHex = '1f1008dc8e270e85c40a0d7c3939b278'; const spanIdHex = '5e107261f64fa53e'; diff --git a/pkgs/exporters/otlp/trace/proto/tsconfig.esm.json b/pkgs/exporters/otlp/trace/proto/tsconfig.esm.json new file mode 100644 index 000000000..79a5d0d30 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/trace/proto/tsconfig.esnext.json b/pkgs/exporters/otlp/trace/proto/tsconfig.esnext.json new file mode 100644 index 000000000..39d28b9bc --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/trace/proto/tsconfig.json b/pkgs/exporters/otlp/trace/proto/tsconfig.json new file mode 100644 index 000000000..d63950bc8 --- /dev/null +++ b/pkgs/exporters/otlp/trace/proto/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/otlp-transformer/.eslintignore b/pkgs/exporters/otlp/transformer/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/.eslintignore rename to pkgs/exporters/otlp/transformer/.eslintignore diff --git a/auto-merge/js/experimental/packages/otlp-transformer/.eslintrc.js b/pkgs/exporters/otlp/transformer/.eslintrc.js similarity index 73% rename from auto-merge/js/experimental/packages/otlp-transformer/.eslintrc.js rename to pkgs/exporters/otlp/transformer/.eslintrc.js index 0fe1bbf97..feb677d23 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/.eslintrc.js +++ b/pkgs/exporters/otlp/transformer/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.base.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/otlp-transformer/.gitignore b/pkgs/exporters/otlp/transformer/.gitignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/.gitignore rename to pkgs/exporters/otlp/transformer/.gitignore diff --git a/auto-merge/js/experimental/packages/otlp-transformer/README.md b/pkgs/exporters/otlp/transformer/README.md similarity index 97% rename from auto-merge/js/experimental/packages/otlp-transformer/README.md rename to pkgs/exporters/otlp/transformer/README.md index b91b6d06d..21f003022 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/README.md +++ b/pkgs/exporters/otlp/transformer/README.md @@ -28,7 +28,7 @@ import { createExportTraceServiceRequest, createExportMetricsServiceRequest, createExportLogsServiceRequest, -} from '@opentelemetry/otlp-transformer'; +} from '@opentelemetry/sandbox-otlp-transformer'; const serializedSpans = createExportTraceServiceRequest(readableSpans); const serializedMetrics = createExportMetricsServiceRequest(readableMetrics); diff --git a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/karma.conf.js b/pkgs/exporters/otlp/transformer/karma.conf.js similarity index 85% rename from auto-merge/js/experimental/packages/opentelemetry-browser-detector/karma.conf.js rename to pkgs/exporters/otlp/transformer/karma.conf.js index 6174839d6..85d2051a4 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-browser-detector/karma.conf.js +++ b/pkgs/exporters/otlp/transformer/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/exporters/otlp/transformer/karma.debug.conf.js b/pkgs/exporters/otlp/transformer/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/exporters/otlp/transformer/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/otlp/transformer/karma.webpack.js b/pkgs/exporters/otlp/transformer/karma.webpack.js new file mode 100644 index 000000000..347cb8e58 --- /dev/null +++ b/pkgs/exporters/otlp/transformer/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/otlp/transformer/karma.worker.js b/pkgs/exporters/otlp/transformer/karma.worker.js new file mode 100644 index 000000000..adf99bbef --- /dev/null +++ b/pkgs/exporters/otlp/transformer/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/otlp/transformer/package.json b/pkgs/exporters/otlp/transformer/package.json new file mode 100644 index 000000000..3ed8d8c5d --- /dev/null +++ b/pkgs/exporters/otlp/transformer/package.json @@ -0,0 +1,119 @@ +{ + "name": "@opentelemetry/sandbox-otlp-transformer", + "private": false, + "publishConfig": { + "access": "public" + }, + "version": "0.41.2", + "description": "Transform OpenTelemetry SDK data into OTLP", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "main": "build/src/index.js", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "grpc", + "protobuf", + "otlp", + "tracing", + "metrics" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "LICENSE", + "README.md" + ], + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "devDependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "dependencies": { + "@opentelemetry/sandbox-api-logs": "0.41.2", + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-sdk-logs": "0.41.2", + "@opentelemetry/sandbox-sdk-metrics": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/transformer/rollup.config.js b/pkgs/exporters/otlp/transformer/rollup.config.js new file mode 100644 index 000000000..a989856f5 --- /dev/null +++ b/pkgs/exporters/otlp/transformer/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.otlp-transformer", inputName, "otel-exprtr.otlp-transformer", version); diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/common/internal.ts b/pkgs/exporters/otlp/transformer/src/common/internal.ts similarity index 96% rename from auto-merge/js/experimental/packages/otlp-transformer/src/common/internal.ts rename to pkgs/exporters/otlp/transformer/src/common/internal.ts index 0fe649f52..1b2ae63b4 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/src/common/internal.ts +++ b/pkgs/exporters/otlp/transformer/src/common/internal.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import type { IAnyValue, IKeyValue } from './types'; -import { Attributes } from '@opentelemetry/api'; +import { Attributes } from '@opentelemetry/sandbox-api'; export function toAttributes(attributes: Attributes): IKeyValue[] { return Object.keys(attributes).map(key => toKeyValue(key, attributes[key])); diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/common/types.ts b/pkgs/exporters/otlp/transformer/src/common/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/src/common/types.ts rename to pkgs/exporters/otlp/transformer/src/common/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/index.ts b/pkgs/exporters/otlp/transformer/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/src/index.ts rename to pkgs/exporters/otlp/transformer/src/index.ts diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/logs/index.ts b/pkgs/exporters/otlp/transformer/src/logs/index.ts similarity index 92% rename from auto-merge/js/experimental/packages/otlp-transformer/src/logs/index.ts rename to pkgs/exporters/otlp/transformer/src/logs/index.ts index c49947649..9a0b13a74 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/src/logs/index.ts +++ b/pkgs/exporters/otlp/transformer/src/logs/index.ts @@ -14,19 +14,19 @@ * limitations under the License. */ -import type { ReadableLogRecord } from '@opentelemetry/sdk-logs'; +import type { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; import { ESeverityNumber, IExportLogsServiceRequest, ILogRecord, IResourceLogs, } from './types'; -import { IResource } from '@opentelemetry/resources'; +import { IResource } from '@opentelemetry/sandbox-resources'; import { toAnyValue, toAttributes, toKeyValue } from '../common/internal'; -import { hexToBase64, hrTimeToNanoseconds } from '@opentelemetry/core'; -import { SeverityNumber } from '@opentelemetry/api-logs'; +import { hexToBase64, hrTimeToNanoseconds } from '@opentelemetry/sandbox-core'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; import { IKeyValue } from '../common/types'; -import { LogAttributes } from '@opentelemetry/api-logs'; +import { LogAttributes } from '@opentelemetry/sandbox-api-logs'; export function createExportLogsServiceRequest( logRecords: ReadableLogRecord[], diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/logs/types.ts b/pkgs/exporters/otlp/transformer/src/logs/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/src/logs/types.ts rename to pkgs/exporters/otlp/transformer/src/logs/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/metrics/index.ts b/pkgs/exporters/otlp/transformer/src/metrics/index.ts similarity index 92% rename from auto-merge/js/experimental/packages/otlp-transformer/src/metrics/index.ts rename to pkgs/exporters/otlp/transformer/src/metrics/index.ts index 5cef667c7..7a63b7935 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/src/metrics/index.ts +++ b/pkgs/exporters/otlp/transformer/src/metrics/index.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { ResourceMetrics } from '@opentelemetry/sdk-metrics'; +import type { ResourceMetrics } from '@opentelemetry/sandbox-sdk-metrics'; import type { IExportMetricsServiceRequest } from './types'; import { toResourceMetrics } from './internal'; diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/metrics/internal.ts b/pkgs/exporters/otlp/transformer/src/metrics/internal.ts similarity index 96% rename from auto-merge/js/experimental/packages/otlp-transformer/src/metrics/internal.ts rename to pkgs/exporters/otlp/transformer/src/metrics/internal.ts index b73696b0a..eb9b3eb86 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/src/metrics/internal.ts +++ b/pkgs/exporters/otlp/transformer/src/metrics/internal.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ValueType } from '@opentelemetry/api'; -import { hrTimeToNanoseconds } from '@opentelemetry/core'; +import { ValueType } from '@opentelemetry/sandbox-api'; +import { hrTimeToNanoseconds } from '@opentelemetry/sandbox-core'; import { AggregationTemporality, DataPoint, @@ -24,7 +24,7 @@ import { MetricData, ResourceMetrics, ScopeMetrics, -} from '@opentelemetry/sdk-metrics'; +} from '@opentelemetry/sandbox-sdk-metrics'; import { toAttributes } from '../common/internal'; import { EAggregationTemporality, diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/metrics/types.ts b/pkgs/exporters/otlp/transformer/src/metrics/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/src/metrics/types.ts rename to pkgs/exporters/otlp/transformer/src/metrics/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/resource/types.ts b/pkgs/exporters/otlp/transformer/src/resource/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/src/resource/types.ts rename to pkgs/exporters/otlp/transformer/src/resource/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/trace/index.ts b/pkgs/exporters/otlp/transformer/src/trace/index.ts similarity index 95% rename from auto-merge/js/experimental/packages/otlp-transformer/src/trace/index.ts rename to pkgs/exporters/otlp/transformer/src/trace/index.ts index ad06612a1..c5ba30d01 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/src/trace/index.ts +++ b/pkgs/exporters/otlp/transformer/src/trace/index.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { IResource } from '@opentelemetry/resources'; -import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import type { IResource } from '@opentelemetry/sandbox-resources'; +import type { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import { toAttributes } from '../common/internal'; import { sdkSpanToOtlpSpan } from './internal'; import { diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/trace/internal.ts b/pkgs/exporters/otlp/transformer/src/trace/internal.ts similarity index 91% rename from auto-merge/js/experimental/packages/otlp-transformer/src/trace/internal.ts rename to pkgs/exporters/otlp/transformer/src/trace/internal.ts index 6811a8182..f1e45bb5e 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/src/trace/internal.ts +++ b/pkgs/exporters/otlp/transformer/src/trace/internal.ts @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { Link } from '@opentelemetry/api'; -import { hrTimeToNanoseconds } from '@opentelemetry/core'; -import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base'; +import type { Link } from '@opentelemetry/sandbox-api'; +import { hrTimeToNanoseconds } from '@opentelemetry/sandbox-core'; +import type { ReadableSpan, TimedEvent } from '@opentelemetry/sandbox-sdk-trace-base'; import { toAttributes } from '../common/internal'; import { EStatusCode, IEvent, ILink, ISpan } from './types'; -import * as core from '@opentelemetry/core'; +import * as core from '@opentelemetry/sandbox-core'; export function sdkSpanToOtlpSpan(span: ReadableSpan, useHex?: boolean): ISpan { const ctx = span.spanContext(); diff --git a/auto-merge/js/experimental/packages/otlp-transformer/src/trace/types.ts b/pkgs/exporters/otlp/transformer/src/trace/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/src/trace/types.ts rename to pkgs/exporters/otlp/transformer/src/trace/types.ts diff --git a/auto-merge/js/experimental/packages/otlp-transformer/test/common.test.ts b/pkgs/exporters/otlp/transformer/test/common.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/test/common.test.ts rename to pkgs/exporters/otlp/transformer/test/common.test.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/index-webpack.ts b/pkgs/exporters/otlp/transformer/test/index-webpack.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/index-webpack.ts rename to pkgs/exporters/otlp/transformer/test/index-webpack.ts diff --git a/pkgs/exporters/otlp/transformer/test/index-webpack.worker.ts b/pkgs/exporters/otlp/transformer/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/exporters/otlp/transformer/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/otlp-transformer/test/logs.test.ts b/pkgs/exporters/otlp/transformer/test/logs.test.ts similarity index 95% rename from auto-merge/js/experimental/packages/otlp-transformer/test/logs.test.ts rename to pkgs/exporters/otlp/transformer/test/logs.test.ts index ef0a4cf9d..e7dcde14a 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/test/logs.test.ts +++ b/pkgs/exporters/otlp/transformer/test/logs.test.ts @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { HrTime, TraceFlags } from '@opentelemetry/api'; -import { InstrumentationScope, hexToBase64 } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +import { HrTime, TraceFlags } from '@opentelemetry/sandbox-api'; +import { InstrumentationScope, hexToBase64 } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; import { createExportLogsServiceRequest, ESeverityNumber, IExportLogsServiceRequest, } from '../src'; -import { ReadableLogRecord } from '@opentelemetry/sdk-logs'; -import { SeverityNumber } from '@opentelemetry/api-logs'; +import { ReadableLogRecord } from '@opentelemetry/sandbox-sdk-logs'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; function createExpectedLogJson(useHex: boolean): IExportLogsServiceRequest { const traceId = useHex diff --git a/auto-merge/js/experimental/packages/otlp-transformer/test/metrics.test.ts b/pkgs/exporters/otlp/transformer/test/metrics.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/otlp-transformer/test/metrics.test.ts rename to pkgs/exporters/otlp/transformer/test/metrics.test.ts index 748ef7588..34ef32dd2 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/test/metrics.test.ts +++ b/pkgs/exporters/otlp/transformer/test/metrics.test.ts @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ValueType } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; +import { ValueType } from '@opentelemetry/sandbox-api'; +import { Resource } from '@opentelemetry/sandbox-resources'; import { AggregationTemporality, DataPointType, InstrumentType, MetricData, ResourceMetrics, -} from '@opentelemetry/sdk-metrics'; +} from '@opentelemetry/sandbox-sdk-metrics'; import * as assert from 'assert'; import { createExportMetricsServiceRequest } from '../src/metrics'; import { EAggregationTemporality } from '../src/metrics/types'; -import { hrTime, hrTimeToNanoseconds } from '@opentelemetry/core'; +import { hrTime, hrTimeToNanoseconds } from '@opentelemetry/sandbox-core'; const START_TIME = hrTime(); const END_TIME = hrTime(); diff --git a/auto-merge/js/experimental/packages/otlp-transformer/test/trace.test.ts b/pkgs/exporters/otlp/transformer/test/trace.test.ts similarity index 97% rename from auto-merge/js/experimental/packages/otlp-transformer/test/trace.test.ts rename to pkgs/exporters/otlp/transformer/test/trace.test.ts index 9fb0e3cbf..371c554ff 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/test/trace.test.ts +++ b/pkgs/exporters/otlp/transformer/test/trace.test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { SpanKind, SpanStatusCode, TraceFlags } from '@opentelemetry/api'; -import { TraceState, hexToBase64 } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import { SpanKind, SpanStatusCode, TraceFlags } from '@opentelemetry/sandbox-api'; +import { TraceState, hexToBase64 } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import { createExportTraceServiceRequest, diff --git a/pkgs/exporters/otlp/transformer/tsconfig.esm.json b/pkgs/exporters/otlp/transformer/tsconfig.esm.json new file mode 100644 index 000000000..ed5341aa3 --- /dev/null +++ b/pkgs/exporters/otlp/transformer/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/transformer/tsconfig.esnext.json b/pkgs/exporters/otlp/transformer/tsconfig.esnext.json new file mode 100644 index 000000000..2f8a78e6b --- /dev/null +++ b/pkgs/exporters/otlp/transformer/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/otlp/transformer/tsconfig.json b/pkgs/exporters/otlp/transformer/tsconfig.json new file mode 100644 index 000000000..33f0e4587 --- /dev/null +++ b/pkgs/exporters/otlp/transformer/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintignore b/pkgs/exporters/zipkin/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintignore rename to pkgs/exporters/zipkin/.eslintignore diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/.eslintrc.js b/pkgs/exporters/zipkin/.eslintrc.js similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/.eslintrc.js rename to pkgs/exporters/zipkin/.eslintrc.js diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/.npmignore b/pkgs/exporters/zipkin/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/.npmignore rename to pkgs/exporters/zipkin/.npmignore diff --git a/auto-merge/js/experimental/packages/sdk-logs/LICENSE b/pkgs/exporters/zipkin/LICENSE similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/LICENSE rename to pkgs/exporters/zipkin/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/README.md b/pkgs/exporters/zipkin/README.md similarity index 97% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/README.md rename to pkgs/exporters/zipkin/README.md index 8dcb1e229..8b9c43ddb 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/README.md +++ b/pkgs/exporters/zipkin/README.md @@ -18,7 +18,7 @@ npm install --save @opentelemetry/exporter-zipkin Install the exporter on your application and pass the options. `serviceName` is an optional string. If omitted, the exporter will first try to get the service name from the Resource. If no service name can be detected on the Resource, a fallback name of "OpenTelemetry Service" will be used. ```js -const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin'); +const { ZipkinExporter } = require('@opentelemetry/sandbox-exporter-zipkin'); // Add your zipkin url (`http://localhost:9411/api/v2/spans` is used as // default) and application name to the Zipkin options. diff --git a/auto-merge/js/experimental/packages/exporter-logs-otlp-proto/karma.conf.js b/pkgs/exporters/zipkin/karma.conf.js similarity index 100% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-proto/karma.conf.js rename to pkgs/exporters/zipkin/karma.conf.js diff --git a/pkgs/exporters/zipkin/karma.debug.conf.js b/pkgs/exporters/zipkin/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/exporters/zipkin/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/exporters/zipkin/karma.webpack.js b/pkgs/exporters/zipkin/karma.webpack.js new file mode 100644 index 000000000..bc821e073 --- /dev/null +++ b/pkgs/exporters/zipkin/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/exporters/zipkin/karma.worker.js b/pkgs/exporters/zipkin/karma.worker.js new file mode 100644 index 000000000..eb6ee53e9 --- /dev/null +++ b/pkgs/exporters/zipkin/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../karma.webpack'); +const karmaBaseConfig = require('../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/exporters/zipkin/package.json b/pkgs/exporters/zipkin/package.json new file mode 100644 index 000000000..87f0f36d3 --- /dev/null +++ b/pkgs/exporters/zipkin/package.json @@ -0,0 +1,126 @@ +{ + "name": "@opentelemetry/sandbox-exporter-zipkin", + "version": "1.15.2", + "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "browser", + "tracing", + "profiling" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nock": "13.3.2", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/exporters/zipkin/rollup.config.js b/pkgs/exporters/zipkin/rollup.config.js new file mode 100644 index 000000000..1621a042c --- /dev/null +++ b/pkgs/exporters/zipkin/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.exporter.zipkin", inputName, "otel-exprtr.zipkin", version); diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/index.ts b/pkgs/exporters/zipkin/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/index.ts rename to pkgs/exporters/zipkin/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/browser/index.ts b/pkgs/exporters/zipkin/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/browser/index.ts rename to pkgs/exporters/zipkin/src/platform/browser/index.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts b/pkgs/exporters/zipkin/src/platform/browser/util.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts rename to pkgs/exporters/zipkin/src/platform/browser/util.ts index 7c5ace358..d03518d36 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts +++ b/pkgs/exporters/zipkin/src/platform/browser/util.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { ExportResult, ExportResultCode, globalErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import * as zipkinTypes from '../../types'; /** diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts b/pkgs/exporters/zipkin/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts rename to pkgs/exporters/zipkin/src/platform/index.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/node/index.ts b/pkgs/exporters/zipkin/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/node/index.ts rename to pkgs/exporters/zipkin/src/platform/node/index.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts b/pkgs/exporters/zipkin/src/platform/node/util.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts rename to pkgs/exporters/zipkin/src/platform/node/util.ts index 5032b0c97..9dc04b793 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts +++ b/pkgs/exporters/zipkin/src/platform/node/util.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; import * as http from 'http'; import * as https from 'https'; import * as url from 'url'; diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/transform.ts b/pkgs/exporters/zipkin/src/transform.ts similarity index 94% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/transform.ts rename to pkgs/exporters/zipkin/src/transform.ts index 94983057f..7d87c70d9 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/transform.ts +++ b/pkgs/exporters/zipkin/src/transform.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; -import { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base'; -import { hrTimeToMicroseconds } from '@opentelemetry/core'; +import * as api from '@opentelemetry/sandbox-api'; +import { ReadableSpan, TimedEvent } from '@opentelemetry/sandbox-sdk-trace-base'; +import { hrTimeToMicroseconds } from '@opentelemetry/sandbox-core'; import * as zipkinTypes from './types'; const ZIPKIN_SPAN_KIND_MAPPING = { diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/types.ts b/pkgs/exporters/zipkin/src/types.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/types.ts rename to pkgs/exporters/zipkin/src/types.ts index ce9754d0b..c9099ce8c 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/types.ts +++ b/pkgs/exporters/zipkin/src/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/core'; +import { ExportResult } from '@opentelemetry/sandbox-core'; /** * Exporter config diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/utils.ts b/pkgs/exporters/zipkin/src/utils.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/utils.ts rename to pkgs/exporters/zipkin/src/utils.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/pkgs/exporters/zipkin/src/zipkin.ts similarity index 94% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/zipkin.ts rename to pkgs/exporters/zipkin/src/zipkin.ts index ca52806d3..4b5afa19f 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/zipkin.ts +++ b/pkgs/exporters/zipkin/src/zipkin.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { ExportResult, ExportResultCode, getEnv } from '@opentelemetry/core'; -import { SpanExporter, ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import { diag } from '@opentelemetry/sandbox-api'; +import { ExportResult, ExportResultCode, getEnv } from '@opentelemetry/sandbox-core'; +import { SpanExporter, ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import { prepareSend } from './platform/index'; import * as zipkinTypes from './types'; import { @@ -24,7 +24,7 @@ import { defaultStatusCodeTagName, defaultStatusErrorTagName, } from './transform'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { prepareGetHeaders } from './utils'; /** diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/browser/index-webpack.ts b/pkgs/exporters/zipkin/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/test/browser/index-webpack.ts rename to pkgs/exporters/zipkin/test/browser/index-webpack.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts b/pkgs/exporters/zipkin/test/browser/zipkin.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts rename to pkgs/exporters/zipkin/test/browser/zipkin.test.ts index e9d2c083a..b921059de 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/browser/zipkin.test.ts +++ b/pkgs/exporters/zipkin/test/browser/zipkin.test.ts @@ -17,8 +17,8 @@ import { setGlobalErrorHandler, loggingErrorHandler, -} from '@opentelemetry/core'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-core'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { ZipkinExporter } from '../../src'; diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts b/pkgs/exporters/zipkin/test/common/transform.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts rename to pkgs/exporters/zipkin/test/common/transform.test.ts index 65a06922a..aecf0486e 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts +++ b/pkgs/exporters/zipkin/test/common/transform.test.ts @@ -14,16 +14,16 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { hrTimeDuration, hrTimeToMicroseconds, VERSION, -} from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import { BasicTracerProvider, Span } from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import { BasicTracerProvider, Span } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { defaultStatusCodeTagName, defaultStatusErrorTagName, diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/common/zipkin.test.ts b/pkgs/exporters/zipkin/test/common/zipkin.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/test/common/zipkin.test.ts rename to pkgs/exporters/zipkin/test/common/zipkin.test.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/helper.ts b/pkgs/exporters/zipkin/test/helper.ts similarity index 91% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/test/helper.ts rename to pkgs/exporters/zipkin/test/helper.ts index bd4d300a1..468b98296 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/helper.ts +++ b/pkgs/exporters/zipkin/test/helper.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { TraceFlags, SpanStatusCode } from '@opentelemetry/api'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import { Resource } from '@opentelemetry/resources'; +import { TraceFlags, SpanStatusCode } from '@opentelemetry/sandbox-api'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; import { Span } from '../src/types'; diff --git a/pkgs/exporters/zipkin/test/index-webpack.worker.ts b/pkgs/exporters/zipkin/test/index-webpack.worker.ts new file mode 100644 index 000000000..a00999ebd --- /dev/null +++ b/pkgs/exporters/zipkin/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./common', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts b/pkgs/exporters/zipkin/test/node/zipkin.test.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts rename to pkgs/exporters/zipkin/test/node/zipkin.test.ts index 300166249..6df4a6a0d 100644 --- a/auto-merge/js/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts +++ b/pkgs/exporters/zipkin/test/node/zipkin.test.ts @@ -16,18 +16,18 @@ import * as assert from 'assert'; import * as nock from 'nock'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; import { ExportResult, hrTimeToMicroseconds, ExportResultCode, -} from '@opentelemetry/core'; -import * as api from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-core'; +import * as api from '@opentelemetry/sandbox-api'; +import { Resource } from '@opentelemetry/sandbox-resources'; import { ZipkinExporter } from '../../src'; import * as zipkinTypes from '../../src/types'; -import { TraceFlags } from '@opentelemetry/api'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { TraceFlags } from '@opentelemetry/sandbox-api'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; const MICROS_PER_SECS = 1e6; diff --git a/pkgs/exporters/zipkin/tsconfig.esm.json b/pkgs/exporters/zipkin/tsconfig.esm.json new file mode 100644 index 000000000..d0d0ce24d --- /dev/null +++ b/pkgs/exporters/zipkin/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/exporters/zipkin/tsconfig.esnext.json b/pkgs/exporters/zipkin/tsconfig.esnext.json new file mode 100644 index 000000000..8e1d797d3 --- /dev/null +++ b/pkgs/exporters/zipkin/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/api-logs/tsconfig.json b/pkgs/exporters/zipkin/tsconfig.json similarity index 74% rename from auto-merge/js/experimental/packages/api-logs/tsconfig.json rename to pkgs/exporters/zipkin/tsconfig.json index 5849e79c0..e4729001d 100644 --- a/auto-merge/js/experimental/packages/api-logs/tsconfig.json +++ b/pkgs/exporters/zipkin/tsconfig.json @@ -8,10 +8,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../../../api" - } ] -} +} \ No newline at end of file diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintignore b/pkgs/instrumentations/instrumentation/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintignore rename to pkgs/instrumentations/instrumentation/.eslintignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js b/pkgs/instrumentations/instrumentation/.eslintrc.js similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js rename to pkgs/instrumentations/instrumentation/.eslintrc.js diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/.gitignore b/pkgs/instrumentations/instrumentation/.gitignore similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/.gitignore rename to pkgs/instrumentations/instrumentation/.gitignore diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/.npmignore b/pkgs/instrumentations/instrumentation/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/.npmignore rename to pkgs/instrumentations/instrumentation/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/LICENSE b/pkgs/instrumentations/instrumentation/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/LICENSE rename to pkgs/instrumentations/instrumentation/LICENSE diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/README.md b/pkgs/instrumentations/instrumentation/README.md similarity index 91% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/README.md rename to pkgs/instrumentations/instrumentation/README.md index 6c27e3d36..a9f975d5a 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/README.md +++ b/pkgs/instrumentations/instrumentation/README.md @@ -19,7 +19,7 @@ import { InstrumentationConfig, InstrumentationNodeModuleDefinition, InstrumentationNodeModuleFile, -} from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-instrumentation'; import type * as module_name_to_be_patched from 'module_name_to_be_patched'; @@ -121,9 +121,9 @@ myInstrumentation.enable(); import { InstrumentationBase, InstrumentationConfig, -} from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-instrumentation'; -import { Instrumentation } from '@opentelemetry/instrumentation'; +import { Instrumentation } from '@opentelemetry/sandbox-instrumentation'; export class MyInstrumentation extends InstrumentationBase { constructor(config: InstrumentationConfig = {}) { @@ -162,10 +162,10 @@ myInstrumentation.enable(); ### NODE - Auto Loader ```javascript -const { B3Propagator } = require('@opentelemetry/propagator-b3'); -const { registerInstrumentations } = require('@opentelemetry/instrumentation'); -const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http'); -const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node'); +const { B3Propagator } = require('@opentelemetry/sandbox-propagator-b3'); +const { registerInstrumentations } = require('@opentelemetry/sandbox-instrumentation'); +const { HttpInstrumentation } = require('@opentelemetry/sandbox-instrumentation-http'); +const { NodeTracerProvider } = require('@opentelemetry/sandbox-sdk-trace-node'); const tracerProvider = new NodeTracerProvider(); @@ -186,10 +186,10 @@ registerInstrumentations({ ### WEB - Auto Loader ```javascript -const { B3Propagator } = require('@opentelemetry/propagator-b3'); -const { registerInstrumentations } = require('@opentelemetry/instrumentation'); -const { XMLHttpRequestInstrumentation } = require('@opentelemetry/instrumentation-xml-http-request'); -const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web'); +const { B3Propagator } = require('@opentelemetry/sandbox-propagator-b3'); +const { registerInstrumentations } = require('@opentelemetry/sandbox-instrumentation'); +const { XMLHttpRequestInstrumentation } = require('@opentelemetry/sandbox-instrumentation-xml-http-request'); +const { WebTracerProvider } = require('@opentelemetry/sandbox-sdk-trace-web'); const tracerProvider = new WebTracerProvider(); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/hook.mjs b/pkgs/instrumentations/instrumentation/hook.mjs similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/hook.mjs rename to pkgs/instrumentations/instrumentation/hook.mjs diff --git a/auto-merge/js/experimental/packages/exporter-trace-otlp-http/karma.conf.js b/pkgs/instrumentations/instrumentation/karma.conf.js similarity index 100% rename from auto-merge/js/experimental/packages/exporter-trace-otlp-http/karma.conf.js rename to pkgs/instrumentations/instrumentation/karma.conf.js diff --git a/pkgs/instrumentations/instrumentation/karma.debug.conf.js b/pkgs/instrumentations/instrumentation/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/instrumentations/instrumentation/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/instrumentation/karma.webpack.js b/pkgs/instrumentations/instrumentation/karma.webpack.js new file mode 100644 index 000000000..bc821e073 --- /dev/null +++ b/pkgs/instrumentations/instrumentation/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/instrumentations/instrumentation/karma.worker.js b/pkgs/instrumentations/instrumentation/karma.worker.js new file mode 100644 index 000000000..eb6ee53e9 --- /dev/null +++ b/pkgs/instrumentations/instrumentation/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../karma.webpack'); +const karmaBaseConfig = require('../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/package.json b/pkgs/instrumentations/instrumentation/package.json similarity index 57% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/package.json rename to pkgs/instrumentations/instrumentation/package.json index 859058695..d81f5b3a3 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/package.json +++ b/pkgs/instrumentations/instrumentation/package.json @@ -1,5 +1,5 @@ { - "name": "@opentelemetry/instrumentation", + "name": "@opentelemetry/sandbox-instrumentation", "version": "0.41.2", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", @@ -38,25 +38,30 @@ "README.md" ], "scripts": { - "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "build": "npm run compile && npm run package", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "lint": "eslint . --ext .ts", - "lint:fix": "eslint . --ext .ts --fix", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", "tdd": "npm run tdd:node", - "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", + "tdd:node": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", "test:cjs": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", "test:esm": "nyc node --experimental-loader=./hook.mjs ../../../node_modules/mocha/bin/mocha 'test/node/*.test.mjs' test/node/*.test.mjs", - "test": "npm run test:cjs && npm run test:esm", - "test:browser": "karma start --single-run", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", - "prewatch": "node ../../../scripts/version-update.js", - "peer-api-check": "node ../../../scripts/peer-api-check.js" + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" }, "keywords": [ "opentelemetry", @@ -78,36 +83,55 @@ "shimmer": "^1.2.1" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "@opentelemetry/sandbox-api": "1.4.1" }, "devDependencies": { "@babel/core": "7.22.10", - "@opentelemetry/api": "1.4.1", - "@opentelemetry/sdk-metrics": "1.15.2", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-sdk-metrics": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", "@types/semver": "7.5.0", - "@types/sinon": "10.0.16", + "@types/sinon": "^10.0.13", "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", "babel-loader": "8.3.0", "babel-plugin-istanbul": "6.1.1", - "codecov": "3.8.3", + "chromium": "^3.0.3", + "codecov": "^3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "karma": "6.4.2", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "4.0.2", - "lerna": "7.1.4", - "mocha": "10.2.0", - "nyc": "15.1.0", - "sinon": "15.1.2", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", - "typescript": "4.4.4", - "webpack": "4.46.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", "webpack-cli": "4.10.0", "webpack-merge": "5.9.0" }, @@ -115,4 +139,4 @@ "node": ">=14" }, "sideEffects": false -} +} \ No newline at end of file diff --git a/pkgs/instrumentations/instrumentation/rollup.config.js b/pkgs/instrumentations/instrumentation/rollup.config.js new file mode 100644 index 000000000..d156c6be8 --- /dev/null +++ b/pkgs/instrumentations/instrumentation/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.instrumentation", inputName, "otel-sndbx.instrumentation", version); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts b/pkgs/instrumentations/instrumentation/src/autoLoader.ts similarity index 95% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts rename to pkgs/instrumentations/instrumentation/src/autoLoader.ts index c6a052c6c..857133930 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts +++ b/pkgs/instrumentations/instrumentation/src/autoLoader.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { trace, metrics } from '@opentelemetry/api'; +import { trace, metrics } from '@opentelemetry/sandbox-api'; import { disableInstrumentations, enableInstrumentations, diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts b/pkgs/instrumentations/instrumentation/src/autoLoaderUtils.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts rename to pkgs/instrumentations/instrumentation/src/autoLoaderUtils.ts index 3dc192721..25641582e 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts +++ b/pkgs/instrumentations/instrumentation/src/autoLoaderUtils.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TracerProvider, MeterProvider } from '@opentelemetry/api'; +import { TracerProvider, MeterProvider } from '@opentelemetry/sandbox-api'; import { Instrumentation } from './types'; import { AutoLoaderResult, InstrumentationOption } from './types_internal'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/index.ts b/pkgs/instrumentations/instrumentation/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/index.ts rename to pkgs/instrumentations/instrumentation/src/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts b/pkgs/instrumentations/instrumentation/src/instrumentation.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts rename to pkgs/instrumentations/instrumentation/src/instrumentation.ts index 4b729fd43..1ba11e819 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts +++ b/pkgs/instrumentations/instrumentation/src/instrumentation.ts @@ -23,7 +23,7 @@ import { trace, Tracer, TracerProvider, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import * as shimmer from 'shimmer'; import { InstrumentationModuleDefinition } from './platform/node'; import * as types from './types'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts b/pkgs/instrumentations/instrumentation/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts rename to pkgs/instrumentations/instrumentation/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts b/pkgs/instrumentations/instrumentation/src/platform/browser/instrumentation.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts rename to pkgs/instrumentations/instrumentation/src/platform/browser/instrumentation.ts diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/index.ts b/pkgs/instrumentations/instrumentation/src/platform/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/src/platform/index.ts rename to pkgs/instrumentations/instrumentation/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/ModuleNameTrie.ts b/pkgs/instrumentations/instrumentation/src/platform/node/ModuleNameTrie.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/ModuleNameTrie.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/ModuleNameTrie.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/RequireInTheMiddleSingleton.ts b/pkgs/instrumentations/instrumentation/src/platform/node/RequireInTheMiddleSingleton.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/RequireInTheMiddleSingleton.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/RequireInTheMiddleSingleton.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts b/pkgs/instrumentations/instrumentation/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/pkgs/instrumentations/instrumentation/src/platform/node/instrumentation.ts similarity index 99% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/instrumentation.ts index 03d8f6ba3..038f709dd 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts +++ b/pkgs/instrumentations/instrumentation/src/platform/node/instrumentation.ts @@ -27,7 +27,7 @@ import { import type { HookFn } from 'import-in-the-middle'; import * as ImportInTheMiddle from 'import-in-the-middle'; import { InstrumentationModuleDefinition } from './types'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import type { OnRequireFn } from 'require-in-the-middle'; import { Hook } from 'require-in-the-middle'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts b/pkgs/instrumentations/instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts b/pkgs/instrumentations/instrumentation/src/platform/node/instrumentationNodeModuleFile.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/instrumentationNodeModuleFile.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/types.ts b/pkgs/instrumentations/instrumentation/src/platform/node/types.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/types.ts rename to pkgs/instrumentations/instrumentation/src/platform/node/types.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/types.ts b/pkgs/instrumentations/instrumentation/src/types.ts similarity index 96% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/types.ts rename to pkgs/instrumentations/instrumentation/src/types.ts index 837f09679..99042ae5c 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/types.ts +++ b/pkgs/instrumentations/instrumentation/src/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TracerProvider, MeterProvider } from '@opentelemetry/api'; +import { TracerProvider, MeterProvider } from '@opentelemetry/sandbox-api'; /** Interface Instrumentation to apply patch. */ export interface Instrumentation { diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts b/pkgs/instrumentations/instrumentation/src/types_internal.ts similarity index 93% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts rename to pkgs/instrumentations/instrumentation/src/types_internal.ts index 2cff38771..b3f3bdc43 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts +++ b/pkgs/instrumentations/instrumentation/src/types_internal.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TracerProvider, MeterProvider } from '@opentelemetry/api'; +import { TracerProvider, MeterProvider } from '@opentelemetry/sandbox-api'; import { InstrumentationBase } from './platform'; import { Instrumentation } from './types'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/utils.ts b/pkgs/instrumentations/instrumentation/src/utils.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/utils.ts rename to pkgs/instrumentations/instrumentation/src/utils.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/browser/index-webpack.ts b/pkgs/instrumentations/instrumentation/test/browser/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/browser/index-webpack.ts rename to pkgs/instrumentations/instrumentation/test/browser/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts b/pkgs/instrumentations/instrumentation/test/common/Instrumentation.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts rename to pkgs/instrumentations/instrumentation/test/common/Instrumentation.test.ts index be53d1ca5..7badf7dfe 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts +++ b/pkgs/instrumentations/instrumentation/test/common/Instrumentation.test.ts @@ -21,7 +21,7 @@ import { InstrumentationConfig, } from '../../src'; -import { MeterProvider } from '@opentelemetry/sdk-metrics'; +import { MeterProvider } from '@opentelemetry/sandbox-sdk-metrics'; interface TestInstrumentationConfig extends InstrumentationConfig { isActive?: boolean; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts b/pkgs/instrumentations/instrumentation/test/common/autoLoader.test.ts similarity index 99% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts rename to pkgs/instrumentations/instrumentation/test/common/autoLoader.test.ts index aa8c5582a..78ea9f067 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts +++ b/pkgs/instrumentations/instrumentation/test/common/autoLoader.test.ts @@ -20,7 +20,7 @@ import { Meter, MeterOptions, MeterProvider, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { InstrumentationBase, registerInstrumentations } from '../../src'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts b/pkgs/instrumentations/instrumentation/test/common/autoLoaderUtils.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts rename to pkgs/instrumentations/instrumentation/test/common/autoLoaderUtils.test.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/utils.test.ts b/pkgs/instrumentations/instrumentation/test/common/utils.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/common/utils.test.ts rename to pkgs/instrumentations/instrumentation/test/common/utils.test.ts diff --git a/pkgs/instrumentations/instrumentation/test/index-webpack.worker.ts b/pkgs/instrumentations/instrumentation/test/index-webpack.worker.ts new file mode 100644 index 000000000..a00999ebd --- /dev/null +++ b/pkgs/instrumentations/instrumentation/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./common', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs b/pkgs/instrumentations/instrumentation/test/node/EsmInstrumentation.test.mjs similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs rename to pkgs/instrumentations/instrumentation/test/node/EsmInstrumentation.test.mjs diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts b/pkgs/instrumentations/instrumentation/test/node/InstrumentationBase.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts rename to pkgs/instrumentations/instrumentation/test/node/InstrumentationBase.test.ts index b9597c65d..8bc82f893 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts +++ b/pkgs/instrumentations/instrumentation/test/node/InstrumentationBase.test.ts @@ -295,7 +295,7 @@ describe('InstrumentationBase', () => { const moduleName = 'net'; class TestInstrumentation extends InstrumentationBase { constructor() { - super('@opentelemetry/instrumentation-net-test', '0.0.0', { + super('@opentelemetry/sandbox-instrumentation-net-test', '0.0.0', { enabled: false, }); } @@ -337,7 +337,7 @@ describe('InstrumentationBase', () => { const fileName = path.join(__dirname, 'fixtures', `${moduleName}.js`); class TestInstrumentation extends InstrumentationBase { constructor() { - super('@opentelemetry/instrumentation-absolute-path-test', '0.0.0', { + super('@opentelemetry/sandbox-instrumentation-absolute-path-test', '0.0.0', { enabled: false, }); } diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts b/pkgs/instrumentations/instrumentation/test/node/InstrumentationNodeModuleFile.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts rename to pkgs/instrumentations/instrumentation/test/node/InstrumentationNodeModuleFile.test.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/ModuleNameTrie.test.ts b/pkgs/instrumentations/instrumentation/test/node/ModuleNameTrie.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/ModuleNameTrie.test.ts rename to pkgs/instrumentations/instrumentation/test/node/ModuleNameTrie.test.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts b/pkgs/instrumentations/instrumentation/test/node/RequireInTheMiddleSingleton.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts rename to pkgs/instrumentations/instrumentation/test/node/RequireInTheMiddleSingleton.test.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/fixtures/absolutePathTestFixture.js b/pkgs/instrumentations/instrumentation/test/node/fixtures/absolutePathTestFixture.js similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/fixtures/absolutePathTestFixture.js rename to pkgs/instrumentations/instrumentation/test/node/fixtures/absolutePathTestFixture.js diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/generated/.gitkeep b/pkgs/instrumentations/instrumentation/test/node/node_modules/.gitkeep similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/src/generated/.gitkeep rename to pkgs/instrumentations/instrumentation/test/node/node_modules/.gitkeep diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-esm-module/package.json b/pkgs/instrumentations/instrumentation/test/node/node_modules/test-esm-module/package.json similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-esm-module/package.json rename to pkgs/instrumentations/instrumentation/test/node/node_modules/test-esm-module/package.json diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-esm-module/src/index.js b/pkgs/instrumentations/instrumentation/test/node/node_modules/test-esm-module/src/index.js similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/node/node_modules/test-esm-module/src/index.js rename to pkgs/instrumentations/instrumentation/test/node/node_modules/test-esm-module/src/index.js diff --git a/pkgs/instrumentations/instrumentation/tsconfig.esm.json b/pkgs/instrumentations/instrumentation/tsconfig.esm.json new file mode 100644 index 000000000..d0d0ce24d --- /dev/null +++ b/pkgs/instrumentations/instrumentation/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/instrumentations/instrumentation/tsconfig.esnext.json b/pkgs/instrumentations/instrumentation/tsconfig.esnext.json new file mode 100644 index 000000000..8e1d797d3 --- /dev/null +++ b/pkgs/instrumentations/instrumentation/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/instrumentations/instrumentation/tsconfig.json b/pkgs/instrumentations/instrumentation/tsconfig.json new file mode 100644 index 000000000..e4729001d --- /dev/null +++ b/pkgs/instrumentations/instrumentation/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintignore b/pkgs/instrumentations/web/auto/.eslintignore similarity index 100% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintignore rename to pkgs/instrumentations/web/auto/.eslintignore diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/.eslintrc.js b/pkgs/instrumentations/web/auto/.eslintrc.js similarity index 71% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/.eslintrc.js rename to pkgs/instrumentations/web/auto/.eslintrc.js index 9cfb3fd42..87dbd631a 100644 --- a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/.eslintrc.js +++ b/pkgs/instrumentations/web/auto/.eslintrc.js @@ -1,8 +1,8 @@ module.exports = { "env": { - "mocha": true, "commonjs": true, "node": true, + "mocha": true, }, - ...require('../../../eslint.base.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/otlp-proto-exporter-base/.npmignore b/pkgs/instrumentations/web/auto/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-proto-exporter-base/.npmignore rename to pkgs/instrumentations/web/auto/.npmignore diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/CHANGELOG.md b/pkgs/instrumentations/web/auto/CHANGELOG.md similarity index 100% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/CHANGELOG.md rename to pkgs/instrumentations/web/auto/CHANGELOG.md diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/LICENSE b/pkgs/instrumentations/web/auto/LICENSE similarity index 100% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/LICENSE rename to pkgs/instrumentations/web/auto/LICENSE diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/README.md b/pkgs/instrumentations/web/auto/README.md similarity index 76% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/README.md rename to pkgs/instrumentations/web/auto/README.md index 864e03170..9a87e66d3 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/README.md +++ b/pkgs/instrumentations/web/auto/README.md @@ -14,13 +14,13 @@ npm install --save @opentelemetry/auto-instrumentations-web ## Usage ```javascript -const { WebTracerProvider } = require('@opentelemetry/sdk-trace-web'); -const { getWebAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-web'); -const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector'); -const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base'); -const { registerInstrumentations } = require('@opentelemetry/instrumentation'); -const { ZoneContextManager } = require('@opentelemetry/context-zone'); -const { B3Propagator } = require('@opentelemetry/propagator-b3'); +const { WebTracerProvider } = require('@opentelemetry/sandbox-sdk-trace-web'); +const { getWebAutoInstrumentations } = require('@opentelemetry/sandbox-auto-instrumentations-web'); +const { CollectorTraceExporter } = require('@opentelemetry/sandbox-exporter-collector'); +const { SimpleSpanProcessor } = require('@opentelemetry/sandbox-sdk-trace-base'); +const { registerInstrumentations } = require('@opentelemetry/sandbox-instrumentation'); +const { ZoneContextManager } = require('@opentelemetry/sandbox-context-zone'); +const { B3Propagator } = require('@opentelemetry/sandbox-propagator-b3'); const exporter = new CollectorTraceExporter({ serviceName: 'auto-instrumentations-web', @@ -37,7 +37,7 @@ registerInstrumentations({ instrumentations: [ getWebAutoInstrumentations({ // load custom configuration for xml-http-request instrumentation - '@opentelemetry/instrumentation-xml-http-request': { + '@opentelemetry/sandbox-instrumentation-xml-http-request': { clearTimingResources: true, }, }), diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/karma.conf.js b/pkgs/instrumentations/web/auto/karma.conf.js similarity index 85% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/karma.conf.js rename to pkgs/instrumentations/web/auto/karma.conf.js index 5e6d4aae4..e95dc6c1b 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/karma.conf.js +++ b/pkgs/instrumentations/web/auto/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/instrumentations/web/auto/karma.debug.conf.js b/pkgs/instrumentations/web/auto/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/instrumentations/web/auto/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/web/auto/package.json b/pkgs/instrumentations/web/auto/package.json new file mode 100644 index 000000000..05b72adb8 --- /dev/null +++ b/pkgs/instrumentations/web/auto/package.json @@ -0,0 +1,94 @@ +{ + "name": "@opentelemetry/sandbox-auto-instrumentations-web", + "version": "0.33.0", + "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", + "author": "OpenTelemetry Authors", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-web#readme", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "publishConfig": { + "access": "public" + }, + "main": "build/src/index.js", + "module": "build/esm/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepare": "npm run compile", + "rebuild": "npm run clean && npm run build", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json" + }, + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.2.2", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.7.2", + "webpack-merge": "5.8.0" + }, + "dependencies": { + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-instrumentation-document-load": "0.33.0", + "@opentelemetry/sandbox-instrumentation-fetch": "0.41.2", + "@opentelemetry/sandbox-instrumentation-user-interaction": "0.33.0", + "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.41.2" + } +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/auto/rollup.config.js b/pkgs/instrumentations/web/auto/rollup.config.js new file mode 100644 index 000000000..dfbb176ff --- /dev/null +++ b/pkgs/instrumentations/web/auto/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.instr.web.auto", inputName, "otel-sndbx.instr-auto", version); diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/src/index.ts b/pkgs/instrumentations/web/auto/src/index.ts similarity index 100% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/src/index.ts rename to pkgs/instrumentations/web/auto/src/index.ts diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/src/utils.ts b/pkgs/instrumentations/web/auto/src/utils.ts similarity index 72% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/src/utils.ts rename to pkgs/instrumentations/web/auto/src/utils.ts index 1127c0f1f..59ed652c4 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/src/utils.ts +++ b/pkgs/instrumentations/web/auto/src/utils.ts @@ -14,22 +14,22 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { Instrumentation, InstrumentationConfig, -} from '@opentelemetry/instrumentation'; -import { DocumentLoadInstrumentation } from '@opentelemetry/instrumentation-document-load'; -import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'; -import { UserInteractionInstrumentation } from '@opentelemetry/instrumentation-user-interaction'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; +} from '@opentelemetry/sandbox-instrumentation'; +import { DocumentLoadInstrumentation } from '@opentelemetry/sandbox-instrumentation-document-load'; +import { FetchInstrumentation } from '@opentelemetry/sandbox-instrumentation-fetch'; +import { UserInteractionInstrumentation } from '@opentelemetry/sandbox-instrumentation-user-interaction'; +import { XMLHttpRequestInstrumentation } from '@opentelemetry/sandbox-instrumentation-xml-http-request'; const InstrumentationMap = { - '@opentelemetry/instrumentation-document-load': DocumentLoadInstrumentation, - '@opentelemetry/instrumentation-fetch': FetchInstrumentation, - '@opentelemetry/instrumentation-user-interaction': + '@opentelemetry/sandbox-instrumentation-document-load': DocumentLoadInstrumentation, + '@opentelemetry/sandbox-instrumentation-fetch': FetchInstrumentation, + '@opentelemetry/sandbox-instrumentation-user-interaction': UserInteractionInstrumentation, - '@opentelemetry/instrumentation-xml-http-request': + '@opentelemetry/sandbox-instrumentation-xml-http-request': XMLHttpRequestInstrumentation, }; diff --git a/auto-merge/js/experimental/packages/api-events/test/index-webpack.ts b/pkgs/instrumentations/web/auto/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-events/test/index-webpack.ts rename to pkgs/instrumentations/web/auto/test/index-webpack.ts diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/test/utils.test.ts b/pkgs/instrumentations/web/auto/test/utils.test.ts similarity index 80% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/test/utils.test.ts rename to pkgs/instrumentations/web/auto/test/utils.test.ts index 442ed166b..b14ab5dc5 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/test/utils.test.ts +++ b/pkgs/instrumentations/web/auto/test/utils.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { XMLHttpRequestInstrumentationConfig } from '@opentelemetry/instrumentation-xml-http-request'; +import { diag } from '@opentelemetry/sandbox-api'; +import { XMLHttpRequestInstrumentationConfig } from '@opentelemetry/sandbox-instrumentation-xml-http-request'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { getWebAutoInstrumentations } from '../src'; @@ -25,10 +25,10 @@ describe('utils', () => { it('should load default instrumentations', () => { const instrumentations = getWebAutoInstrumentations(); const expectedInstrumentations = [ - '@opentelemetry/instrumentation-document-load', - '@opentelemetry/instrumentation-fetch', - '@opentelemetry/instrumentation-user-interaction', - '@opentelemetry/instrumentation-xml-http-request', + '@opentelemetry/sandbox-instrumentation-document-load', + '@opentelemetry/sandbox-instrumentation-fetch', + '@opentelemetry/sandbox-instrumentation-user-interaction', + '@opentelemetry/sandbox-instrumentation-xml-http-request', ]; assert.strictEqual(instrumentations.length, 4); for (let i = 0, j = instrumentations.length; i < j; i++) { @@ -44,14 +44,14 @@ describe('utils', () => { const clearTimingResources = true; const instrumentations = getWebAutoInstrumentations({ - '@opentelemetry/instrumentation-xml-http-request': { + '@opentelemetry/sandbox-instrumentation-xml-http-request': { clearTimingResources, }, }); const instrumentation = instrumentations.find( instr => instr.instrumentationName === - '@opentelemetry/instrumentation-xml-http-request' + '@opentelemetry/sandbox-instrumentation-xml-http-request' ) as any; const config = instrumentation._config as XMLHttpRequestInstrumentationConfig; @@ -61,21 +61,21 @@ describe('utils', () => { it('should not return disabled instrumentation', () => { const instrumentations = getWebAutoInstrumentations({ - '@opentelemetry/instrumentation-xml-http-request': { + '@opentelemetry/sandbox-instrumentation-xml-http-request': { enabled: false, }, }); const instrumentation = instrumentations.find( instr => instr.instrumentationName === - '@opentelemetry/instrumentation-xml-http-request' + '@opentelemetry/sandbox-instrumentation-xml-http-request' ); assert.strictEqual(instrumentation, undefined); }); it('should show error for none existing instrumentation', () => { const spy = sinon.stub(diag, 'error'); - const name = '@opentelemetry/instrumentation-http2'; + const name = '@opentelemetry/sandbox-instrumentation-http2'; const instrumentations = getWebAutoInstrumentations({ // @ts-expect-error verify that wrong name works [name]: { diff --git a/pkgs/instrumentations/web/auto/tsconfig.esm.json b/pkgs/instrumentations/web/auto/tsconfig.esm.json new file mode 100644 index 000000000..730d211e4 --- /dev/null +++ b/pkgs/instrumentations/web/auto/tsconfig.esm.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "skipLibCheck": true, + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.json b/pkgs/instrumentations/web/auto/tsconfig.json similarity index 78% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.json rename to pkgs/instrumentations/web/auto/tsconfig.json index e1baf4c16..f9639dbdd 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.json +++ b/pkgs/instrumentations/web/auto/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base", + "extends": "../../../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/auto-merge/js/experimental/packages/otlp-exporter-base/.eslintignore b/pkgs/instrumentations/web/document-load/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/otlp-exporter-base/.eslintignore rename to pkgs/instrumentations/web/document-load/.eslintignore diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/.eslintrc.js b/pkgs/instrumentations/web/document-load/.eslintrc.js similarity index 75% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/.eslintrc.js rename to pkgs/instrumentations/web/document-load/.eslintrc.js index 6ad6c9f21..0f538c856 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/.eslintrc.js +++ b/pkgs/instrumentations/web/document-load/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../../eslint.config.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md b/pkgs/instrumentations/web/document-load/CHANGELOG.md similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md rename to pkgs/instrumentations/web/document-load/CHANGELOG.md diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/LICENSE b/pkgs/instrumentations/web/document-load/LICENSE similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/LICENSE rename to pkgs/instrumentations/web/document-load/LICENSE diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/README.md b/pkgs/instrumentations/web/document-load/README.md similarity index 91% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/README.md rename to pkgs/instrumentations/web/document-load/README.md index e0ec16ecd..7e40344d6 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/README.md +++ b/pkgs/instrumentations/web/document-load/README.md @@ -18,13 +18,13 @@ npm install --save @opentelemetry/instrumentation-document-load ## Usage ```js -import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; -import { DocumentLoadInstrumentation } from '@opentelemetry/instrumentation-document-load'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import { B3Propagator } from '@opentelemetry/propagator-b3'; -import { CompositePropagator, W3CTraceContextPropagator } from '@opentelemetry/core'; +import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; +import { DocumentLoadInstrumentation } from '@opentelemetry/sandbox-instrumentation-document-load'; +import { XMLHttpRequestInstrumentation } from '@opentelemetry/sandbox-instrumentation-xml-http-request'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; +import { B3Propagator } from '@opentelemetry/sandbox-propagator-b3'; +import { CompositePropagator, W3CTraceContextPropagator } from '@opentelemetry/sandbox-core'; const provider = new WebTracerProvider(); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js b/pkgs/instrumentations/web/document-load/karma.conf.js similarity index 85% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js rename to pkgs/instrumentations/web/document-load/karma.conf.js index 6174839d6..85d2051a4 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js +++ b/pkgs/instrumentations/web/document-load/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/instrumentations/web/document-load/karma.debug.conf.js b/pkgs/instrumentations/web/document-load/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/instrumentations/web/document-load/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/web/document-load/package.json b/pkgs/instrumentations/web/document-load/package.json new file mode 100644 index 000000000..e69bdca50 --- /dev/null +++ b/pkgs/instrumentations/web/document-load/package.json @@ -0,0 +1,112 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-document-load", + "version": "0.33.0", + "description": "OpenTelemetry document-load automatic instrumentation package.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepare": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "version:update": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json" + }, + "keywords": [ + "opentelemetry", + "document-load", + "web", + "tracing", + "profiling", + "plugin" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.map", + "build/esm/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.2.2", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.7.2", + "webpack-merge": "5.8.0" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-web": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load#readme" +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/document-load/rollup.config.js b/pkgs/instrumentations/web/document-load/rollup.config.js new file mode 100644 index 000000000..1819b5b35 --- /dev/null +++ b/pkgs/instrumentations/web/document-load/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.instr.web.instrumentation-document-load", inputName, "otel-sndbx.instr-doc-load", version); diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/enums/AttributeNames.ts b/pkgs/instrumentations/web/document-load/src/enums/AttributeNames.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/enums/AttributeNames.ts rename to pkgs/instrumentations/web/document-load/src/enums/AttributeNames.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/enums/EventNames.ts b/pkgs/instrumentations/web/document-load/src/enums/EventNames.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/enums/EventNames.ts rename to pkgs/instrumentations/web/document-load/src/enums/EventNames.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/index.ts b/pkgs/instrumentations/web/document-load/src/index.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/index.ts rename to pkgs/instrumentations/web/document-load/src/index.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts b/pkgs/instrumentations/web/document-load/src/instrumentation.ts similarity index 96% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts rename to pkgs/instrumentations/web/document-load/src/instrumentation.ts index 78ab9162d..80f7f524a 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts +++ b/pkgs/instrumentations/web/document-load/src/instrumentation.ts @@ -20,19 +20,19 @@ import { trace, Span, ROOT_CONTEXT, -} from '@opentelemetry/api'; -import { otperformance, TRACE_PARENT_HEADER } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { otperformance, TRACE_PARENT_HEADER } from '@opentelemetry/sandbox-core'; import { addSpanNetworkEvent, addSpanNetworkEvents, hasKey, PerformanceEntries, PerformanceTimingNames as PTN, -} from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-sdk-trace-web'; import { InstrumentationBase, safeExecuteInTheMiddle, -} from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-instrumentation'; import { DocumentLoadCustomAttributeFunction, DocumentLoadInstrumentationConfig, @@ -40,7 +40,7 @@ import { } from './types'; import { AttributeNames } from './enums/AttributeNames'; import { VERSION } from './version'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { addSpanPerformancePaintEvents, getPerformanceNavigationEntries, @@ -59,7 +59,7 @@ export class DocumentLoadInstrumentation extends InstrumentationBase { * @param config */ constructor(config: DocumentLoadInstrumentationConfig = {}) { - super('@opentelemetry/instrumentation-document-load', VERSION, config); + super('@opentelemetry/sandbox-instrumentation-document-load', VERSION, config); } init() {} diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts b/pkgs/instrumentations/web/document-load/src/types.ts similarity index 90% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts rename to pkgs/instrumentations/web/document-load/src/types.ts index a3188c470..cdaafb00f 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts +++ b/pkgs/instrumentations/web/document-load/src/types.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Span } from '@opentelemetry/api'; -import { InstrumentationConfig } from '@opentelemetry/instrumentation'; +import { Span } from '@opentelemetry/sandbox-api'; +import { InstrumentationConfig } from '@opentelemetry/sandbox-instrumentation'; export interface DocumentLoadCustomAttributeFunction { (span: Span): void; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/utils.ts b/pkgs/instrumentations/web/document-load/src/utils.ts similarity index 93% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/utils.ts rename to pkgs/instrumentations/web/document-load/src/utils.ts index 17de90209..a919618dd 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/src/utils.ts +++ b/pkgs/instrumentations/web/document-load/src/utils.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { Span } from '@opentelemetry/api'; -import { otperformance } from '@opentelemetry/core'; +import { Span } from '@opentelemetry/sandbox-api'; +import { otperformance } from '@opentelemetry/sandbox-core'; import { hasKey, PerformanceEntries, PerformanceLegacy, PerformanceTimingNames as PTN, -} from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-sdk-trace-web'; import { EventNames } from './enums/EventNames'; export const getPerformanceNavigationEntries = (): PerformanceEntries => { diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts b/pkgs/instrumentations/web/document-load/test/documentLoad.test.ts similarity index 98% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts rename to pkgs/instrumentations/web/document-load/test/documentLoad.test.ts index b27674bb6..ea1fd06cd 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts +++ b/pkgs/instrumentations/web/document-load/test/documentLoad.test.ts @@ -19,26 +19,26 @@ import { HrTime, propagation, SpanAttributes, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { W3CTraceContextPropagator, TRACE_PARENT_HEADER, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { BasicTracerProvider, InMemorySpanExporter, ReadableSpan, SimpleSpanProcessor, -} from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-sdk-trace-base'; import { PerformanceTimingNames as PTN, StackContextManager, -} from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { DocumentLoadInstrumentation } from '../src'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { EventNames } from '../src/enums/EventNames'; const exporter = new InMemorySpanExporter(); diff --git a/auto-merge/js/experimental/packages/api-logs/test/index-webpack.ts b/pkgs/instrumentations/web/document-load/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/test/index-webpack.ts rename to pkgs/instrumentations/web/document-load/test/index-webpack.ts diff --git a/auto-merge/js/api/tsconfig.esm.json b/pkgs/instrumentations/web/document-load/tsconfig.esm.json similarity index 72% rename from auto-merge/js/api/tsconfig.esm.json rename to pkgs/instrumentations/web/document-load/tsconfig.esm.json index 0817b3dec..b7c835730 100644 --- a/auto-merge/js/api/tsconfig.esm.json +++ b/pkgs/instrumentations/web/document-load/tsconfig.esm.json @@ -1,12 +1,11 @@ { - "extends": "../tsconfig.base.esm.json", + "extends": "../../../../tsconfig.base.esm.json", "compilerOptions": { - "outDir": "build/esm", "rootDir": "src", + "outDir": "build/esm", "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, "include": [ "src/**/*.ts" - ], - "references": [] + ] } diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json b/pkgs/instrumentations/web/document-load/tsconfig.json similarity index 75% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json rename to pkgs/instrumentations/web/document-load/tsconfig.json index 28be80d26..e8a10f9fd 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json +++ b/pkgs/instrumentations/web/document-load/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/auto-merge/js/experimental/packages/sdk-logs/.eslintignore b/pkgs/instrumentations/web/fetch/.eslintignore similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/.eslintignore rename to pkgs/instrumentations/web/fetch/.eslintignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js b/pkgs/instrumentations/web/fetch/.eslintrc.js similarity index 75% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js rename to pkgs/instrumentations/web/fetch/.eslintrc.js index c05408904..c3bb93bde 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js +++ b/pkgs/instrumentations/web/fetch/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.base.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/experimental/packages/sdk-logs/.npmignore b/pkgs/instrumentations/web/fetch/.npmignore similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/.npmignore rename to pkgs/instrumentations/web/fetch/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-context-zone/LICENSE b/pkgs/instrumentations/web/fetch/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone/LICENSE rename to pkgs/instrumentations/web/fetch/LICENSE diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/README.md b/pkgs/instrumentations/web/fetch/README.md similarity index 92% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/README.md rename to pkgs/instrumentations/web/fetch/README.md index 2b5336be0..3e321fd4c 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/README.md +++ b/pkgs/instrumentations/web/fetch/README.md @@ -20,10 +20,10 @@ import { ConsoleSpanExporter, SimpleSpanProcessor, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; -import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-sdk-trace-web'; +import { FetchInstrumentation } from '@opentelemetry/sandbox-instrumentation-fetch'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; const provider = new WebTracerProvider(); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/images/trace1.png b/pkgs/instrumentations/web/fetch/images/trace1.png similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/images/trace1.png rename to pkgs/instrumentations/web/fetch/images/trace1.png diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/images/trace2.png b/pkgs/instrumentations/web/fetch/images/trace2.png similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/images/trace2.png rename to pkgs/instrumentations/web/fetch/images/trace2.png diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/images/trace3.png b/pkgs/instrumentations/web/fetch/images/trace3.png similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/images/trace3.png rename to pkgs/instrumentations/web/fetch/images/trace3.png diff --git a/auto-merge/contrib/metapackages/auto-instrumentations-web/karma.conf.js b/pkgs/instrumentations/web/fetch/karma.conf.js similarity index 85% rename from auto-merge/contrib/metapackages/auto-instrumentations-web/karma.conf.js rename to pkgs/instrumentations/web/fetch/karma.conf.js index edcd9f055..e95dc6c1b 100644 --- a/auto-merge/contrib/metapackages/auto-instrumentations-web/karma.conf.js +++ b/pkgs/instrumentations/web/fetch/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../karma.webpack'); -const karmaBaseConfig = require('../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/instrumentations/web/fetch/karma.debug.conf.js b/pkgs/instrumentations/web/fetch/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/instrumentations/web/fetch/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/web/fetch/karma.webpack.js b/pkgs/instrumentations/web/fetch/karma.webpack.js new file mode 100644 index 000000000..347cb8e58 --- /dev/null +++ b/pkgs/instrumentations/web/fetch/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/instrumentations/web/fetch/karma.worker.js b/pkgs/instrumentations/web/fetch/karma.worker.js new file mode 100644 index 000000000..adf99bbef --- /dev/null +++ b/pkgs/instrumentations/web/fetch/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/instrumentations/web/fetch/package.json b/pkgs/instrumentations/web/fetch/package.json new file mode 100644 index 000000000..c445c39a7 --- /dev/null +++ b/pkgs/instrumentations/web/fetch/package.json @@ -0,0 +1,123 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-fetch", + "version": "0.41.2", + "description": "OpenTelemetry fetch automatic instrumentation package.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "fetch", + "opentelemetry", + "browser", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-context-zone": "1.15.2", + "@opentelemetry/sandbox-propagator-b3": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-web": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/fetch/rollup.config.js b/pkgs/instrumentations/web/fetch/rollup.config.js new file mode 100644 index 000000000..e7eebc632 --- /dev/null +++ b/pkgs/instrumentations/web/fetch/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.instr.web.fetch", inputName, "otel-sndbx.instr.fetch", version); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts b/pkgs/instrumentations/web/fetch/src/enums/AttributeNames.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts rename to pkgs/instrumentations/web/fetch/src/enums/AttributeNames.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/pkgs/instrumentations/web/fetch/src/fetch.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts rename to pkgs/instrumentations/web/fetch/src/fetch.ts index d02269c44..22b19b665 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/pkgs/instrumentations/web/fetch/src/fetch.ts @@ -14,20 +14,20 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { isWrapped, InstrumentationBase, InstrumentationConfig, safeExecuteInTheMiddle, -} from '@opentelemetry/instrumentation'; -import * as core from '@opentelemetry/core'; -import * as web from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-instrumentation'; +import * as core from '@opentelemetry/sandbox-core'; +import * as web from '@opentelemetry/sandbox-sdk-trace-web'; import { AttributeNames } from './enums/AttributeNames'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { FetchError, FetchResponse, SpanData } from './types'; import { VERSION } from './version'; -import { _globalThis } from '@opentelemetry/core'; +import { _globalThis } from '@opentelemetry/sandbox-core'; // how long to wait for observer to collect information about resources // this is needed as event "load" is called before observer @@ -80,7 +80,7 @@ export class FetchInstrumentation extends InstrumentationBase< private _tasksCount = 0; constructor(config?: FetchInstrumentationConfig) { - super('@opentelemetry/instrumentation-fetch', VERSION, config); + super('@opentelemetry/sandbox-instrumentation-fetch', VERSION, config); } init(): void {} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/index.ts b/pkgs/instrumentations/web/fetch/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/index.ts rename to pkgs/instrumentations/web/fetch/src/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/types.ts b/pkgs/instrumentations/web/fetch/src/types.ts similarity index 95% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/types.ts rename to pkgs/instrumentations/web/fetch/src/types.ts index 7f2e5c6d7..63a38373b 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/src/types.ts +++ b/pkgs/instrumentations/web/fetch/src/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; /** * Interface used to provide information to finish span on fetch response diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/pkgs/instrumentations/web/fetch/test/fetch.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts rename to pkgs/instrumentations/web/fetch/test/fetch.test.ts index 14dcec997..09bd4d187 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts +++ b/pkgs/instrumentations/web/fetch/test/fetch.test.ts @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as api from '@opentelemetry/api'; -import * as core from '@opentelemetry/core'; +import * as api from '@opentelemetry/sandbox-api'; +import * as core from '@opentelemetry/sandbox-core'; import { isWrapped, registerInstrumentations, -} from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-instrumentation'; import { B3Propagator, @@ -26,13 +26,13 @@ import { X_B3_TRACE_ID, X_B3_SPAN_ID, X_B3_SAMPLED, -} from '@opentelemetry/propagator-b3'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import * as tracing from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-propagator-b3'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; import { PerformanceTimingNames as PTN, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { @@ -41,7 +41,7 @@ import { FetchCustomAttributeFunction, } from '../src'; import { AttributeNames } from '../src/enums/AttributeNames'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; class DummySpanExporter implements tracing.SpanExporter { export(spans: any) {} diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/test/index-webpack.ts b/pkgs/instrumentations/web/fetch/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/test/index-webpack.ts rename to pkgs/instrumentations/web/fetch/test/index-webpack.ts diff --git a/pkgs/instrumentations/web/fetch/test/index-webpack.worker.ts b/pkgs/instrumentations/web/fetch/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/instrumentations/web/fetch/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/pkgs/instrumentations/web/fetch/tsconfig.esm.json b/pkgs/instrumentations/web/fetch/tsconfig.esm.json new file mode 100644 index 000000000..ed5341aa3 --- /dev/null +++ b/pkgs/instrumentations/web/fetch/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/fetch/tsconfig.esnext.json b/pkgs/instrumentations/web/fetch/tsconfig.esnext.json new file mode 100644 index 000000000..2f8a78e6b --- /dev/null +++ b/pkgs/instrumentations/web/fetch/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/fetch/tsconfig.json b/pkgs/instrumentations/web/fetch/tsconfig.json new file mode 100644 index 000000000..33f0e4587 --- /dev/null +++ b/pkgs/instrumentations/web/fetch/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/.eslintignore b/pkgs/instrumentations/web/long-task/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/.eslintignore rename to pkgs/instrumentations/web/long-task/.eslintignore diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/.eslintrc.js b/pkgs/instrumentations/web/long-task/.eslintrc.js similarity index 75% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/.eslintrc.js rename to pkgs/instrumentations/web/long-task/.eslintrc.js index 6ad6c9f21..0f538c856 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/.eslintrc.js +++ b/pkgs/instrumentations/web/long-task/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../../eslint.config.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md b/pkgs/instrumentations/web/long-task/CHANGELOG.md similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md rename to pkgs/instrumentations/web/long-task/CHANGELOG.md diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/README.md b/pkgs/instrumentations/web/long-task/README.md similarity index 91% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/README.md rename to pkgs/instrumentations/web/long-task/README.md index 495485b04..f320aa204 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/README.md +++ b/pkgs/instrumentations/web/long-task/README.md @@ -18,10 +18,10 @@ npm install --save @opentelemetry/instrumentation-long-task ## Usage ```js -import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; -import { LongTaskInstrumentation } from '@opentelemetry/instrumentation-long-task'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; +import { LongTaskInstrumentation } from '@opentelemetry/sandbox-instrumentation-long-task'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; const provider = new WebTracerProvider(); diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/karma.conf.js b/pkgs/instrumentations/web/long-task/karma.conf.js similarity index 86% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/karma.conf.js rename to pkgs/instrumentations/web/long-task/karma.conf.js index 4a4bd4979..410ae0c9a 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/karma.conf.js +++ b/pkgs/instrumentations/web/long-task/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/instrumentations/web/long-task/karma.debug.conf.js b/pkgs/instrumentations/web/long-task/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/instrumentations/web/long-task/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/web/long-task/package.json b/pkgs/instrumentations/web/long-task/package.json new file mode 100644 index 000000000..a27758df2 --- /dev/null +++ b/pkgs/instrumentations/web/long-task/package.json @@ -0,0 +1,114 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-long-task", + "version": "0.33.0", + "description": "OpenTelemetry long task API automatic instrumentation package.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepare": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "version:update": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json" + }, + "keywords": [ + "opentelemetry", + "web", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.map", + "build/esm/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.2.2", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-jquery": "0.2.4", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.7.2", + "webpack-merge": "5.8.0", + "zone.js": "^0.11.4" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-web": "1.15.2" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "sideEffects": false, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-long-task#readme" +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/long-task/rollup.config.js b/pkgs/instrumentations/web/long-task/rollup.config.js new file mode 100644 index 000000000..4f9738743 --- /dev/null +++ b/pkgs/instrumentations/web/long-task/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.instr.web.instrumentation-long-task", inputName, "otel-sndbx.instr-long-task", version); diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/index.ts b/pkgs/instrumentations/web/long-task/src/index.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/index.ts rename to pkgs/instrumentations/web/long-task/src/index.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/instrumentation.ts b/pkgs/instrumentations/web/long-task/src/instrumentation.ts similarity index 93% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/instrumentation.ts rename to pkgs/instrumentations/web/long-task/src/instrumentation.ts index 7b17907a8..404795ecf 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/instrumentation.ts +++ b/pkgs/instrumentations/web/long-task/src/instrumentation.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { hrTime } from '@opentelemetry/core'; -import { diag } from '@opentelemetry/api'; -import { InstrumentationBase } from '@opentelemetry/instrumentation'; +import { hrTime } from '@opentelemetry/sandbox-core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { InstrumentationBase } from '@opentelemetry/sandbox-instrumentation'; import { VERSION } from './version'; import type { PerformanceLongTaskTiming, @@ -35,7 +35,7 @@ export class LongTaskInstrumentation extends InstrumentationBase { * @param config */ constructor(config: LongtaskInstrumentationConfig = {}) { - super('@opentelemetry/instrumentation-long-task', VERSION, config); + super('@opentelemetry/sandbox-instrumentation-long-task', VERSION, config); } init() {} diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/types.ts b/pkgs/instrumentations/web/long-task/src/types.ts similarity index 90% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/types.ts rename to pkgs/instrumentations/web/long-task/src/types.ts index 141135873..8469930b4 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/src/types.ts +++ b/pkgs/instrumentations/web/long-task/src/types.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { Span } from '@opentelemetry/api'; -import type { InstrumentationConfig } from '@opentelemetry/instrumentation'; +import type { Span } from '@opentelemetry/sandbox-api'; +import type { InstrumentationConfig } from '@opentelemetry/sandbox-instrumentation'; // Currently missing in typescript DOM definitions export interface PerformanceLongTaskTiming extends PerformanceEntry { diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/compatibility.test.ts b/pkgs/instrumentations/web/long-task/test/compatibility.test.ts similarity index 92% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/compatibility.test.ts rename to pkgs/instrumentations/web/long-task/test/compatibility.test.ts index d3404d19a..e05d22010 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/compatibility.test.ts +++ b/pkgs/instrumentations/web/long-task/test/compatibility.test.ts @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { trace } from '@opentelemetry/api'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; +import { trace } from '@opentelemetry/sandbox-api'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; import { LongTaskInstrumentation } from '../src'; import { DummySpanExporter } from './util'; diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/index-webpack.ts b/pkgs/instrumentations/web/long-task/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/index-webpack.ts rename to pkgs/instrumentations/web/long-task/test/index-webpack.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/longTask.test.ts b/pkgs/instrumentations/web/long-task/test/longTask.test.ts similarity index 92% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/longTask.test.ts rename to pkgs/instrumentations/web/long-task/test/longTask.test.ts index c65ed71e6..3405650a8 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/longTask.test.ts +++ b/pkgs/instrumentations/web/long-task/test/longTask.test.ts @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { trace } from '@opentelemetry/api'; -import { hrTimeToMilliseconds, hrTimeToNanoseconds } from '@opentelemetry/core'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { ReadableSpan } from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; +import { trace } from '@opentelemetry/sandbox-api'; +import { hrTimeToMilliseconds, hrTimeToNanoseconds } from '@opentelemetry/sandbox-core'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; +import { ReadableSpan } from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { LongTaskInstrumentation } from '../src'; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/util.ts b/pkgs/instrumentations/web/long-task/test/util.ts similarity index 92% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/util.ts rename to pkgs/instrumentations/web/long-task/test/util.ts index ce8179e5a..927df8cc6 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/test/util.ts +++ b/pkgs/instrumentations/web/long-task/test/util.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as tracing from '@opentelemetry/sdk-trace-base'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; export class DummySpanExporter implements tracing.SpanExporter { export(spans: tracing.ReadableSpan[]) {} diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json b/pkgs/instrumentations/web/long-task/tsconfig.esm.json similarity index 82% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json rename to pkgs/instrumentations/web/long-task/tsconfig.esm.json index d903fa308..64552b47a 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json +++ b/pkgs/instrumentations/web/long-task/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json b/pkgs/instrumentations/web/long-task/tsconfig.json similarity index 75% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json rename to pkgs/instrumentations/web/long-task/tsconfig.json index 28be80d26..e8a10f9fd 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json +++ b/pkgs/instrumentations/web/long-task/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/auto-merge/js/packages/opentelemetry-context-zone/.eslintignore b/pkgs/instrumentations/web/user-interaction/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone/.eslintignore rename to pkgs/instrumentations/web/user-interaction/.eslintignore diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintrc.js b/pkgs/instrumentations/web/user-interaction/.eslintrc.js similarity index 80% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintrc.js rename to pkgs/instrumentations/web/user-interaction/.eslintrc.js index ea4d42f5e..b270bcd97 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintrc.js +++ b/pkgs/instrumentations/web/user-interaction/.eslintrc.js @@ -8,5 +8,5 @@ module.exports = { "globals": { "Zone": "readonly" }, - ...require('../../../eslint.config.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md b/pkgs/instrumentations/web/user-interaction/CHANGELOG.md similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md rename to pkgs/instrumentations/web/user-interaction/CHANGELOG.md diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/LICENSE b/pkgs/instrumentations/web/user-interaction/LICENSE similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/LICENSE rename to pkgs/instrumentations/web/user-interaction/LICENSE diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/README.md b/pkgs/instrumentations/web/user-interaction/README.md similarity index 89% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/README.md rename to pkgs/instrumentations/web/user-interaction/README.md index 224ea724e..1be3d1c4a 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/README.md +++ b/pkgs/instrumentations/web/user-interaction/README.md @@ -21,13 +21,13 @@ npm install --save @opentelemetry/instrumentation-user-interaction ## Usage ```js -import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; -import { UserInteractionInstrumentation } from '@opentelemetry/instrumentation-user-interaction'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; +import { UserInteractionInstrumentation } from '@opentelemetry/sandbox-instrumentation-user-interaction'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; // or if you already have zone.js -// import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep'; +// import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone-peer-dep'; const provider = new WebTracerProvider({ contextManager: new ZoneContextManager() diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/click-sync.jpg b/pkgs/instrumentations/web/user-interaction/images/click-sync.jpg similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/click-sync.jpg rename to pkgs/instrumentations/web/user-interaction/images/click-sync.jpg diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/click.jpg b/pkgs/instrumentations/web/user-interaction/images/click.jpg similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/click.jpg rename to pkgs/instrumentations/web/user-interaction/images/click.jpg diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/main-sync.jpg b/pkgs/instrumentations/web/user-interaction/images/main-sync.jpg similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/main-sync.jpg rename to pkgs/instrumentations/web/user-interaction/images/main-sync.jpg diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/main.jpg b/pkgs/instrumentations/web/user-interaction/images/main.jpg similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/images/main.jpg rename to pkgs/instrumentations/web/user-interaction/images/main.jpg diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/karma.conf.js b/pkgs/instrumentations/web/user-interaction/karma.conf.js similarity index 86% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/karma.conf.js rename to pkgs/instrumentations/web/user-interaction/karma.conf.js index 4a4bd4979..410ae0c9a 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/karma.conf.js +++ b/pkgs/instrumentations/web/user-interaction/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/instrumentations/web/user-interaction/karma.debug.conf.js b/pkgs/instrumentations/web/user-interaction/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/instrumentations/web/user-interaction/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/web/user-interaction/package.json b/pkgs/instrumentations/web/user-interaction/package.json new file mode 100644 index 000000000..9227619b8 --- /dev/null +++ b/pkgs/instrumentations/web/user-interaction/package.json @@ -0,0 +1,117 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-user-interaction", + "version": "0.33.0", + "description": "OpenTelemetry UserInteraction automatic instrumentation package.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "prepare": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "version:update": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json" + }, + "keywords": [ + "opentelemetry", + "web", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.map", + "build/esm/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-context-zone-peer-dep": "1.15.2", + "@opentelemetry/sandbox-instrumentation-xml-http-request": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.2.2", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-jquery": "0.2.4", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.7.2", + "webpack-merge": "5.8.0", + "zone.js": "^0.11.4" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-web": "1.15.2" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "zone.js": "^0.11.4" + }, + "sideEffects": false, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-user-interaction#readme" +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/user-interaction/rollup.config.js b/pkgs/instrumentations/web/user-interaction/rollup.config.js new file mode 100644 index 000000000..a56d6a080 --- /dev/null +++ b/pkgs/instrumentations/web/user-interaction/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.instr.web.instrumentation-user-interaction", inputName, "otel-sndbx.instr-user-interaction", version); diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/enums/AttributeNames.ts b/pkgs/instrumentations/web/user-interaction/src/enums/AttributeNames.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/enums/AttributeNames.ts rename to pkgs/instrumentations/web/user-interaction/src/enums/AttributeNames.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/index.ts b/pkgs/instrumentations/web/user-interaction/src/index.ts similarity index 100% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/index.ts rename to pkgs/instrumentations/web/user-interaction/src/index.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts b/pkgs/instrumentations/web/user-interaction/src/instrumentation.ts similarity index 98% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts rename to pkgs/instrumentations/web/user-interaction/src/instrumentation.ts index 1a12953fc..3ccf66bac 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts +++ b/pkgs/instrumentations/web/user-interaction/src/instrumentation.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import { isWrapped, InstrumentationBase } from '@opentelemetry/instrumentation'; +import { isWrapped, InstrumentationBase } from '@opentelemetry/sandbox-instrumentation'; -import * as api from '@opentelemetry/api'; -import { hrTime } from '@opentelemetry/core'; -import { getElementXPath } from '@opentelemetry/sdk-trace-web'; +import * as api from '@opentelemetry/sandbox-api'; +import { hrTime } from '@opentelemetry/sandbox-core'; +import { getElementXPath } from '@opentelemetry/sandbox-sdk-trace-web'; import { AttributeNames } from './enums/AttributeNames'; import { EventName, @@ -66,7 +66,7 @@ export class UserInteractionInstrumentation extends InstrumentationBase private _shouldPreventSpanCreation: ShouldPreventSpanCreation; constructor(config?: UserInteractionInstrumentationConfig) { - super('@opentelemetry/instrumentation-user-interaction', VERSION, config); + super('@opentelemetry/sandbox-instrumentation-user-interaction', VERSION, config); this._eventNames = new Set(config?.eventNames ?? DEFAULT_EVENT_NAMES); this._shouldPreventSpanCreation = typeof config?.shouldPreventSpanCreation === 'function' diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts b/pkgs/instrumentations/web/user-interaction/src/internal-types.ts similarity index 96% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts rename to pkgs/instrumentations/web/user-interaction/src/internal-types.ts index a84590663..696b782ea 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts +++ b/pkgs/instrumentations/web/user-interaction/src/internal-types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { EventName } from './types'; /** diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/types.ts b/pkgs/instrumentations/web/user-interaction/src/types.ts similarity index 90% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/types.ts rename to pkgs/instrumentations/web/user-interaction/src/types.ts index 8c04b3c98..401ec1bce 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/src/types.ts +++ b/pkgs/instrumentations/web/user-interaction/src/types.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { Span } from '@opentelemetry/api'; -import { InstrumentationConfig } from '@opentelemetry/instrumentation'; +import { Span } from '@opentelemetry/sandbox-api'; +import { InstrumentationConfig } from '@opentelemetry/sandbox-instrumentation'; export type EventName = keyof HTMLElementEventMap; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/helper.test.ts b/pkgs/instrumentations/web/user-interaction/test/helper.test.ts similarity index 97% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/helper.test.ts rename to pkgs/instrumentations/web/user-interaction/test/helper.test.ts index 4e55e171f..c8d8e2d01 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/helper.test.ts +++ b/pkgs/instrumentations/web/user-interaction/test/helper.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as tracing from '@opentelemetry/sdk-trace-base'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; export class DummySpanExporter implements tracing.SpanExporter { diff --git a/auto-merge/js/experimental/packages/otlp-transformer/test/index-webpack.ts b/pkgs/instrumentations/web/user-interaction/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/otlp-transformer/test/index-webpack.ts rename to pkgs/instrumentations/web/user-interaction/test/index-webpack.ts diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts b/pkgs/instrumentations/web/user-interaction/test/userInteraction.nozone.test.ts similarity index 98% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts rename to pkgs/instrumentations/web/user-interaction/test/userInteraction.nozone.test.ts index c62ef63ae..2e1d44969 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts +++ b/pkgs/instrumentations/web/user-interaction/test/userInteraction.nozone.test.ts @@ -15,12 +15,12 @@ */ const originalSetTimeout = window.setTimeout; -import { trace } from '@opentelemetry/api'; -import { isWrapped } from '@opentelemetry/core'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; +import { trace } from '@opentelemetry/sandbox-api'; +import { isWrapped } from '@opentelemetry/sandbox-core'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; +import { XMLHttpRequestInstrumentation } from '@opentelemetry/sandbox-instrumentation-xml-http-request'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { UserInteractionInstrumentation } from '../src'; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.test.ts b/pkgs/instrumentations/web/user-interaction/test/userInteraction.test.ts similarity index 97% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.test.ts rename to pkgs/instrumentations/web/user-interaction/test/userInteraction.test.ts index 792387e8c..bf04cbfdb 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.test.ts +++ b/pkgs/instrumentations/web/user-interaction/test/userInteraction.test.ts @@ -14,15 +14,15 @@ * limitations under the License. */ const originalSetTimeout = window.setTimeout; -import { context, ROOT_CONTEXT, trace } from '@opentelemetry/api'; -import { ZoneContextManager } from '@opentelemetry/context-zone-peer-dep'; +import { context, ROOT_CONTEXT, trace } from '@opentelemetry/sandbox-api'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone-peer-dep'; import { isWrapped, registerInstrumentations, -} from '@opentelemetry/instrumentation'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-instrumentation'; +import { XMLHttpRequestInstrumentation } from '@opentelemetry/sandbox-instrumentation-xml-http-request'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; import 'zone.js'; diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json b/pkgs/instrumentations/web/user-interaction/tsconfig.esm.json similarity index 83% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json rename to pkgs/instrumentations/web/user-interaction/tsconfig.esm.json index 0bbc54d32..61b69be52 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json +++ b/pkgs/instrumentations/web/user-interaction/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json b/pkgs/instrumentations/web/user-interaction/tsconfig.json similarity index 83% rename from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json rename to pkgs/instrumentations/web/user-interaction/tsconfig.json index ea1dd61b2..3a22f9152 100644 --- a/auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json +++ b/pkgs/instrumentations/web/user-interaction/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/auto-merge/js/packages/opentelemetry-core/.eslintignore b/pkgs/instrumentations/web/xhr/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/.eslintignore rename to pkgs/instrumentations/web/xhr/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/.eslintrc.js b/pkgs/instrumentations/web/xhr/.eslintrc.js similarity index 66% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/.eslintrc.js rename to pkgs/instrumentations/web/xhr/.eslintrc.js index 359356edd..18b4667aa 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/.eslintrc.js +++ b/pkgs/instrumentations/web/xhr/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "browser": true, }, - ...require('../../eslint.base.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-core/.npmignore b/pkgs/instrumentations/web/xhr/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/.npmignore rename to pkgs/instrumentations/web/xhr/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-core/LICENSE b/pkgs/instrumentations/web/xhr/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/LICENSE rename to pkgs/instrumentations/web/xhr/LICENSE diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md b/pkgs/instrumentations/web/xhr/README.md similarity index 89% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md rename to pkgs/instrumentations/web/xhr/README.md index 8c9686946..dabeafd6a 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md +++ b/pkgs/instrumentations/web/xhr/README.md @@ -20,10 +20,10 @@ import { ConsoleSpanExporter, SimpleSpanProcessor, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-sdk-trace-web'; +import { XMLHttpRequestInstrumentation } from '@opentelemetry/sandbox-instrumentation-xml-http-request'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; const providerWithZone = new WebTracerProvider(); providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/cors.jpg b/pkgs/instrumentations/web/xhr/images/cors.jpg similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/cors.jpg rename to pkgs/instrumentations/web/xhr/images/cors.jpg diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/main.jpg b/pkgs/instrumentations/web/xhr/images/main.jpg similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/main.jpg rename to pkgs/instrumentations/web/xhr/images/main.jpg diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/request.jpg b/pkgs/instrumentations/web/xhr/images/request.jpg similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/request.jpg rename to pkgs/instrumentations/web/xhr/images/request.jpg diff --git a/pkgs/instrumentations/web/xhr/karma.conf.js b/pkgs/instrumentations/web/xhr/karma.conf.js new file mode 100644 index 000000000..85d2051a4 --- /dev/null +++ b/pkgs/instrumentations/web/xhr/karma.conf.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. + */ + +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig + })) +}; diff --git a/pkgs/instrumentations/web/xhr/karma.debug.conf.js b/pkgs/instrumentations/web/xhr/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/instrumentations/web/xhr/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/instrumentations/web/xhr/package.json b/pkgs/instrumentations/web/xhr/package.json new file mode 100644 index 000000000..4e65e56b0 --- /dev/null +++ b/pkgs/instrumentations/web/xhr/package.json @@ -0,0 +1,123 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-xml-http-request", + "version": "0.41.2", + "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "browser", + "tracing", + "profiling", + "metrics", + "XMLHttpRequest", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-context-zone": "1.15.2", + "@opentelemetry/sandbox-propagator-b3": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-instrumentation": "0.41.2", + "@opentelemetry/sandbox-sdk-trace-web": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/xhr/rollup.config.js b/pkgs/instrumentations/web/xhr/rollup.config.js new file mode 100644 index 000000000..86090e160 --- /dev/null +++ b/pkgs/instrumentations/web/xhr/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.instr.web.xhr", inputName, "otel-sndbx.instr.xhr", version); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/AttributeNames.ts b/pkgs/instrumentations/web/xhr/src/enums/AttributeNames.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/AttributeNames.ts rename to pkgs/instrumentations/web/xhr/src/enums/AttributeNames.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/EventNames.ts b/pkgs/instrumentations/web/xhr/src/enums/EventNames.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/EventNames.ts rename to pkgs/instrumentations/web/xhr/src/enums/EventNames.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/index.ts b/pkgs/instrumentations/web/xhr/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/index.ts rename to pkgs/instrumentations/web/xhr/src/index.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts b/pkgs/instrumentations/web/xhr/src/types.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts rename to pkgs/instrumentations/web/xhr/src/types.ts index 430e9e217..f9c517cbb 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts +++ b/pkgs/instrumentations/web/xhr/src/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; /** * method "open" from XMLHttpRequest diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/pkgs/instrumentations/web/xhr/src/xhr.ts similarity index 97% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts rename to pkgs/instrumentations/web/xhr/src/xhr.ts index 42eb9abb0..3b05e71c6 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts +++ b/pkgs/instrumentations/web/xhr/src/xhr.ts @@ -14,22 +14,22 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { isWrapped, InstrumentationBase, InstrumentationConfig, safeExecuteInTheMiddle, -} from '@opentelemetry/instrumentation'; -import { hrTime, isUrlIgnored, otperformance } from '@opentelemetry/core'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-instrumentation'; +import { hrTime, isUrlIgnored, otperformance } from '@opentelemetry/sandbox-core'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { addSpanNetworkEvents, getResource, PerformanceTimingNames as PTN, shouldPropagateTraceHeaders, parseUrl, -} from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-sdk-trace-web'; import { EventNames } from './enums/EventNames'; import { OpenFunction, @@ -89,7 +89,7 @@ export class XMLHttpRequestInstrumentation extends InstrumentationBase(); constructor(config?: XMLHttpRequestInstrumentationConfig) { - super('@opentelemetry/instrumentation-xml-http-request', VERSION, config); + super('@opentelemetry/sandbox-instrumentation-xml-http-request', VERSION, config); } init() {} diff --git a/auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/index-webpack.ts b/pkgs/instrumentations/web/xhr/test/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/test/index-webpack.ts rename to pkgs/instrumentations/web/xhr/test/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts b/pkgs/instrumentations/web/xhr/test/unmocked.test.ts similarity index 85% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts rename to pkgs/instrumentations/web/xhr/test/unmocked.test.ts index 108ca75bb..ed6ac844b 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts +++ b/pkgs/instrumentations/web/xhr/test/unmocked.test.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Span } from '@opentelemetry/api'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; -import { ReadableSpan, SpanProcessor } from '@opentelemetry/sdk-trace-base'; -import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; +import { Span } from '@opentelemetry/sandbox-api'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; +import { ReadableSpan, SpanProcessor } from '@opentelemetry/sandbox-sdk-trace-base'; +import { WebTracerProvider } from '@opentelemetry/sandbox-sdk-trace-web'; import { XMLHttpRequestInstrumentation } from '../src'; import assert = require('assert'); diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts b/pkgs/instrumentations/web/xhr/test/xhr.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts rename to pkgs/instrumentations/web/xhr/test/xhr.test.ts index c3614a42e..2de23bf4e 100644 --- a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts +++ b/pkgs/instrumentations/web/xhr/test/xhr.test.ts @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as api from '@opentelemetry/api'; -import { otperformance as performance, isWrapped } from '@opentelemetry/core'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import * as api from '@opentelemetry/sandbox-api'; +import { otperformance as performance, isWrapped } from '@opentelemetry/sandbox-core'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; import { B3Propagator, B3InjectEncoding, X_B3_SAMPLED, X_B3_SPAN_ID, X_B3_TRACE_ID, -} from '@opentelemetry/propagator-b3'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-propagator-b3'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { PerformanceTimingNames as PTN, WebTracerProvider, parseUrl, -} from '@opentelemetry/sdk-trace-web'; +} from '@opentelemetry/sandbox-sdk-trace-web'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { EventNames } from '../src/enums/EventNames'; diff --git a/pkgs/instrumentations/web/xhr/tsconfig.esm.json b/pkgs/instrumentations/web/xhr/tsconfig.esm.json new file mode 100644 index 000000000..ed5341aa3 --- /dev/null +++ b/pkgs/instrumentations/web/xhr/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/xhr/tsconfig.esnext.json b/pkgs/instrumentations/web/xhr/tsconfig.esnext.json new file mode 100644 index 000000000..2f8a78e6b --- /dev/null +++ b/pkgs/instrumentations/web/xhr/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/instrumentations/web/xhr/tsconfig.json b/pkgs/instrumentations/web/xhr/tsconfig.json new file mode 100644 index 000000000..33f0e4587 --- /dev/null +++ b/pkgs/instrumentations/web/xhr/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/.eslintignore b/pkgs/propagators/b3/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/.eslintignore rename to pkgs/propagators/b3/.eslintignore diff --git a/auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js b/pkgs/propagators/b3/.eslintrc.js similarity index 100% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js rename to pkgs/propagators/b3/.eslintrc.js diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/.npmignore b/pkgs/propagators/b3/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/.npmignore rename to pkgs/propagators/b3/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/LICENSE b/pkgs/propagators/b3/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/LICENSE rename to pkgs/propagators/b3/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/README.md b/pkgs/propagators/b3/README.md similarity index 91% rename from auto-merge/js/packages/opentelemetry-propagator-b3/README.md rename to pkgs/propagators/b3/README.md index 404d59613..540752fbd 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/README.md +++ b/pkgs/propagators/b3/README.md @@ -74,8 +74,8 @@ multi-header via configuration. See the examples below. ### B3 Single-Header Configuration ```javascript -const api = require('@opentelemetry/api'); -const { B3Propagator } = require('@opentelemetry/propagator-b3'); +const api = require('@opentelemetry/sandbox-api'); +const { B3Propagator } = require('@opentelemetry/sandbox-propagator-b3'); api.propagation.setGlobalPropagator(new B3Propagator()); ``` @@ -83,8 +83,8 @@ api.propagation.setGlobalPropagator(new B3Propagator()); ### B3 Multi-Header Configuration ```javascript -const api = require('@opentelemetry/api'); -const { B3Propagator, B3InjectEncoding } = require('@opentelemetry/propagator-b3'); +const api = require('@opentelemetry/sandbox-api'); +const { B3Propagator, B3InjectEncoding } = require('@opentelemetry/sandbox-propagator-b3'); api.propagation.setGlobalPropagator( new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER }) @@ -98,9 +98,9 @@ If you need to inject both encodings this can accomplished using a composite propagator. ```javascript -const api = require('@opentelemetry/api'); -const { CompositePropagator } = require('@opentelemetry/core'); -const { B3Propagator, B3InjectEncoding } = require('@opentelemetry/propagator-b3'); +const api = require('@opentelemetry/sandbox-api'); +const { CompositePropagator } = require('@opentelemetry/sandbox-core'); +const { B3Propagator, B3InjectEncoding } = require('@opentelemetry/sandbox-propagator-b3'); api.propagation.setGlobalPropagator( new CompositePropagator({ propagators: [ diff --git a/auto-merge/js/experimental/packages/otlp-transformer/karma.conf.js b/pkgs/propagators/b3/karma.browser.conf.js similarity index 85% rename from auto-merge/js/experimental/packages/otlp-transformer/karma.conf.js rename to pkgs/propagators/b3/karma.browser.conf.js index 6174839d6..8d2c1822d 100644 --- a/auto-merge/js/experimental/packages/otlp-transformer/karma.conf.js +++ b/pkgs/propagators/b3/karma.browser.conf.js @@ -12,13 +12,14 @@ * 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. - */ +*/ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require("./karma.webpack"); +const karmaBaseConfig = require("../../../karma.base"); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { webpack: karmaWebpackConfig })) }; + diff --git a/pkgs/propagators/b3/karma.debug.conf.js b/pkgs/propagators/b3/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/propagators/b3/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/propagators/b3/karma.webpack.js b/pkgs/propagators/b3/karma.webpack.js new file mode 100644 index 000000000..bc821e073 --- /dev/null +++ b/pkgs/propagators/b3/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/propagators/b3/package.json b/pkgs/propagators/b3/package.json new file mode 100644 index 000000000..73d8e3fea --- /dev/null +++ b/pkgs/propagators/b3/package.json @@ -0,0 +1,110 @@ +{ + "name": "@opentelemetry/sandbox-propagator-b3", + "version": "1.15.2", + "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.browser.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "tracing", + "profiling", + "monitoring", + "b3" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "devDependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/propagators/b3/rollup.config.js b/pkgs/propagators/b3/rollup.config.js new file mode 100644 index 000000000..4276ef1ed --- /dev/null +++ b/pkgs/propagators/b3/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.propagator-b3", inputName, "otel-sndbx.propagator-b3", version); diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts b/pkgs/propagators/b3/src/B3MultiPropagator.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts rename to pkgs/propagators/b3/src/B3MultiPropagator.ts index 63189e157..ed96e9782 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/src/B3MultiPropagator.ts +++ b/pkgs/propagators/b3/src/B3MultiPropagator.ts @@ -24,8 +24,8 @@ import { TextMapPropagator, TextMapSetter, TraceFlags, -} from '@opentelemetry/api'; -import { isTracingSuppressed } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { isTracingSuppressed } from '@opentelemetry/sandbox-core'; import { B3_DEBUG_FLAG_KEY } from './common'; import { X_B3_FLAGS, diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/B3Propagator.ts b/pkgs/propagators/b3/src/B3Propagator.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/B3Propagator.ts rename to pkgs/propagators/b3/src/B3Propagator.ts index 0997fcdb1..88acfcc09 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/src/B3Propagator.ts +++ b/pkgs/propagators/b3/src/B3Propagator.ts @@ -19,8 +19,8 @@ import { TextMapGetter, TextMapPropagator, TextMapSetter, -} from '@opentelemetry/api'; -import { isTracingSuppressed } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { isTracingSuppressed } from '@opentelemetry/sandbox-core'; import { B3MultiPropagator } from './B3MultiPropagator'; import { B3SinglePropagator } from './B3SinglePropagator'; import { B3_CONTEXT_HEADER } from './constants'; diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts b/pkgs/propagators/b3/src/B3SinglePropagator.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts rename to pkgs/propagators/b3/src/B3SinglePropagator.ts index 83d21ec6d..c7391ed9a 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/src/B3SinglePropagator.ts +++ b/pkgs/propagators/b3/src/B3SinglePropagator.ts @@ -24,8 +24,8 @@ import { TextMapSetter, trace, TraceFlags, -} from '@opentelemetry/api'; -import { isTracingSuppressed } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { isTracingSuppressed } from '@opentelemetry/sandbox-core'; import { B3_DEBUG_FLAG_KEY } from './common'; import { B3_CONTEXT_HEADER } from './constants'; diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/common.ts b/pkgs/propagators/b3/src/common.ts similarity index 92% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/common.ts rename to pkgs/propagators/b3/src/common.ts index dd0d49a36..9cd12eed3 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/src/common.ts +++ b/pkgs/propagators/b3/src/common.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createContextKey } from '@opentelemetry/api'; +import { createContextKey } from '@opentelemetry/sandbox-api'; /** shared context for storing an extracted b3 debug flag */ export const B3_DEBUG_FLAG_KEY = createContextKey( diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/constants.ts b/pkgs/propagators/b3/src/constants.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/constants.ts rename to pkgs/propagators/b3/src/constants.ts diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/index.ts b/pkgs/propagators/b3/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/index.ts rename to pkgs/propagators/b3/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/src/types.ts b/pkgs/propagators/b3/src/types.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/src/types.ts rename to pkgs/propagators/b3/src/types.ts diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts b/pkgs/propagators/b3/test/B3MultiPropagator.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts rename to pkgs/propagators/b3/test/B3MultiPropagator.test.ts index a314385b5..9c992a484 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/test/B3MultiPropagator.test.ts +++ b/pkgs/propagators/b3/test/B3MultiPropagator.test.ts @@ -20,9 +20,9 @@ import { SpanContext, trace, TraceFlags, -} from '@opentelemetry/api'; -import { ROOT_CONTEXT } from '@opentelemetry/api'; -import { suppressTracing } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; +import { suppressTracing } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { B3MultiPropagator } from '../src/B3MultiPropagator'; import { diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts b/pkgs/propagators/b3/test/B3Propagator.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts rename to pkgs/propagators/b3/test/B3Propagator.test.ts index 20ebcf3cd..db6f20cc9 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/test/B3Propagator.test.ts +++ b/pkgs/propagators/b3/test/B3Propagator.test.ts @@ -21,8 +21,8 @@ import { TraceFlags, ROOT_CONTEXT, trace, -} from '@opentelemetry/api'; -import { suppressTracing } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { suppressTracing } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { B3Propagator } from '../src/B3Propagator'; import { diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts b/pkgs/propagators/b3/test/B3SinglePropagator.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts rename to pkgs/propagators/b3/test/B3SinglePropagator.test.ts index 231a111ff..4b86806ed 100644 --- a/auto-merge/js/packages/opentelemetry-propagator-b3/test/B3SinglePropagator.test.ts +++ b/pkgs/propagators/b3/test/B3SinglePropagator.test.ts @@ -23,8 +23,8 @@ import { SpanContext, TraceFlags, trace, -} from '@opentelemetry/api'; -import { suppressTracing } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { suppressTracing } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { B3SinglePropagator } from '../src/B3SinglePropagator'; import { B3_DEBUG_FLAG_KEY } from '../src/common'; diff --git a/pkgs/propagators/b3/test/index-webpack.ts b/pkgs/propagators/b3/test/index-webpack.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/propagators/b3/test/index-webpack.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/pkgs/propagators/b3/tsconfig.esm.json b/pkgs/propagators/b3/tsconfig.esm.json new file mode 100644 index 000000000..d0d0ce24d --- /dev/null +++ b/pkgs/propagators/b3/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/propagators/b3/tsconfig.esnext.json b/pkgs/propagators/b3/tsconfig.esnext.json new file mode 100644 index 000000000..8e1d797d3 --- /dev/null +++ b/pkgs/propagators/b3/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/propagators/b3/tsconfig.json b/pkgs/propagators/b3/tsconfig.json new file mode 100644 index 000000000..e4729001d --- /dev/null +++ b/pkgs/propagators/b3/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/.eslintignore b/pkgs/resources/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/.eslintignore rename to pkgs/resources/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-exporter-zipkin/.eslintrc.js b/pkgs/resources/.eslintrc.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-exporter-zipkin/.eslintrc.js rename to pkgs/resources/.eslintrc.js diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/.npmignore b/pkgs/resources/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/.npmignore rename to pkgs/resources/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-resources/LICENSE b/pkgs/resources/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/LICENSE rename to pkgs/resources/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-resources/README.md b/pkgs/resources/README.md similarity index 92% rename from auto-merge/js/packages/opentelemetry-resources/README.md rename to pkgs/resources/README.md index 8b379ec18..0a42a064a 100644 --- a/auto-merge/js/packages/opentelemetry-resources/README.md +++ b/pkgs/resources/README.md @@ -16,8 +16,8 @@ npm install --save @opentelemetry/resources ## Usage ```typescript -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; -import { Resource } from '@opentelemetry/resources'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; +import { Resource } from '@opentelemetry/sandbox-resources'; const resource = new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'api-service', diff --git a/auto-merge/js/packages/sdk-metrics/karma.conf.js b/pkgs/resources/karma.conf.js similarity index 100% rename from auto-merge/js/packages/sdk-metrics/karma.conf.js rename to pkgs/resources/karma.conf.js diff --git a/pkgs/resources/karma.debug.conf.js b/pkgs/resources/karma.debug.conf.js new file mode 100644 index 000000000..e2d096d8e --- /dev/null +++ b/pkgs/resources/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/auto-merge/js/packages/opentelemetry-resources/karma.worker.js b/pkgs/resources/karma.worker.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/karma.worker.js rename to pkgs/resources/karma.worker.js diff --git a/pkgs/resources/package.json b/pkgs/resources/package.json new file mode 100644 index 000000000..b25f8d147 --- /dev/null +++ b/pkgs/resources/package.json @@ -0,0 +1,125 @@ +{ + "name": "@opentelemetry/sandbox-resources", + "version": "1.15.2", + "description": "OpenTelemetry SDK resources", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "resources", + "stats", + "profiling" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@opentelemetry/resources": "npm:@opentelemetry/resources@1.9.0", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nock": "13.3.2", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/resources/rollup.config.js b/pkgs/resources/rollup.config.js new file mode 100644 index 000000000..45c421e62 --- /dev/null +++ b/pkgs/resources/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.resources", inputName, "otel-sndbx.resources", version); diff --git a/auto-merge/js/packages/opentelemetry-resources/src/IResource.ts b/pkgs/resources/src/IResource.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/IResource.ts rename to pkgs/resources/src/IResource.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/Resource.ts b/pkgs/resources/src/Resource.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-resources/src/Resource.ts rename to pkgs/resources/src/Resource.ts index dfddda8ae..8cf590521 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/Resource.ts +++ b/pkgs/resources/src/Resource.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; -import { SDK_INFO } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; +import { SDK_INFO } from '@opentelemetry/sandbox-core'; import { ResourceAttributes } from './types'; import { defaultServiceName } from './platform'; import { IResource } from './IResource'; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/config.ts b/pkgs/resources/src/config.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/config.ts rename to pkgs/resources/src/config.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detect-resources.ts b/pkgs/resources/src/detect-resources.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-resources/src/detect-resources.ts rename to pkgs/resources/src/detect-resources.ts index 4fa477a4f..3f0ba37f2 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/detect-resources.ts +++ b/pkgs/resources/src/detect-resources.ts @@ -16,7 +16,7 @@ import { Resource } from './Resource'; import { ResourceDetectionConfig } from './config'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import { isPromiseLike } from './utils'; import { Detector, DetectorSync } from './types'; import { IResource } from './IResource'; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/BrowserDetector.ts b/pkgs/resources/src/detectors/BrowserDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/BrowserDetector.ts rename to pkgs/resources/src/detectors/BrowserDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/BrowserDetectorSync.ts b/pkgs/resources/src/detectors/BrowserDetectorSync.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/BrowserDetectorSync.ts rename to pkgs/resources/src/detectors/BrowserDetectorSync.ts index b58fea94c..ab03ef92e 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/detectors/BrowserDetectorSync.ts +++ b/pkgs/resources/src/detectors/BrowserDetectorSync.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { DetectorSync, IResource, Resource, ResourceDetectionConfig } from '..'; import { ResourceAttributes } from '../types'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; /** * BrowserDetectorSync will be used to detect the resources related to browser. diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/EnvDetector.ts b/pkgs/resources/src/detectors/EnvDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/EnvDetector.ts rename to pkgs/resources/src/detectors/EnvDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/EnvDetectorSync.ts b/pkgs/resources/src/detectors/EnvDetectorSync.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/EnvDetectorSync.ts rename to pkgs/resources/src/detectors/EnvDetectorSync.ts index 1230657e1..86502a639 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/detectors/EnvDetectorSync.ts +++ b/pkgs/resources/src/detectors/EnvDetectorSync.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { getEnv } from '@opentelemetry/core'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { diag } from '@opentelemetry/sandbox-api'; +import { getEnv } from '@opentelemetry/sandbox-core'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { Resource } from '../Resource'; import { DetectorSync, ResourceAttributes } from '../types'; import { ResourceDetectionConfig } from '../config'; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/NoopDetector.ts b/pkgs/resources/src/detectors/NoopDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/NoopDetector.ts rename to pkgs/resources/src/detectors/NoopDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/NoopDetectorSync.ts b/pkgs/resources/src/detectors/NoopDetectorSync.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/NoopDetectorSync.ts rename to pkgs/resources/src/detectors/NoopDetectorSync.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/detectors/index.ts b/pkgs/resources/src/detectors/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/detectors/index.ts rename to pkgs/resources/src/detectors/index.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/index.ts b/pkgs/resources/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/index.ts rename to pkgs/resources/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/HostDetector.ts b/pkgs/resources/src/platform/browser/HostDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/HostDetector.ts rename to pkgs/resources/src/platform/browser/HostDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/HostDetectorSync.ts b/pkgs/resources/src/platform/browser/HostDetectorSync.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/HostDetectorSync.ts rename to pkgs/resources/src/platform/browser/HostDetectorSync.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/OSDetector.ts b/pkgs/resources/src/platform/browser/OSDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/OSDetector.ts rename to pkgs/resources/src/platform/browser/OSDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/OSDetectorSync.ts b/pkgs/resources/src/platform/browser/OSDetectorSync.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/OSDetectorSync.ts rename to pkgs/resources/src/platform/browser/OSDetectorSync.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/ProcessDetector.ts b/pkgs/resources/src/platform/browser/ProcessDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/ProcessDetector.ts rename to pkgs/resources/src/platform/browser/ProcessDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/ProcessDetectorSync.ts b/pkgs/resources/src/platform/browser/ProcessDetectorSync.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/ProcessDetectorSync.ts rename to pkgs/resources/src/platform/browser/ProcessDetectorSync.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts b/pkgs/resources/src/platform/browser/default-service-name.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/default-service-name.ts rename to pkgs/resources/src/platform/browser/default-service-name.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/browser/index.ts b/pkgs/resources/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/browser/index.ts rename to pkgs/resources/src/platform/browser/index.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/index.ts b/pkgs/resources/src/platform/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/index.ts rename to pkgs/resources/src/platform/index.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/HostDetector.ts b/pkgs/resources/src/platform/node/HostDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/HostDetector.ts rename to pkgs/resources/src/platform/node/HostDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/HostDetectorSync.ts b/pkgs/resources/src/platform/node/HostDetectorSync.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/HostDetectorSync.ts rename to pkgs/resources/src/platform/node/HostDetectorSync.ts index 9bd5e6cb5..84ec92bda 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/HostDetectorSync.ts +++ b/pkgs/resources/src/platform/node/HostDetectorSync.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { Resource } from '../../Resource'; import { DetectorSync, ResourceAttributes } from '../../types'; import { ResourceDetectionConfig } from '../../config'; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/OSDetector.ts b/pkgs/resources/src/platform/node/OSDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/OSDetector.ts rename to pkgs/resources/src/platform/node/OSDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/OSDetectorSync.ts b/pkgs/resources/src/platform/node/OSDetectorSync.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/OSDetectorSync.ts rename to pkgs/resources/src/platform/node/OSDetectorSync.ts index 9cb6a0385..aa8fa53c9 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/OSDetectorSync.ts +++ b/pkgs/resources/src/platform/node/OSDetectorSync.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { Resource } from '../../Resource'; import { DetectorSync, ResourceAttributes } from '../../types'; import { ResourceDetectionConfig } from '../../config'; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/ProcessDetector.ts b/pkgs/resources/src/platform/node/ProcessDetector.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/ProcessDetector.ts rename to pkgs/resources/src/platform/node/ProcessDetector.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/ProcessDetectorSync.ts b/pkgs/resources/src/platform/node/ProcessDetectorSync.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/ProcessDetectorSync.ts rename to pkgs/resources/src/platform/node/ProcessDetectorSync.ts index 4cad06a45..06c93478d 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/ProcessDetectorSync.ts +++ b/pkgs/resources/src/platform/node/ProcessDetectorSync.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { diag } from '@opentelemetry/sandbox-api'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { Resource } from '../../Resource'; import { DetectorSync, ResourceAttributes } from '../../types'; import { ResourceDetectionConfig } from '../../config'; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/default-service-name.ts b/pkgs/resources/src/platform/node/default-service-name.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/default-service-name.ts rename to pkgs/resources/src/platform/node/default-service-name.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/index.ts b/pkgs/resources/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/index.ts rename to pkgs/resources/src/platform/node/index.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/execAsync.ts b/pkgs/resources/src/platform/node/machine-id/execAsync.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/execAsync.ts rename to pkgs/resources/src/platform/node/machine-id/execAsync.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-bsd.ts b/pkgs/resources/src/platform/node/machine-id/getMachineId-bsd.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-bsd.ts rename to pkgs/resources/src/platform/node/machine-id/getMachineId-bsd.ts index eb6dd1be4..23b6555aa 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-bsd.ts +++ b/pkgs/resources/src/platform/node/machine-id/getMachineId-bsd.ts @@ -16,7 +16,7 @@ import { promises as fs } from 'fs'; import { execAsync } from './execAsync'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; export async function getMachineId(): Promise { try { diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-darwin.ts b/pkgs/resources/src/platform/node/machine-id/getMachineId-darwin.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-darwin.ts rename to pkgs/resources/src/platform/node/machine-id/getMachineId-darwin.ts index 7f6975ef5..70eab492d 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-darwin.ts +++ b/pkgs/resources/src/platform/node/machine-id/getMachineId-darwin.ts @@ -15,7 +15,7 @@ */ import { execAsync } from './execAsync'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; export async function getMachineId(): Promise { try { diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-linux.ts b/pkgs/resources/src/platform/node/machine-id/getMachineId-linux.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-linux.ts rename to pkgs/resources/src/platform/node/machine-id/getMachineId-linux.ts index 9ebfe58e8..1fc7da385 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-linux.ts +++ b/pkgs/resources/src/platform/node/machine-id/getMachineId-linux.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { promises as fs } from 'fs'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; export async function getMachineId(): Promise { const paths = ['/etc/machine-id', '/var/lib/dbus/machine-id']; diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-unsupported.ts b/pkgs/resources/src/platform/node/machine-id/getMachineId-unsupported.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-unsupported.ts rename to pkgs/resources/src/platform/node/machine-id/getMachineId-unsupported.ts index cc05ca1c2..9023941cd 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-unsupported.ts +++ b/pkgs/resources/src/platform/node/machine-id/getMachineId-unsupported.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; export async function getMachineId(): Promise { diag.debug('could not read machine-id: unsupported platform'); diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-win.ts b/pkgs/resources/src/platform/node/machine-id/getMachineId-win.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-win.ts rename to pkgs/resources/src/platform/node/machine-id/getMachineId-win.ts index 05e9d3b7c..5f3397c2d 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-win.ts +++ b/pkgs/resources/src/platform/node/machine-id/getMachineId-win.ts @@ -16,7 +16,7 @@ import * as process from 'process'; import { execAsync } from './execAsync'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; export async function getMachineId(): Promise { const args = diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId.ts b/pkgs/resources/src/platform/node/machine-id/getMachineId.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId.ts rename to pkgs/resources/src/platform/node/machine-id/getMachineId.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/platform/node/utils.ts b/pkgs/resources/src/platform/node/utils.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/platform/node/utils.ts rename to pkgs/resources/src/platform/node/utils.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/src/types.ts b/pkgs/resources/src/types.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-resources/src/types.ts rename to pkgs/resources/src/types.ts index d20c09faa..5fd24e504 100644 --- a/auto-merge/js/packages/opentelemetry-resources/src/types.ts +++ b/pkgs/resources/src/types.ts @@ -15,7 +15,7 @@ */ import { ResourceDetectionConfig } from './config'; -import { SpanAttributes } from '@opentelemetry/api'; +import { SpanAttributes } from '@opentelemetry/sandbox-api'; import { IResource } from './IResource'; /** diff --git a/auto-merge/js/packages/opentelemetry-resources/src/utils.ts b/pkgs/resources/src/utils.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/src/utils.ts rename to pkgs/resources/src/utils.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/Resource.test.ts b/pkgs/resources/test/Resource.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-resources/test/Resource.test.ts rename to pkgs/resources/test/Resource.test.ts index b35554228..039e82627 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/Resource.test.ts +++ b/pkgs/resources/test/Resource.test.ts @@ -16,12 +16,12 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { SDK_INFO } from '@opentelemetry/core'; +import { SDK_INFO } from '@opentelemetry/sandbox-core'; import { Resource, ResourceAttributes } from '../src'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { describeBrowser, describeNode } from './util'; -import { diag } from '@opentelemetry/api'; -import { Resource as Resource190 } from '@opentelemetry/resources_1.9.0'; +import { diag } from '@opentelemetry/sandbox-api'; +import { Resource as Resource190 } from '@opentelemetry/resources'; describe('Resource', () => { const resource1 = new Resource({ diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detect-resources.test.ts b/pkgs/resources/test/detect-resources.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-resources/test/detect-resources.test.ts rename to pkgs/resources/test/detect-resources.test.ts index 0db97057d..c0155361b 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/detect-resources.test.ts +++ b/pkgs/resources/test/detect-resources.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { Resource, Detector, detectResourcesSync, DetectorSync } from '../src'; diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/BrowserDetector.test.ts b/pkgs/resources/test/detectors/browser/BrowserDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/BrowserDetector.test.ts rename to pkgs/resources/test/detectors/browser/BrowserDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/EnvDetector.test.ts b/pkgs/resources/test/detectors/browser/EnvDetector.test.ts similarity index 94% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/EnvDetector.test.ts rename to pkgs/resources/test/detectors/browser/EnvDetector.test.ts index 890159577..e2f418a2d 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/EnvDetector.test.ts +++ b/pkgs/resources/test/detectors/browser/EnvDetector.test.ts @@ -15,8 +15,8 @@ */ import * as assert from 'assert'; -import { RAW_ENVIRONMENT } from '@opentelemetry/core'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { RAW_ENVIRONMENT } from '@opentelemetry/sandbox-core'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { envDetector, IResource } from '../../../src'; import { assertEmptyResource, diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/HostDetector.test.ts b/pkgs/resources/test/detectors/browser/HostDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/HostDetector.test.ts rename to pkgs/resources/test/detectors/browser/HostDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/OSDetector.test.ts b/pkgs/resources/test/detectors/browser/OSDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/OSDetector.test.ts rename to pkgs/resources/test/detectors/browser/OSDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/ProcessDetector.test.ts b/pkgs/resources/test/detectors/browser/ProcessDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/browser/ProcessDetector.test.ts rename to pkgs/resources/test/detectors/browser/ProcessDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/BrowserDetector.test.ts b/pkgs/resources/test/detectors/node/BrowserDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/BrowserDetector.test.ts rename to pkgs/resources/test/detectors/node/BrowserDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/EnvDetector.test.ts b/pkgs/resources/test/detectors/node/EnvDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/EnvDetector.test.ts rename to pkgs/resources/test/detectors/node/EnvDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/HostDetector.test.ts b/pkgs/resources/test/detectors/node/HostDetector.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/HostDetector.test.ts rename to pkgs/resources/test/detectors/node/HostDetector.test.ts index 2e69de7e1..db99854dc 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/HostDetector.test.ts +++ b/pkgs/resources/test/detectors/node/HostDetector.test.ts @@ -16,7 +16,7 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { describeNode } from '../../util'; import { hostDetector, IResource } from '../../../src'; diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/OSDetector.test.ts b/pkgs/resources/test/detectors/node/OSDetector.test.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/OSDetector.test.ts rename to pkgs/resources/test/detectors/node/OSDetector.test.ts index 58b1989ec..75533b240 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/OSDetector.test.ts +++ b/pkgs/resources/test/detectors/node/OSDetector.test.ts @@ -16,7 +16,7 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { describeNode } from '../../util'; import { osDetector, IResource } from '../../../src'; diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/ProcessDetector.test.ts b/pkgs/resources/test/detectors/node/ProcessDetector.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/ProcessDetector.test.ts rename to pkgs/resources/test/detectors/node/ProcessDetector.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts b/pkgs/resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts rename to pkgs/resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts b/pkgs/resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts rename to pkgs/resources/test/detectors/node/machine-id/getMachineId-darwin.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-linux.test.ts b/pkgs/resources/test/detectors/node/machine-id/getMachineId-linux.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-linux.test.ts rename to pkgs/resources/test/detectors/node/machine-id/getMachineId-linux.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-win.test.ts b/pkgs/resources/test/detectors/node/machine-id/getMachineId-win.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-win.test.ts rename to pkgs/resources/test/detectors/node/machine-id/getMachineId-win.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/index-webpack.ts b/pkgs/resources/test/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/index-webpack.ts rename to pkgs/resources/test/index-webpack.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/index-webpack.worker.ts b/pkgs/resources/test/index-webpack.worker.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/index-webpack.worker.ts rename to pkgs/resources/test/index-webpack.worker.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/regression/existing-detectors-1-9-1.test.ts b/pkgs/resources/test/regression/existing-detectors-1-9-1.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/regression/existing-detectors-1-9-1.test.ts rename to pkgs/resources/test/regression/existing-detectors-1-9-1.test.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/resource-assertions.test.ts b/pkgs/resources/test/resource-assertions.test.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-resources/test/resource-assertions.test.ts rename to pkgs/resources/test/resource-assertions.test.ts index cde2b8a9f..b2b77f96f 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/resource-assertions.test.ts +++ b/pkgs/resources/test/resource-assertions.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { SDK_INFO } from '@opentelemetry/core'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SDK_INFO } from '@opentelemetry/sandbox-core'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { Resource } from '../src/Resource'; import { assertCloudResource, diff --git a/auto-merge/js/packages/opentelemetry-resources/test/util.ts b/pkgs/resources/test/util.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/test/util.ts rename to pkgs/resources/test/util.ts diff --git a/auto-merge/js/packages/opentelemetry-resources/test/util/resource-assertions.ts b/pkgs/resources/test/util/resource-assertions.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-resources/test/util/resource-assertions.ts rename to pkgs/resources/test/util/resource-assertions.ts index 02f1a70dd..159ecac14 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/util/resource-assertions.ts +++ b/pkgs/resources/test/util/resource-assertions.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { SDK_INFO } from '@opentelemetry/core'; +import { SDK_INFO } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { IResource } from '../../src/IResource'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; /** * Test utility method to validate a cloud resource diff --git a/auto-merge/js/packages/opentelemetry-resources/test/util/sample-detector.ts b/pkgs/resources/test/util/sample-detector.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-resources/test/util/sample-detector.ts rename to pkgs/resources/test/util/sample-detector.ts index 841a76095..650a56f63 100644 --- a/auto-merge/js/packages/opentelemetry-resources/test/util/sample-detector.ts +++ b/pkgs/resources/test/util/sample-detector.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { Detector, Resource } from '../../src'; class SampleDetector implements Detector { diff --git a/pkgs/resources/tsconfig.esm.json b/pkgs/resources/tsconfig.esm.json new file mode 100644 index 000000000..6f96cbec1 --- /dev/null +++ b/pkgs/resources/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/resources/tsconfig.esnext.json b/pkgs/resources/tsconfig.esnext.json new file mode 100644 index 000000000..2525ac36a --- /dev/null +++ b/pkgs/resources/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/resources/tsconfig.json b/pkgs/resources/tsconfig.json new file mode 100644 index 000000000..cb48d4258 --- /dev/null +++ b/pkgs/resources/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-resources/.eslintignore b/pkgs/sdk/logs/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/.eslintignore rename to pkgs/sdk/logs/.eslintignore diff --git a/auto-merge/js/experimental/packages/sdk-logs/.eslintrc.js b/pkgs/sdk/logs/.eslintrc.js similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/.eslintrc.js rename to pkgs/sdk/logs/.eslintrc.js diff --git a/auto-merge/js/packages/opentelemetry-resources/.npmignore b/pkgs/sdk/logs/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-resources/.npmignore rename to pkgs/sdk/logs/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/LICENSE b/pkgs/sdk/logs/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/LICENSE rename to pkgs/sdk/logs/LICENSE diff --git a/auto-merge/js/experimental/packages/sdk-logs/README.md b/pkgs/sdk/logs/README.md similarity index 96% rename from auto-merge/js/experimental/packages/sdk-logs/README.md rename to pkgs/sdk/logs/README.md index e68654f99..5c4673693 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/README.md +++ b/pkgs/sdk/logs/README.md @@ -23,12 +23,12 @@ npm install --save @opentelemetry/sdk-logs The basic setup of the SDK can be seen as followings: ```js -const logsAPI = require('@opentelemetry/api-logs'); +const logsAPI = require('@opentelemetry/sandbox-api-logs'); const { LoggerProvider, SimpleLogRecordProcessor, ConsoleLogRecordExporter, -} = require('@opentelemetry/sdk-logs'); +} = require('@opentelemetry/sandbox-sdk-logs'); // To start a logger, you first need to initialize the Logger provider. const loggerProvider = new LoggerProvider(); diff --git a/auto-merge/js/experimental/packages/sdk-logs/karma.conf.js b/pkgs/sdk/logs/karma.conf.js similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/karma.conf.js rename to pkgs/sdk/logs/karma.conf.js diff --git a/pkgs/sdk/logs/karma.debug.conf.js b/pkgs/sdk/logs/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/sdk/logs/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/sdk/logs/karma.webpack.js b/pkgs/sdk/logs/karma.webpack.js new file mode 100644 index 000000000..bc821e073 --- /dev/null +++ b/pkgs/sdk/logs/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/sdk/logs/karma.worker.js b/pkgs/sdk/logs/karma.worker.js new file mode 100644 index 000000000..eb6ee53e9 --- /dev/null +++ b/pkgs/sdk/logs/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../karma.webpack'); +const karmaBaseConfig = require('../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/sdk/logs/package.json b/pkgs/sdk/logs/package.json new file mode 100644 index 000000000..c61b725a7 --- /dev/null +++ b/pkgs/sdk/logs/package.json @@ -0,0 +1,131 @@ +{ + "name": "@opentelemetry/sandbox-sdk-logs", + "version": "0.41.2", + "publishConfig": { + "access": "public" + }, + "description": "OpenTelemetry logs SDK", + "author": "OpenTelemetry Authors", + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/sdk-logs", + "license": "Apache-2.0", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/open-telemetry/opentelemetry-js.git" + }, + "bugs": { + "url": "https://github.com/open-telemetry/opentelemetry-js/issues" + }, + "engines": { + "node": ">=14" + }, + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "tdd:browser": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "logs", + "stats", + "profiling" + ], + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "sideEffects": false, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-api-logs": "0.41.2" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-api-logs": "0.41.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-resources": "1.15.2" + } +} \ No newline at end of file diff --git a/pkgs/sdk/logs/rollup.config.js b/pkgs/sdk/logs/rollup.config.js new file mode 100644 index 000000000..c9b5c9c18 --- /dev/null +++ b/pkgs/sdk/logs/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.sdk-logs", inputName, "otel-sndbx.sdk-logs", version); diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/LogRecord.ts b/pkgs/sdk/logs/src/LogRecord.ts similarity index 94% rename from auto-merge/js/experimental/packages/sdk-logs/src/LogRecord.ts rename to pkgs/sdk/logs/src/LogRecord.ts index d184004e6..2b7e31a95 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/LogRecord.ts +++ b/pkgs/sdk/logs/src/LogRecord.ts @@ -14,20 +14,20 @@ * limitations under the License. */ -import { AttributeValue, diag } from '@opentelemetry/api'; -import type * as logsAPI from '@opentelemetry/api-logs'; -import * as api from '@opentelemetry/api'; +import { AttributeValue, diag } from '@opentelemetry/sandbox-api'; +import type * as logsAPI from '@opentelemetry/sandbox-api-logs'; +import * as api from '@opentelemetry/sandbox-api'; import { timeInputToHrTime, isAttributeValue, InstrumentationScope, -} from '@opentelemetry/core'; -import type { IResource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-core'; +import type { IResource } from '@opentelemetry/sandbox-resources'; import type { ReadableLogRecord } from './export/ReadableLogRecord'; import type { LogRecordLimits } from './types'; import { Logger } from './Logger'; -import { LogAttributes } from '@opentelemetry/api-logs'; +import { LogAttributes } from '@opentelemetry/sandbox-api-logs'; export class LogRecord implements ReadableLogRecord { readonly hrTime: api.HrTime; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/LogRecordProcessor.ts b/pkgs/sdk/logs/src/LogRecordProcessor.ts similarity index 95% rename from auto-merge/js/experimental/packages/sdk-logs/src/LogRecordProcessor.ts rename to pkgs/sdk/logs/src/LogRecordProcessor.ts index c68a26c90..26734ee55 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/LogRecordProcessor.ts +++ b/pkgs/sdk/logs/src/LogRecordProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context } from '@opentelemetry/api'; +import { Context } from '@opentelemetry/sandbox-api'; import { LogRecord } from './LogRecord'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/Logger.ts b/pkgs/sdk/logs/src/Logger.ts similarity index 90% rename from auto-merge/js/experimental/packages/sdk-logs/src/Logger.ts rename to pkgs/sdk/logs/src/Logger.ts index 5ea4e8f28..c612cde2c 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/Logger.ts +++ b/pkgs/sdk/logs/src/Logger.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import type * as logsAPI from '@opentelemetry/api-logs'; -import type { IResource } from '@opentelemetry/resources'; -import type { InstrumentationScope } from '@opentelemetry/core'; -import { context } from '@opentelemetry/api'; +import type * as logsAPI from '@opentelemetry/sandbox-api-logs'; +import type { IResource } from '@opentelemetry/sandbox-resources'; +import type { InstrumentationScope } from '@opentelemetry/sandbox-core'; +import { context } from '@opentelemetry/sandbox-api'; import type { LoggerConfig, LogRecordLimits } from './types'; import { LogRecord } from './LogRecord'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/LoggerProvider.ts b/pkgs/sdk/logs/src/LoggerProvider.ts similarity index 93% rename from auto-merge/js/experimental/packages/sdk-logs/src/LoggerProvider.ts rename to pkgs/sdk/logs/src/LoggerProvider.ts index 81515dab8..da83039c4 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/LoggerProvider.ts +++ b/pkgs/sdk/logs/src/LoggerProvider.ts @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import type * as logsAPI from '@opentelemetry/api-logs'; -import { NOOP_LOGGER } from '@opentelemetry/api-logs'; -import { IResource, Resource } from '@opentelemetry/resources'; -import { BindOnceFuture, merge } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import type * as logsAPI from '@opentelemetry/sandbox-api-logs'; +import { NOOP_LOGGER } from '@opentelemetry/sandbox-api-logs'; +import { IResource, Resource } from '@opentelemetry/sandbox-resources'; +import { BindOnceFuture, merge } from '@opentelemetry/sandbox-core'; import type { LoggerProviderConfig } from './types'; import type { LogRecordProcessor } from './LogRecordProcessor'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/MultiLogRecordProcessor.ts b/pkgs/sdk/logs/src/MultiLogRecordProcessor.ts similarity index 96% rename from auto-merge/js/experimental/packages/sdk-logs/src/MultiLogRecordProcessor.ts rename to pkgs/sdk/logs/src/MultiLogRecordProcessor.ts index c4e503126..d0a664365 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/MultiLogRecordProcessor.ts +++ b/pkgs/sdk/logs/src/MultiLogRecordProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { callWithTimeout } from '@opentelemetry/core'; +import { callWithTimeout } from '@opentelemetry/sandbox-core'; import type { LogRecordProcessor } from './LogRecordProcessor'; import type { LogRecord } from './LogRecord'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/config.ts b/pkgs/sdk/logs/src/config.ts similarity index 98% rename from auto-merge/js/experimental/packages/sdk-logs/src/config.ts rename to pkgs/sdk/logs/src/config.ts index af908f165..00c734c6a 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/config.ts +++ b/pkgs/sdk/logs/src/config.ts @@ -19,7 +19,7 @@ import { DEFAULT_ATTRIBUTE_VALUE_LENGTH_LIMIT, getEnv, getEnvWithoutDefaults, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { LoggerConfig } from './types'; export function loadDefaultConfig() { diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts b/pkgs/sdk/logs/src/export/BatchLogRecordProcessorBase.ts similarity index 97% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts rename to pkgs/sdk/logs/src/export/BatchLogRecordProcessorBase.ts index 92d42fe44..7508fc78e 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts +++ b/pkgs/sdk/logs/src/export/BatchLogRecordProcessorBase.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import type { ExportResult } from '@opentelemetry/core'; -import { diag } from '@opentelemetry/api'; +import type { ExportResult } from '@opentelemetry/sandbox-core'; +import { diag } from '@opentelemetry/sandbox-api'; import { ExportResultCode, getEnv, @@ -23,7 +23,7 @@ import { unrefTimer, callWithTimeout, BindOnceFuture, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import type { BufferConfig } from '../types'; import type { LogRecord } from '../LogRecord'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts b/pkgs/sdk/logs/src/export/ConsoleLogRecordExporter.ts similarity index 96% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts rename to pkgs/sdk/logs/src/export/ConsoleLogRecordExporter.ts index edf7c0bf8..3433db5c4 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/export/ConsoleLogRecordExporter.ts +++ b/pkgs/sdk/logs/src/export/ConsoleLogRecordExporter.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { ExportResult, hrTimeToMicroseconds } from '@opentelemetry/core'; -import { ExportResultCode } from '@opentelemetry/core'; +import { ExportResult, hrTimeToMicroseconds } from '@opentelemetry/sandbox-core'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; import type { ReadableLogRecord } from './ReadableLogRecord'; import type { LogRecordExporter } from './LogRecordExporter'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/InMemoryLogRecordExporter.ts b/pkgs/sdk/logs/src/export/InMemoryLogRecordExporter.ts similarity index 93% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/InMemoryLogRecordExporter.ts rename to pkgs/sdk/logs/src/export/InMemoryLogRecordExporter.ts index 526fd8ddd..8f4bb2fbf 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/export/InMemoryLogRecordExporter.ts +++ b/pkgs/sdk/logs/src/export/InMemoryLogRecordExporter.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import type { ExportResult } from '@opentelemetry/core'; -import { ExportResultCode } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/sandbox-core'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; import type { ReadableLogRecord } from './ReadableLogRecord'; import type { LogRecordExporter } from './LogRecordExporter'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/LogRecordExporter.ts b/pkgs/sdk/logs/src/export/LogRecordExporter.ts similarity index 93% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/LogRecordExporter.ts rename to pkgs/sdk/logs/src/export/LogRecordExporter.ts index 4fecb2a8c..c56973cb6 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/export/LogRecordExporter.ts +++ b/pkgs/sdk/logs/src/export/LogRecordExporter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { ExportResult } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/sandbox-core'; import type { ReadableLogRecord } from './ReadableLogRecord'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/NoopLogRecordProcessor.ts b/pkgs/sdk/logs/src/export/NoopLogRecordProcessor.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/NoopLogRecordProcessor.ts rename to pkgs/sdk/logs/src/export/NoopLogRecordProcessor.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts b/pkgs/sdk/logs/src/export/ReadableLogRecord.ts similarity index 81% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts rename to pkgs/sdk/logs/src/export/ReadableLogRecord.ts index a7eff21e2..488620a48 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/export/ReadableLogRecord.ts +++ b/pkgs/sdk/logs/src/export/ReadableLogRecord.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import type { IResource } from '@opentelemetry/resources'; -import type { HrTime, SpanContext } from '@opentelemetry/api'; -import type { InstrumentationScope } from '@opentelemetry/core'; -import type { LogAttributes, SeverityNumber } from '@opentelemetry/api-logs'; +import type { IResource } from '@opentelemetry/sandbox-resources'; +import type { HrTime, SpanContext } from '@opentelemetry/sandbox-api'; +import type { InstrumentationScope } from '@opentelemetry/sandbox-core'; +import type { LogAttributes, SeverityNumber } from '@opentelemetry/sandbox-api-logs'; export interface ReadableLogRecord { readonly hrTime: HrTime; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts b/pkgs/sdk/logs/src/export/SimpleLogRecordProcessor.ts similarity index 94% rename from auto-merge/js/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts rename to pkgs/sdk/logs/src/export/SimpleLogRecordProcessor.ts index b516d55fc..801448d49 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/export/SimpleLogRecordProcessor.ts +++ b/pkgs/sdk/logs/src/export/SimpleLogRecordProcessor.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import type { ExportResult } from '@opentelemetry/core'; +import type { ExportResult } from '@opentelemetry/sandbox-core'; import { BindOnceFuture, ExportResultCode, globalErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import type { LogRecordExporter } from './LogRecordExporter'; import type { LogRecordProcessor } from '../LogRecordProcessor'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/index.ts b/pkgs/sdk/logs/src/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/index.ts rename to pkgs/sdk/logs/src/index.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/platform/browser/export/BatchLogRecordProcessor.ts b/pkgs/sdk/logs/src/platform/browser/export/BatchLogRecordProcessor.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/platform/browser/export/BatchLogRecordProcessor.ts rename to pkgs/sdk/logs/src/platform/browser/export/BatchLogRecordProcessor.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/platform/browser/index.ts b/pkgs/sdk/logs/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/platform/browser/index.ts rename to pkgs/sdk/logs/src/platform/browser/index.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/platform/index.ts b/pkgs/sdk/logs/src/platform/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/platform/index.ts rename to pkgs/sdk/logs/src/platform/index.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/platform/node/export/BatchLogRecordProcessor.ts b/pkgs/sdk/logs/src/platform/node/export/BatchLogRecordProcessor.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/platform/node/export/BatchLogRecordProcessor.ts rename to pkgs/sdk/logs/src/platform/node/export/BatchLogRecordProcessor.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/platform/node/index.ts b/pkgs/sdk/logs/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/src/platform/node/index.ts rename to pkgs/sdk/logs/src/platform/node/index.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/src/types.ts b/pkgs/sdk/logs/src/types.ts similarity index 97% rename from auto-merge/js/experimental/packages/sdk-logs/src/types.ts rename to pkgs/sdk/logs/src/types.ts index 026843dc1..81a41a104 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/src/types.ts +++ b/pkgs/sdk/logs/src/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { IResource } from '@opentelemetry/resources'; +import type { IResource } from '@opentelemetry/sandbox-resources'; export interface LoggerProviderConfig { /** Resource associated with trace telemetry */ diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/browser/export/BatchLogRecordProcessor.test.ts b/pkgs/sdk/logs/test/browser/export/BatchLogRecordProcessor.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/test/browser/export/BatchLogRecordProcessor.test.ts rename to pkgs/sdk/logs/test/browser/export/BatchLogRecordProcessor.test.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/LogRecord.test.ts b/pkgs/sdk/logs/test/common/LogRecord.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/LogRecord.test.ts rename to pkgs/sdk/logs/test/common/LogRecord.test.ts index cc7ce8baf..b45c3c33d 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/LogRecord.test.ts +++ b/pkgs/sdk/logs/test/common/LogRecord.test.ts @@ -23,11 +23,11 @@ import { ROOT_CONTEXT, trace, TraceFlags, -} from '@opentelemetry/api'; -import * as logsAPI from '@opentelemetry/api-logs'; -import type { HrTime } from '@opentelemetry/api'; -import { hrTimeToMilliseconds, timeInputToHrTime } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-api'; +import * as logsAPI from '@opentelemetry/sandbox-api-logs'; +import type { HrTime } from '@opentelemetry/sandbox-api'; +import { hrTimeToMilliseconds, timeInputToHrTime } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; import { LogRecordLimits, diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/Logger.test.ts b/pkgs/sdk/logs/test/common/Logger.test.ts similarity index 96% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/Logger.test.ts rename to pkgs/sdk/logs/test/common/Logger.test.ts index a5f690a4b..286fa7c43 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/Logger.test.ts +++ b/pkgs/sdk/logs/test/common/Logger.test.ts @@ -18,8 +18,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import { LogRecord, Logger, LoggerConfig, LoggerProvider } from '../../src'; -import { ROOT_CONTEXT, TraceFlags, context, trace } from '@opentelemetry/api'; -import { LogRecord as ApiLogRecord } from '@opentelemetry/api-logs'; +import { ROOT_CONTEXT, TraceFlags, context, trace } from '@opentelemetry/sandbox-api'; +import { LogRecord as ApiLogRecord } from '@opentelemetry/sandbox-api-logs'; const setup = (loggerConfig: LoggerConfig = {}) => { const logger = new Logger( diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts b/pkgs/sdk/logs/test/common/LoggerProvider.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts rename to pkgs/sdk/logs/test/common/LoggerProvider.test.ts index d6032515a..c266c846e 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/LoggerProvider.test.ts +++ b/pkgs/sdk/logs/test/common/LoggerProvider.test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { logs, NoopLogger } from '@opentelemetry/api-logs'; -import { diag } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; +import { logs, NoopLogger } from '@opentelemetry/sandbox-api-logs'; +import { diag } from '@opentelemetry/sandbox-api'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; import * as sinon from 'sinon'; diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/MultiLogRecordProcessor.test.ts b/pkgs/sdk/logs/test/common/MultiLogRecordProcessor.test.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/MultiLogRecordProcessor.test.ts rename to pkgs/sdk/logs/test/common/MultiLogRecordProcessor.test.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts b/pkgs/sdk/logs/test/common/export/BatchLogRecordProcessor.test.ts similarity index 99% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts rename to pkgs/sdk/logs/test/common/export/BatchLogRecordProcessor.test.ts index 2d0fab7a2..c54dc3770 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/BatchLogRecordProcessor.test.ts +++ b/pkgs/sdk/logs/test/common/export/BatchLogRecordProcessor.test.ts @@ -21,7 +21,7 @@ import { getEnv, loggingErrorHandler, setGlobalErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { BufferConfig, diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/ConsoleLogRecordExporter.test.ts b/pkgs/sdk/logs/test/common/export/ConsoleLogRecordExporter.test.ts similarity index 97% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/export/ConsoleLogRecordExporter.test.ts rename to pkgs/sdk/logs/test/common/export/ConsoleLogRecordExporter.test.ts index bd28e8e12..9bd1991e7 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/ConsoleLogRecordExporter.test.ts +++ b/pkgs/sdk/logs/test/common/export/ConsoleLogRecordExporter.test.ts @@ -16,7 +16,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { SeverityNumber } from '@opentelemetry/api-logs'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; import { LoggerProvider, diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts b/pkgs/sdk/logs/test/common/export/InMemoryLogRecordExporter.test.ts similarity index 95% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts rename to pkgs/sdk/logs/test/common/export/InMemoryLogRecordExporter.test.ts index 410ec5a23..102ed3e4c 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/InMemoryLogRecordExporter.test.ts +++ b/pkgs/sdk/logs/test/common/export/InMemoryLogRecordExporter.test.ts @@ -15,8 +15,8 @@ */ import * as assert from 'assert'; -import { SeverityNumber } from '@opentelemetry/api-logs'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { SeverityNumber } from '@opentelemetry/sandbox-api-logs'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; import { LoggerProvider, diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts b/pkgs/sdk/logs/test/common/export/SimpleLogRecordProcessor.test.ts similarity index 98% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts rename to pkgs/sdk/logs/test/common/export/SimpleLogRecordProcessor.test.ts index 202554dde..8e9d12899 100644 --- a/auto-merge/js/experimental/packages/sdk-logs/test/common/export/SimpleLogRecordProcessor.test.ts +++ b/pkgs/sdk/logs/test/common/export/SimpleLogRecordProcessor.test.ts @@ -20,7 +20,7 @@ import { ExportResultCode, loggingErrorHandler, setGlobalErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { InMemoryLogRecordExporter, diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/common/utils.ts b/pkgs/sdk/logs/test/common/utils.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/test/common/utils.ts rename to pkgs/sdk/logs/test/common/utils.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/index-webpack.ts b/pkgs/sdk/logs/test/index-webpack.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/test/index-webpack.ts rename to pkgs/sdk/logs/test/index-webpack.ts diff --git a/auto-merge/js/experimental/packages/sdk-logs/test/index-webpack.worker.ts b/pkgs/sdk/logs/test/index-webpack.worker.ts similarity index 100% rename from auto-merge/js/experimental/packages/sdk-logs/test/index-webpack.worker.ts rename to pkgs/sdk/logs/test/index-webpack.worker.ts diff --git a/auto-merge/js/packages/opentelemetry-core/test/test-utils.ts b/pkgs/sdk/logs/test/test-utils.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-core/test/test-utils.ts rename to pkgs/sdk/logs/test/test-utils.ts diff --git a/pkgs/sdk/logs/tsconfig.esm.json b/pkgs/sdk/logs/tsconfig.esm.json new file mode 100644 index 000000000..d0d0ce24d --- /dev/null +++ b/pkgs/sdk/logs/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/logs/tsconfig.esnext.json b/pkgs/sdk/logs/tsconfig.esnext.json new file mode 100644 index 000000000..8e1d797d3 --- /dev/null +++ b/pkgs/sdk/logs/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/logs/tsconfig.json b/pkgs/sdk/logs/tsconfig.json new file mode 100644 index 000000000..23e961510 --- /dev/null +++ b/pkgs/sdk/logs/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/.eslintignore b/pkgs/sdk/metrics/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/.eslintignore rename to pkgs/sdk/metrics/.eslintignore diff --git a/pkgs/sdk/metrics/.eslintrc.js b/pkgs/sdk/metrics/.eslintrc.js new file mode 100644 index 000000000..9baf1b495 --- /dev/null +++ b/pkgs/sdk/metrics/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../../eslint.base.js') +} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/.npmignore b/pkgs/sdk/metrics/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/.npmignore rename to pkgs/sdk/metrics/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/LICENSE b/pkgs/sdk/metrics/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/LICENSE rename to pkgs/sdk/metrics/LICENSE diff --git a/auto-merge/js/packages/sdk-metrics/README.md b/pkgs/sdk/metrics/README.md similarity index 96% rename from auto-merge/js/packages/sdk-metrics/README.md rename to pkgs/sdk/metrics/README.md index e41993856..9a6dc1564 100644 --- a/auto-merge/js/packages/sdk-metrics/README.md +++ b/pkgs/sdk/metrics/README.md @@ -21,8 +21,8 @@ npm install --save @opentelemetry/sdk-metrics The basic setup of the SDK can be seen as followings: ```js -const opentelemetry = require('@opentelemetry/api'); -const { MeterProvider } = require('@opentelemetry/sdk-metrics'); +const opentelemetry = require('@opentelemetry/sandbox-api'); +const { MeterProvider } = require('@opentelemetry/sandbox-sdk-metrics'); // To create an instrument, you first need to initialize the Meter provider. // NOTE: The default OpenTelemetry meter provider does not record any metric instruments. diff --git a/auto-merge/js/experimental/packages/api-logs/karma.conf.js b/pkgs/sdk/metrics/karma.conf.js similarity index 100% rename from auto-merge/js/experimental/packages/api-logs/karma.conf.js rename to pkgs/sdk/metrics/karma.conf.js diff --git a/pkgs/sdk/metrics/karma.debug.conf.js b/pkgs/sdk/metrics/karma.debug.conf.js new file mode 100644 index 000000000..490933fdc --- /dev/null +++ b/pkgs/sdk/metrics/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/sdk/metrics/karma.webpack.js b/pkgs/sdk/metrics/karma.webpack.js new file mode 100644 index 000000000..bc821e073 --- /dev/null +++ b/pkgs/sdk/metrics/karma.webpack.js @@ -0,0 +1,42 @@ +/*! + * 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 + * + * 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. +*/ + +const webpackNodePolyfills = require("../../../webpack.node-polyfills.js"); + +module.exports = { + mode: "development", + target: "web", + output: { filename: "bundle.js" }, + resolve: { extensions: [".ts", ".js"] }, + devtool: "inline-source-map", + module: { + rules: [ + { test: /.ts$/, use: "ts-loader" }, + { + enforce: "post", + exclude: /(node_modules|.test.[tj]sx?$)/, + test: /.ts$/, + use: { + loader: "istanbul-instrumenter-loader", + options: { esModules: true } + } + }, + // This setting configures Node polyfills for the browser that will be + // added to the webpack bundle for Karma tests. + { parser: { node: webpackNodePolyfills } } + ] + } +}; diff --git a/pkgs/sdk/metrics/karma.worker.js b/pkgs/sdk/metrics/karma.worker.js new file mode 100644 index 000000000..eb6ee53e9 --- /dev/null +++ b/pkgs/sdk/metrics/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaWebpackConfig = require('../../../karma.webpack'); +const karmaBaseConfig = require('../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig, + })) +}; diff --git a/pkgs/sdk/metrics/package.json b/pkgs/sdk/metrics/package.json new file mode 100644 index 000000000..637f64d39 --- /dev/null +++ b/pkgs/sdk/metrics/package.json @@ -0,0 +1,119 @@ +{ + "name": "@opentelemetry/sandbox-sdk-metrics", + "version": "1.15.2", + "description": "OpenTelemetry metrics SDK", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run test -- --watch-extensions ts --watch", + "tdd:browser": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "metrics", + "stats", + "profiling" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/lodash.merge": "4.6.7", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "lodash.merge": "^4.6.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-metrics", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/sdk/metrics/rollup.config.js b/pkgs/sdk/metrics/rollup.config.js new file mode 100644 index 000000000..531daf152 --- /dev/null +++ b/pkgs/sdk/metrics/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.sdk-metrics", inputName, "otel-sndbx.sdk-metrics", version); diff --git a/auto-merge/js/packages/sdk-metrics/src/InstrumentDescriptor.ts b/pkgs/sdk/metrics/src/InstrumentDescriptor.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/src/InstrumentDescriptor.ts rename to pkgs/sdk/metrics/src/InstrumentDescriptor.ts index 01eabe261..3e577b932 100644 --- a/auto-merge/js/packages/sdk-metrics/src/InstrumentDescriptor.ts +++ b/pkgs/sdk/metrics/src/InstrumentDescriptor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { MetricOptions, ValueType } from '@opentelemetry/api'; +import { MetricOptions, ValueType } from '@opentelemetry/sandbox-api'; import { View } from './view/View'; /** diff --git a/auto-merge/js/packages/sdk-metrics/src/Instruments.ts b/pkgs/sdk/metrics/src/Instruments.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/Instruments.ts rename to pkgs/sdk/metrics/src/Instruments.ts index f665952f0..dc517e5cb 100644 --- a/auto-merge/js/packages/sdk-metrics/src/Instruments.ts +++ b/pkgs/sdk/metrics/src/Instruments.ts @@ -28,8 +28,8 @@ import { ObservableCounter, ObservableGauge, ObservableUpDownCounter, -} from '@opentelemetry/api'; -import { millisToHrTime } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { millisToHrTime } from '@opentelemetry/sandbox-core'; import { InstrumentDescriptor } from './InstrumentDescriptor'; import { ObservableRegistry } from './state/ObservableRegistry'; import { diff --git a/auto-merge/js/packages/sdk-metrics/src/Meter.ts b/pkgs/sdk/metrics/src/Meter.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/Meter.ts rename to pkgs/sdk/metrics/src/Meter.ts index b3d69d0df..0904c3bf3 100644 --- a/auto-merge/js/packages/sdk-metrics/src/Meter.ts +++ b/pkgs/sdk/metrics/src/Meter.ts @@ -25,7 +25,7 @@ import { ObservableUpDownCounter, BatchObservableCallback, Observable, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { createInstrumentDescriptor, InstrumentType, diff --git a/auto-merge/js/packages/sdk-metrics/src/MeterProvider.ts b/pkgs/sdk/metrics/src/MeterProvider.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/MeterProvider.ts rename to pkgs/sdk/metrics/src/MeterProvider.ts index f10cf42b9..5ccb20772 100644 --- a/auto-merge/js/packages/sdk-metrics/src/MeterProvider.ts +++ b/pkgs/sdk/metrics/src/MeterProvider.ts @@ -20,8 +20,8 @@ import { Meter as IMeter, MeterOptions, createNoopMeter, -} from '@opentelemetry/api'; -import { IResource, Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-api'; +import { IResource, Resource } from '@opentelemetry/sandbox-resources'; import { MetricReader } from './export/MetricReader'; import { MeterProviderSharedState } from './state/MeterProviderSharedState'; import { MetricCollector } from './state/MetricCollector'; diff --git a/auto-merge/js/packages/sdk-metrics/src/ObservableResult.ts b/pkgs/sdk/metrics/src/ObservableResult.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/ObservableResult.ts rename to pkgs/sdk/metrics/src/ObservableResult.ts index 9298a46d9..fb8f72dfb 100644 --- a/auto-merge/js/packages/sdk-metrics/src/ObservableResult.ts +++ b/pkgs/sdk/metrics/src/ObservableResult.ts @@ -21,7 +21,7 @@ import { ValueType, BatchObservableResult, Observable, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { AttributeHashMap } from './state/HashMap'; import { isObservableInstrument, ObservableInstrument } from './Instruments'; import { InstrumentDescriptor } from '.'; diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/Drop.ts b/pkgs/sdk/metrics/src/aggregator/Drop.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/Drop.ts rename to pkgs/sdk/metrics/src/aggregator/Drop.ts index 343c90357..e20572cd5 100644 --- a/auto-merge/js/packages/sdk-metrics/src/aggregator/Drop.ts +++ b/pkgs/sdk/metrics/src/aggregator/Drop.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { AggregationTemporality } from '../export/AggregationTemporality'; import { MetricData } from '../export/MetricData'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts b/pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts rename to pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts index 51c71ee21..a93ef9e0c 100644 --- a/auto-merge/js/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts +++ b/pkgs/sdk/metrics/src/aggregator/ExponentialHistogram.ts @@ -25,7 +25,7 @@ import { DataPointType, ExponentialHistogramMetricData, } from '../export/MetricData'; -import { diag, HrTime } from '@opentelemetry/api'; +import { diag, HrTime } from '@opentelemetry/sandbox-api'; import { InstrumentDescriptor, InstrumentType } from '../InstrumentDescriptor'; import { Maybe } from '../utils'; import { AggregationTemporality } from '../export/AggregationTemporality'; diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/Histogram.ts b/pkgs/sdk/metrics/src/aggregator/Histogram.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/Histogram.ts rename to pkgs/sdk/metrics/src/aggregator/Histogram.ts index f20784b05..1a07547c6 100644 --- a/auto-merge/js/packages/sdk-metrics/src/aggregator/Histogram.ts +++ b/pkgs/sdk/metrics/src/aggregator/Histogram.ts @@ -21,7 +21,7 @@ import { AggregatorKind, } from './types'; import { DataPointType, HistogramMetricData } from '../export/MetricData'; -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { InstrumentDescriptor, InstrumentType } from '../InstrumentDescriptor'; import { binarySearchLB, Maybe } from '../utils'; import { AggregationTemporality } from '../export/AggregationTemporality'; diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/LastValue.ts b/pkgs/sdk/metrics/src/aggregator/LastValue.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/LastValue.ts rename to pkgs/sdk/metrics/src/aggregator/LastValue.ts index 9c627130f..94b21692f 100644 --- a/auto-merge/js/packages/sdk-metrics/src/aggregator/LastValue.ts +++ b/pkgs/sdk/metrics/src/aggregator/LastValue.ts @@ -21,8 +21,8 @@ import { AggregatorKind, LastValue, } from './types'; -import { HrTime } from '@opentelemetry/api'; -import { millisToHrTime, hrTimeToMicroseconds } from '@opentelemetry/core'; +import { HrTime } from '@opentelemetry/sandbox-api'; +import { millisToHrTime, hrTimeToMicroseconds } from '@opentelemetry/sandbox-core'; import { DataPointType, GaugeMetricData } from '../export/MetricData'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; import { Maybe } from '../utils'; diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/Sum.ts b/pkgs/sdk/metrics/src/aggregator/Sum.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/Sum.ts rename to pkgs/sdk/metrics/src/aggregator/Sum.ts index ba53c389e..daf4f6637 100644 --- a/auto-merge/js/packages/sdk-metrics/src/aggregator/Sum.ts +++ b/pkgs/sdk/metrics/src/aggregator/Sum.ts @@ -21,7 +21,7 @@ import { Accumulation, AccumulationRecord, } from './types'; -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { DataPointType, SumMetricData } from '../export/MetricData'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; import { Maybe } from '../utils'; diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/Buckets.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/Buckets.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/Buckets.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/Buckets.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/ExponentMapping.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/LogarithmMapping.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/getMapping.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ieee754.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/ieee754.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/ieee754.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/ieee754.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/types.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/types.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/mapping/types.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/mapping/types.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/util.ts b/pkgs/sdk/metrics/src/aggregator/exponential-histogram/util.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/exponential-histogram/util.ts rename to pkgs/sdk/metrics/src/aggregator/exponential-histogram/util.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/index.ts b/pkgs/sdk/metrics/src/aggregator/index.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/index.ts rename to pkgs/sdk/metrics/src/aggregator/index.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/aggregator/types.ts b/pkgs/sdk/metrics/src/aggregator/types.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/aggregator/types.ts rename to pkgs/sdk/metrics/src/aggregator/types.ts index 16888256b..bbef16248 100644 --- a/auto-merge/js/packages/sdk-metrics/src/aggregator/types.ts +++ b/pkgs/sdk/metrics/src/aggregator/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime, MetricAttributes } from '@opentelemetry/api'; +import { HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { AggregationTemporality } from '../export/AggregationTemporality'; import { MetricData } from '../export/MetricData'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts b/pkgs/sdk/metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts rename to pkgs/sdk/metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts index 11aab6da2..fdb0d09e5 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts +++ b/pkgs/sdk/metrics/src/exemplar/AlignedHistogramBucketExemplarReservoir.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { FixedSizeExemplarReservoirBase } from './ExemplarReservoir'; /** diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts b/pkgs/sdk/metrics/src/exemplar/AlwaysSampleExemplarFilter.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts rename to pkgs/sdk/metrics/src/exemplar/AlwaysSampleExemplarFilter.ts index 9a4511e66..c788bcd6e 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/AlwaysSampleExemplarFilter.ts +++ b/pkgs/sdk/metrics/src/exemplar/AlwaysSampleExemplarFilter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { ExemplarFilter } from './ExemplarFilter'; export class AlwaysSampleExemplarFilter implements ExemplarFilter { diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/Exemplar.ts b/pkgs/sdk/metrics/src/exemplar/Exemplar.ts similarity index 95% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/Exemplar.ts rename to pkgs/sdk/metrics/src/exemplar/Exemplar.ts index d98246dc4..9fdce177e 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/Exemplar.ts +++ b/pkgs/sdk/metrics/src/exemplar/Exemplar.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime, MetricAttributes } from '@opentelemetry/api'; +import { HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; /** * A representation of an exemplar, which is a sample input measurement. diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts b/pkgs/sdk/metrics/src/exemplar/ExemplarFilter.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts rename to pkgs/sdk/metrics/src/exemplar/ExemplarFilter.ts index 78b8ca0f3..4fade738e 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/ExemplarFilter.ts +++ b/pkgs/sdk/metrics/src/exemplar/ExemplarFilter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; /** * This interface represents a ExemplarFilter. Exemplar filters are diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts b/pkgs/sdk/metrics/src/exemplar/ExemplarReservoir.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts rename to pkgs/sdk/metrics/src/exemplar/ExemplarReservoir.ts index 1fcad6733..02e7b0646 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/ExemplarReservoir.ts +++ b/pkgs/sdk/metrics/src/exemplar/ExemplarReservoir.ts @@ -20,7 +20,7 @@ import { isSpanContextValid, trace, MetricAttributes, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { Exemplar } from './Exemplar'; /** diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts b/pkgs/sdk/metrics/src/exemplar/NeverSampleExemplarFilter.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts rename to pkgs/sdk/metrics/src/exemplar/NeverSampleExemplarFilter.ts index 19697ba3a..8038b9834 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/NeverSampleExemplarFilter.ts +++ b/pkgs/sdk/metrics/src/exemplar/NeverSampleExemplarFilter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { ExemplarFilter } from './ExemplarFilter'; export class NeverSampleExemplarFilter implements ExemplarFilter { diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts b/pkgs/sdk/metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts rename to pkgs/sdk/metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts index f51a97937..94f26e637 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts +++ b/pkgs/sdk/metrics/src/exemplar/SimpleFixedSizeExemplarReservoir.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { FixedSizeExemplarReservoirBase } from './ExemplarReservoir'; /** diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts b/pkgs/sdk/metrics/src/exemplar/WithTraceExemplarFilter.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts rename to pkgs/sdk/metrics/src/exemplar/WithTraceExemplarFilter.ts index 0977281d8..7f4153c53 100644 --- a/auto-merge/js/packages/sdk-metrics/src/exemplar/WithTraceExemplarFilter.ts +++ b/pkgs/sdk/metrics/src/exemplar/WithTraceExemplarFilter.ts @@ -21,7 +21,7 @@ import { trace, TraceFlags, MetricAttributes, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { ExemplarFilter } from './ExemplarFilter'; export class WithTraceExemplarFilter implements ExemplarFilter { diff --git a/auto-merge/js/packages/sdk-metrics/src/exemplar/index.ts b/pkgs/sdk/metrics/src/exemplar/index.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/exemplar/index.ts rename to pkgs/sdk/metrics/src/exemplar/index.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/export/AggregationSelector.ts b/pkgs/sdk/metrics/src/export/AggregationSelector.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/export/AggregationSelector.ts rename to pkgs/sdk/metrics/src/export/AggregationSelector.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/export/AggregationTemporality.ts b/pkgs/sdk/metrics/src/export/AggregationTemporality.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/export/AggregationTemporality.ts rename to pkgs/sdk/metrics/src/export/AggregationTemporality.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts b/pkgs/sdk/metrics/src/export/ConsoleMetricExporter.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts rename to pkgs/sdk/metrics/src/export/ConsoleMetricExporter.ts index 36c8b4880..0a0efc02c 100644 --- a/auto-merge/js/packages/sdk-metrics/src/export/ConsoleMetricExporter.ts +++ b/pkgs/sdk/metrics/src/export/ConsoleMetricExporter.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; import { InstrumentType } from '../InstrumentDescriptor'; import { AggregationTemporality } from './AggregationTemporality'; import { ResourceMetrics } from './MetricData'; diff --git a/auto-merge/js/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts b/pkgs/sdk/metrics/src/export/InMemoryMetricExporter.ts similarity index 94% rename from auto-merge/js/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts rename to pkgs/sdk/metrics/src/export/InMemoryMetricExporter.ts index 2a80973bb..7eac3ee31 100644 --- a/auto-merge/js/packages/sdk-metrics/src/export/InMemoryMetricExporter.ts +++ b/pkgs/sdk/metrics/src/export/InMemoryMetricExporter.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { ExportResultCode } from '@opentelemetry/core'; -import { ExportResult } from '@opentelemetry/core'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; +import { ExportResult } from '@opentelemetry/sandbox-core'; import { InstrumentType } from '../InstrumentDescriptor'; import { AggregationTemporality } from './AggregationTemporality'; import { ResourceMetrics } from './MetricData'; diff --git a/auto-merge/js/packages/sdk-metrics/src/export/MetricData.ts b/pkgs/sdk/metrics/src/export/MetricData.ts similarity index 95% rename from auto-merge/js/packages/sdk-metrics/src/export/MetricData.ts rename to pkgs/sdk/metrics/src/export/MetricData.ts index 19868dbc6..9a1f85966 100644 --- a/auto-merge/js/packages/sdk-metrics/src/export/MetricData.ts +++ b/pkgs/sdk/metrics/src/export/MetricData.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import { HrTime, MetricAttributes } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { IResource } from '@opentelemetry/resources'; +import { HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; +import { IResource } from '@opentelemetry/sandbox-resources'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; import { AggregationTemporality } from './AggregationTemporality'; import { Histogram, ExponentialHistogram } from '../aggregator/types'; diff --git a/auto-merge/js/packages/sdk-metrics/src/export/MetricExporter.ts b/pkgs/sdk/metrics/src/export/MetricExporter.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/export/MetricExporter.ts rename to pkgs/sdk/metrics/src/export/MetricExporter.ts index bf9362bcd..548fe9b83 100644 --- a/auto-merge/js/packages/sdk-metrics/src/export/MetricExporter.ts +++ b/pkgs/sdk/metrics/src/export/MetricExporter.ts @@ -16,7 +16,7 @@ import { AggregationTemporality } from './AggregationTemporality'; import { ResourceMetrics } from './MetricData'; -import { ExportResult } from '@opentelemetry/core'; +import { ExportResult } from '@opentelemetry/sandbox-core'; import { InstrumentType } from '../InstrumentDescriptor'; import { Aggregation } from '../view/Aggregation'; diff --git a/auto-merge/js/packages/sdk-metrics/src/export/MetricProducer.ts b/pkgs/sdk/metrics/src/export/MetricProducer.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/export/MetricProducer.ts rename to pkgs/sdk/metrics/src/export/MetricProducer.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/export/MetricReader.ts b/pkgs/sdk/metrics/src/export/MetricReader.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/export/MetricReader.ts rename to pkgs/sdk/metrics/src/export/MetricReader.ts index 8aad601d7..ad2ab75e6 100644 --- a/auto-merge/js/packages/sdk-metrics/src/export/MetricReader.ts +++ b/pkgs/sdk/metrics/src/export/MetricReader.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { AggregationTemporality } from './AggregationTemporality'; import { MetricProducer } from './MetricProducer'; import { CollectionResult } from './MetricData'; diff --git a/auto-merge/js/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts b/pkgs/sdk/metrics/src/export/PeriodicExportingMetricReader.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts rename to pkgs/sdk/metrics/src/export/PeriodicExportingMetricReader.ts index 2371ecb67..cff9b50c7 100644 --- a/auto-merge/js/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts +++ b/pkgs/sdk/metrics/src/export/PeriodicExportingMetricReader.ts @@ -14,17 +14,17 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { internal, ExportResultCode, globalErrorHandler, unrefTimer, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { MetricReader } from './MetricReader'; import { PushMetricExporter } from './MetricExporter'; import { callWithTimeout, TimeoutError } from '../utils'; -import { diag } from '@opentelemetry/api'; +import { diag } from '@opentelemetry/sandbox-api'; export type PeriodicExportingMetricReaderOptions = { /** diff --git a/auto-merge/js/packages/sdk-metrics/src/index.ts b/pkgs/sdk/metrics/src/index.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/index.ts rename to pkgs/sdk/metrics/src/index.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/state/AsyncMetricStorage.ts b/pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/state/AsyncMetricStorage.ts rename to pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts index 286874987..81e7af95d 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/AsyncMetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/AsyncMetricStorage.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { Accumulation, Aggregator } from '../aggregator/types'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; import { AttributesProcessor } from '../view/AttributesProcessor'; diff --git a/auto-merge/js/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts b/pkgs/sdk/metrics/src/state/DeltaMetricProcessor.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts rename to pkgs/sdk/metrics/src/state/DeltaMetricProcessor.ts index e9b16f0e0..bb83cc7bf 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/DeltaMetricProcessor.ts +++ b/pkgs/sdk/metrics/src/state/DeltaMetricProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { Maybe } from '../utils'; import { Accumulation, Aggregator } from '../aggregator/types'; import { AttributeHashMap } from './HashMap'; diff --git a/auto-merge/js/packages/sdk-metrics/src/state/HashMap.ts b/pkgs/sdk/metrics/src/state/HashMap.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/state/HashMap.ts rename to pkgs/sdk/metrics/src/state/HashMap.ts index 36011d667..5c59b31c1 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/HashMap.ts +++ b/pkgs/sdk/metrics/src/state/HashMap.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { MetricAttributes } from '@opentelemetry/api'; +import { MetricAttributes } from '@opentelemetry/sandbox-api'; import { hashAttributes } from '../utils'; export interface Hash { diff --git a/auto-merge/js/packages/sdk-metrics/src/state/MeterProviderSharedState.ts b/pkgs/sdk/metrics/src/state/MeterProviderSharedState.ts similarity index 93% rename from auto-merge/js/packages/sdk-metrics/src/state/MeterProviderSharedState.ts rename to pkgs/sdk/metrics/src/state/MeterProviderSharedState.ts index fa7903b20..e4219f367 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/MeterProviderSharedState.ts +++ b/pkgs/sdk/metrics/src/state/MeterProviderSharedState.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { InstrumentationScope } from '@opentelemetry/core'; -import { IResource } from '@opentelemetry/resources'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; +import { IResource } from '@opentelemetry/sandbox-resources'; import { Aggregation, InstrumentType } from '..'; import { instrumentationScopeId } from '../utils'; import { ViewRegistry } from '../view/ViewRegistry'; diff --git a/auto-merge/js/packages/sdk-metrics/src/state/MeterSharedState.ts b/pkgs/sdk/metrics/src/state/MeterSharedState.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/state/MeterSharedState.ts rename to pkgs/sdk/metrics/src/state/MeterSharedState.ts index 330d293ee..4d9a84be0 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/MeterSharedState.ts +++ b/pkgs/sdk/metrics/src/state/MeterSharedState.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; +import { HrTime } from '@opentelemetry/sandbox-api'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; import { MetricCollectOptions } from '../export/MetricProducer'; import { ScopeMetrics } from '../export/MetricData'; import { diff --git a/auto-merge/js/packages/sdk-metrics/src/state/MetricCollector.ts b/pkgs/sdk/metrics/src/state/MetricCollector.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/state/MetricCollector.ts rename to pkgs/sdk/metrics/src/state/MetricCollector.ts index 3f17a0d5b..123b43af0 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/MetricCollector.ts +++ b/pkgs/sdk/metrics/src/state/MetricCollector.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { millisToHrTime } from '@opentelemetry/core'; +import { millisToHrTime } from '@opentelemetry/sandbox-core'; import { AggregationTemporalitySelector } from '../export/AggregationSelector'; import { CollectionResult } from '../export/MetricData'; import { MetricProducer, MetricCollectOptions } from '../export/MetricProducer'; diff --git a/auto-merge/js/packages/sdk-metrics/src/state/MetricStorage.ts b/pkgs/sdk/metrics/src/state/MetricStorage.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/state/MetricStorage.ts rename to pkgs/sdk/metrics/src/state/MetricStorage.ts index 5d02437f5..49fd56c69 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/MetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/MetricStorage.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { MetricData } from '../export/MetricData'; import { Maybe } from '../utils'; import { MetricCollectorHandle } from './MetricCollector'; diff --git a/auto-merge/js/packages/sdk-metrics/src/state/MetricStorageRegistry.ts b/pkgs/sdk/metrics/src/state/MetricStorageRegistry.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/state/MetricStorageRegistry.ts rename to pkgs/sdk/metrics/src/state/MetricStorageRegistry.ts index c44ad8b5f..f314cc11f 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/MetricStorageRegistry.ts +++ b/pkgs/sdk/metrics/src/state/MetricStorageRegistry.ts @@ -19,7 +19,7 @@ import { InstrumentDescriptor, isDescriptorCompatibleWith, } from '../InstrumentDescriptor'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { getConflictResolutionRecipe, getIncompatibilityDetails, diff --git a/auto-merge/js/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts b/pkgs/sdk/metrics/src/state/MultiWritableMetricStorage.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts rename to pkgs/sdk/metrics/src/state/MultiWritableMetricStorage.ts index 1cf51f672..13d9f3d24 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/MultiWritableMetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/MultiWritableMetricStorage.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { WritableMetricStorage } from './WritableMetricStorage'; /** diff --git a/auto-merge/js/packages/sdk-metrics/src/state/ObservableRegistry.ts b/pkgs/sdk/metrics/src/state/ObservableRegistry.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/state/ObservableRegistry.ts rename to pkgs/sdk/metrics/src/state/ObservableRegistry.ts index 444395bca..61dd2d4f1 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/ObservableRegistry.ts +++ b/pkgs/sdk/metrics/src/state/ObservableRegistry.ts @@ -20,7 +20,7 @@ import { BatchObservableCallback, Observable, ObservableCallback, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { isObservableInstrument, ObservableInstrument } from '../Instruments'; import { BatchObservableResultImpl, diff --git a/auto-merge/js/packages/sdk-metrics/src/state/SyncMetricStorage.ts b/pkgs/sdk/metrics/src/state/SyncMetricStorage.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/state/SyncMetricStorage.ts rename to pkgs/sdk/metrics/src/state/SyncMetricStorage.ts index 0648b1272..dd7dd6631 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/SyncMetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/SyncMetricStorage.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { WritableMetricStorage } from './WritableMetricStorage'; import { Accumulation, Aggregator } from '../aggregator/types'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; diff --git a/auto-merge/js/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts b/pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts rename to pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts index 2b9c5dbba..57b935218 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/TemporalMetricProcessor.ts +++ b/pkgs/sdk/metrics/src/state/TemporalMetricProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { Accumulation, AccumulationRecord, diff --git a/auto-merge/js/packages/sdk-metrics/src/state/WritableMetricStorage.ts b/pkgs/sdk/metrics/src/state/WritableMetricStorage.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/src/state/WritableMetricStorage.ts rename to pkgs/sdk/metrics/src/state/WritableMetricStorage.ts index 223f34d9e..391f8322a 100644 --- a/auto-merge/js/packages/sdk-metrics/src/state/WritableMetricStorage.ts +++ b/pkgs/sdk/metrics/src/state/WritableMetricStorage.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, HrTime, MetricAttributes } from '@opentelemetry/api'; +import { Context, HrTime, MetricAttributes } from '@opentelemetry/sandbox-api'; import { AttributeHashMap } from './HashMap'; /** diff --git a/auto-merge/js/packages/sdk-metrics/src/types.ts b/pkgs/sdk/metrics/src/types.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/types.ts rename to pkgs/sdk/metrics/src/types.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/utils.ts b/pkgs/sdk/metrics/src/utils.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/src/utils.ts rename to pkgs/sdk/metrics/src/utils.ts index 835de92fe..5adce1b08 100644 --- a/auto-merge/js/packages/sdk-metrics/src/utils.ts +++ b/pkgs/sdk/metrics/src/utils.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { MetricAttributes } from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; +import { MetricAttributes } from '@opentelemetry/sandbox-api'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; export type Maybe = T | undefined; diff --git a/auto-merge/js/packages/sdk-metrics/src/view/Aggregation.ts b/pkgs/sdk/metrics/src/view/Aggregation.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/src/view/Aggregation.ts rename to pkgs/sdk/metrics/src/view/Aggregation.ts index f36394c5b..0219cc47a 100644 --- a/auto-merge/js/packages/sdk-metrics/src/view/Aggregation.ts +++ b/pkgs/sdk/metrics/src/view/Aggregation.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { Aggregator, SumAggregator, diff --git a/auto-merge/js/packages/sdk-metrics/src/view/AttributesProcessor.ts b/pkgs/sdk/metrics/src/view/AttributesProcessor.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/src/view/AttributesProcessor.ts rename to pkgs/sdk/metrics/src/view/AttributesProcessor.ts index 53f2cddaf..73af4896d 100644 --- a/auto-merge/js/packages/sdk-metrics/src/view/AttributesProcessor.ts +++ b/pkgs/sdk/metrics/src/view/AttributesProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, MetricAttributes } from '@opentelemetry/api'; +import { Context, MetricAttributes } from '@opentelemetry/sandbox-api'; /** * The {@link AttributesProcessor} is responsible for customizing which diff --git a/auto-merge/js/packages/sdk-metrics/src/view/InstrumentSelector.ts b/pkgs/sdk/metrics/src/view/InstrumentSelector.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/view/InstrumentSelector.ts rename to pkgs/sdk/metrics/src/view/InstrumentSelector.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/view/MeterSelector.ts b/pkgs/sdk/metrics/src/view/MeterSelector.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/view/MeterSelector.ts rename to pkgs/sdk/metrics/src/view/MeterSelector.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/view/Predicate.ts b/pkgs/sdk/metrics/src/view/Predicate.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/view/Predicate.ts rename to pkgs/sdk/metrics/src/view/Predicate.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/view/RegistrationConflicts.ts b/pkgs/sdk/metrics/src/view/RegistrationConflicts.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/view/RegistrationConflicts.ts rename to pkgs/sdk/metrics/src/view/RegistrationConflicts.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/view/View.ts b/pkgs/sdk/metrics/src/view/View.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/src/view/View.ts rename to pkgs/sdk/metrics/src/view/View.ts diff --git a/auto-merge/js/packages/sdk-metrics/src/view/ViewRegistry.ts b/pkgs/sdk/metrics/src/view/ViewRegistry.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/src/view/ViewRegistry.ts rename to pkgs/sdk/metrics/src/view/ViewRegistry.ts index 5f4f367e9..26cc3f3bf 100644 --- a/auto-merge/js/packages/sdk-metrics/src/view/ViewRegistry.ts +++ b/pkgs/sdk/metrics/src/view/ViewRegistry.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { InstrumentationScope } from '@opentelemetry/core'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; import { InstrumentDescriptor } from '../InstrumentDescriptor'; import { InstrumentSelector } from './InstrumentSelector'; import { MeterSelector } from './MeterSelector'; diff --git a/auto-merge/js/packages/sdk-metrics/test/ExemplarFilter.test.ts b/pkgs/sdk/metrics/test/ExemplarFilter.test.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/test/ExemplarFilter.test.ts rename to pkgs/sdk/metrics/test/ExemplarFilter.test.ts index df472fe94..b010be6be 100644 --- a/auto-merge/js/packages/sdk-metrics/test/ExemplarFilter.test.ts +++ b/pkgs/sdk/metrics/test/ExemplarFilter.test.ts @@ -20,7 +20,7 @@ import { SpanContext, TraceFlags, trace, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { AlwaysSampleExemplarFilter, diff --git a/auto-merge/js/packages/sdk-metrics/test/ExemplarReservoir.test.ts b/pkgs/sdk/metrics/test/ExemplarReservoir.test.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/test/ExemplarReservoir.test.ts rename to pkgs/sdk/metrics/test/ExemplarReservoir.test.ts index 8da5006e3..9eb016fd9 100644 --- a/auto-merge/js/packages/sdk-metrics/test/ExemplarReservoir.test.ts +++ b/pkgs/sdk/metrics/test/ExemplarReservoir.test.ts @@ -19,8 +19,8 @@ import { SpanContext, TraceFlags, trace, -} from '@opentelemetry/api'; -import { hrTime } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { hrTime } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { diff --git a/auto-merge/js/packages/sdk-metrics/test/InstrumentDescriptor.test.ts b/pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/InstrumentDescriptor.test.ts rename to pkgs/sdk/metrics/test/InstrumentDescriptor.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/Instruments.test.ts b/pkgs/sdk/metrics/test/Instruments.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/Instruments.test.ts rename to pkgs/sdk/metrics/test/Instruments.test.ts index 80f834f30..5be049d6d 100644 --- a/auto-merge/js/packages/sdk-metrics/test/Instruments.test.ts +++ b/pkgs/sdk/metrics/test/Instruments.test.ts @@ -16,8 +16,8 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; import { InstrumentDescriptor, InstrumentType, @@ -39,7 +39,7 @@ import { defaultResource, defaultInstrumentationScope, } from './util'; -import { ObservableResult, ValueType } from '@opentelemetry/api'; +import { ObservableResult, ValueType } from '@opentelemetry/sandbox-api'; describe('Instruments', () => { describe('Counter', () => { diff --git a/auto-merge/js/packages/sdk-metrics/test/Meter.test.ts b/pkgs/sdk/metrics/test/Meter.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/Meter.test.ts rename to pkgs/sdk/metrics/test/Meter.test.ts index 4ffe41607..d3fb06bd3 100644 --- a/auto-merge/js/packages/sdk-metrics/test/Meter.test.ts +++ b/pkgs/sdk/metrics/test/Meter.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Observable } from '@opentelemetry/api'; +import { Observable } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { CounterInstrument, diff --git a/auto-merge/js/packages/sdk-metrics/test/MeterProvider.test.ts b/pkgs/sdk/metrics/test/MeterProvider.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/MeterProvider.test.ts rename to pkgs/sdk/metrics/test/MeterProvider.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/ObservableResult.test.ts b/pkgs/sdk/metrics/test/ObservableResult.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/ObservableResult.test.ts rename to pkgs/sdk/metrics/test/ObservableResult.test.ts index 9aacc4606..dc5698208 100644 --- a/auto-merge/js/packages/sdk-metrics/test/ObservableResult.test.ts +++ b/pkgs/sdk/metrics/test/ObservableResult.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ValueType } from '@opentelemetry/api'; +import { ValueType } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { InstrumentType } from '../src'; import { ObservableInstrument } from '../src/Instruments'; diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/Drop.test.ts b/pkgs/sdk/metrics/test/aggregator/Drop.test.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/Drop.test.ts rename to pkgs/sdk/metrics/test/aggregator/Drop.test.ts index b66ece90a..09b6c4e27 100644 --- a/auto-merge/js/packages/sdk-metrics/test/aggregator/Drop.test.ts +++ b/pkgs/sdk/metrics/test/aggregator/Drop.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { AggregationTemporality } from '../../src'; import { DropAggregator } from '../../src/aggregator'; diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts b/pkgs/sdk/metrics/test/aggregator/ExponentialHistogram.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts rename to pkgs/sdk/metrics/test/aggregator/ExponentialHistogram.test.ts index 2bcbc4330..ca577e303 100644 --- a/auto-merge/js/packages/sdk-metrics/test/aggregator/ExponentialHistogram.test.ts +++ b/pkgs/sdk/metrics/test/aggregator/ExponentialHistogram.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime, ValueType } from '@opentelemetry/api'; +import { HrTime, ValueType } from '@opentelemetry/sandbox-api'; import { AggregationTemporality, DataPointType, diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/Histogram.test.ts b/pkgs/sdk/metrics/test/aggregator/Histogram.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/Histogram.test.ts rename to pkgs/sdk/metrics/test/aggregator/Histogram.test.ts index 5d03477d3..11ee44fee 100644 --- a/auto-merge/js/packages/sdk-metrics/test/aggregator/Histogram.test.ts +++ b/pkgs/sdk/metrics/test/aggregator/Histogram.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime, ValueType } from '@opentelemetry/api'; +import { HrTime, ValueType } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { AggregationTemporality, diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/LastValue.test.ts b/pkgs/sdk/metrics/test/aggregator/LastValue.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/LastValue.test.ts rename to pkgs/sdk/metrics/test/aggregator/LastValue.test.ts index 2fd35156c..4f3ebf852 100644 --- a/auto-merge/js/packages/sdk-metrics/test/aggregator/LastValue.test.ts +++ b/pkgs/sdk/metrics/test/aggregator/LastValue.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { AggregationTemporality } from '../../src'; diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/Sum.test.ts b/pkgs/sdk/metrics/test/aggregator/Sum.test.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/Sum.test.ts rename to pkgs/sdk/metrics/test/aggregator/Sum.test.ts index a59549ca8..d3104b83d 100644 --- a/auto-merge/js/packages/sdk-metrics/test/aggregator/Sum.test.ts +++ b/pkgs/sdk/metrics/test/aggregator/Sum.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { AggregationTemporality } from '../../src'; import { SumAccumulation, SumAggregator } from '../../src/aggregator'; diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/ExponentMapping.test.ts b/pkgs/sdk/metrics/test/aggregator/exponential-histogram/ExponentMapping.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/ExponentMapping.test.ts rename to pkgs/sdk/metrics/test/aggregator/exponential-histogram/ExponentMapping.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/LogarithmMapping.test.ts b/pkgs/sdk/metrics/test/aggregator/exponential-histogram/LogarithmMapping.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/LogarithmMapping.test.ts rename to pkgs/sdk/metrics/test/aggregator/exponential-histogram/LogarithmMapping.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/getMapping.test.ts b/pkgs/sdk/metrics/test/aggregator/exponential-histogram/getMapping.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/getMapping.test.ts rename to pkgs/sdk/metrics/test/aggregator/exponential-histogram/getMapping.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/helpers.ts b/pkgs/sdk/metrics/test/aggregator/exponential-histogram/helpers.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/helpers.ts rename to pkgs/sdk/metrics/test/aggregator/exponential-histogram/helpers.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/ieee754.test.ts b/pkgs/sdk/metrics/test/aggregator/exponential-histogram/ieee754.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/aggregator/exponential-histogram/ieee754.test.ts rename to pkgs/sdk/metrics/test/aggregator/exponential-histogram/ieee754.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts b/pkgs/sdk/metrics/test/export/ConsoleMetricExporter.test.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts rename to pkgs/sdk/metrics/test/export/ConsoleMetricExporter.test.ts index fe46fa9f7..14e858bf3 100644 --- a/auto-merge/js/packages/sdk-metrics/test/export/ConsoleMetricExporter.test.ts +++ b/pkgs/sdk/metrics/test/export/ConsoleMetricExporter.test.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import * as metrics from '@opentelemetry/api'; -import { ExportResult } from '@opentelemetry/core'; +import * as metrics from '@opentelemetry/sandbox-api'; +import { ExportResult } from '@opentelemetry/sandbox-core'; import { ConsoleMetricExporter } from '../../src/export/ConsoleMetricExporter'; import { PeriodicExportingMetricReader } from '../../src/export/PeriodicExportingMetricReader'; import { ResourceMetrics } from '../../src/export/MetricData'; diff --git a/auto-merge/js/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts b/pkgs/sdk/metrics/test/export/InMemoryMetricExporter.test.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts rename to pkgs/sdk/metrics/test/export/InMemoryMetricExporter.test.ts index 38a3f9858..43e279d02 100644 --- a/auto-merge/js/packages/sdk-metrics/test/export/InMemoryMetricExporter.test.ts +++ b/pkgs/sdk/metrics/test/export/InMemoryMetricExporter.test.ts @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ExportResultCode } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; -import * as metrics from '@opentelemetry/api'; +import { ExportResultCode } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import * as metrics from '@opentelemetry/sandbox-api'; import assert = require('assert'); import { AggregationTemporality } from '../../src/export/AggregationTemporality'; import { InMemoryMetricExporter } from '../../src/export/InMemoryMetricExporter'; diff --git a/auto-merge/js/packages/sdk-metrics/test/export/MetricReader.test.ts b/pkgs/sdk/metrics/test/export/MetricReader.test.ts similarity index 98% rename from auto-merge/js/packages/sdk-metrics/test/export/MetricReader.test.ts rename to pkgs/sdk/metrics/test/export/MetricReader.test.ts index c0643a60d..639f812a1 100644 --- a/auto-merge/js/packages/sdk-metrics/test/export/MetricReader.test.ts +++ b/pkgs/sdk/metrics/test/export/MetricReader.test.ts @@ -36,8 +36,8 @@ import { assertAggregationTemporalitySelector, } from './utils'; import { defaultResource } from '../util'; -import { ValueType } from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; +import { ValueType } from '@opentelemetry/sandbox-api'; +import { Resource } from '@opentelemetry/sandbox-resources'; const testScopeMetrics: ScopeMetrics[] = [ { diff --git a/auto-merge/js/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts b/pkgs/sdk/metrics/test/export/PeriodicExportingMetricReader.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts rename to pkgs/sdk/metrics/test/export/PeriodicExportingMetricReader.test.ts index d5ab55312..723adc1b8 100644 --- a/auto-merge/js/packages/sdk-metrics/test/export/PeriodicExportingMetricReader.test.ts +++ b/pkgs/sdk/metrics/test/export/PeriodicExportingMetricReader.test.ts @@ -21,7 +21,7 @@ import { ResourceMetrics } from '../../src/export/MetricData'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { TimeoutError } from '../../src/utils'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; import { assertRejects } from '../test-utils'; import { emptyResourceMetrics, TestMetricProducer } from './TestMetricProducer'; import { diff --git a/auto-merge/js/packages/sdk-metrics/test/export/TestMetricExporter.ts b/pkgs/sdk/metrics/test/export/TestMetricExporter.ts similarity index 94% rename from auto-merge/js/packages/sdk-metrics/test/export/TestMetricExporter.ts rename to pkgs/sdk/metrics/test/export/TestMetricExporter.ts index 86b726bb3..7022ae8f2 100644 --- a/auto-merge/js/packages/sdk-metrics/test/export/TestMetricExporter.ts +++ b/pkgs/sdk/metrics/test/export/TestMetricExporter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; import { AggregationTemporality, PushMetricExporter, diff --git a/auto-merge/js/packages/sdk-metrics/test/export/TestMetricProducer.ts b/pkgs/sdk/metrics/test/export/TestMetricProducer.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/export/TestMetricProducer.ts rename to pkgs/sdk/metrics/test/export/TestMetricProducer.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/export/TestMetricReader.ts b/pkgs/sdk/metrics/test/export/TestMetricReader.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/export/TestMetricReader.ts rename to pkgs/sdk/metrics/test/export/TestMetricReader.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/export/utils.ts b/pkgs/sdk/metrics/test/export/utils.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/export/utils.ts rename to pkgs/sdk/metrics/test/export/utils.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/index-webpack.ts b/pkgs/sdk/metrics/test/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/index-webpack.ts rename to pkgs/sdk/metrics/test/index-webpack.ts diff --git a/pkgs/sdk/metrics/test/index-webpack.worker.ts b/pkgs/sdk/metrics/test/index-webpack.worker.ts new file mode 100644 index 000000000..99a230aa7 --- /dev/null +++ b/pkgs/sdk/metrics/test/index-webpack.worker.ts @@ -0,0 +1,20 @@ +/*! + * 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 + * + * 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. +*/ + +{ + const testsContext = require.context('./', false, /test$/); + testsContext.keys().forEach(testsContext); +} diff --git a/auto-merge/js/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts b/pkgs/sdk/metrics/test/regression/cumulative-exponential-histogram.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/regression/cumulative-exponential-histogram.test.ts rename to pkgs/sdk/metrics/test/regression/cumulative-exponential-histogram.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/regression/two-metric-readers-async-instrument.test.ts b/pkgs/sdk/metrics/test/regression/two-metric-readers-async-instrument.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/regression/two-metric-readers-async-instrument.test.ts rename to pkgs/sdk/metrics/test/regression/two-metric-readers-async-instrument.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts b/pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts rename to pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts index 9fe742ca0..72c46be5d 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/AsyncMetricStorage.test.ts +++ b/pkgs/sdk/metrics/test/state/AsyncMetricStorage.test.ts @@ -30,7 +30,7 @@ import { ObservableCallbackDelegate, } from '../util'; import { ObservableInstrument } from '../../src/Instruments'; -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; const deltaCollector: MetricCollectorHandle = { selectAggregationTemporality: () => AggregationTemporality.DELTA, diff --git a/auto-merge/js/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts b/pkgs/sdk/metrics/test/state/DeltaMetricProcessor.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts rename to pkgs/sdk/metrics/test/state/DeltaMetricProcessor.test.ts index ec0a3d6ff..a2a0a433e 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/DeltaMetricProcessor.test.ts +++ b/pkgs/sdk/metrics/test/state/DeltaMetricProcessor.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { DropAggregator, SumAggregator } from '../../src/aggregator'; import { DeltaMetricProcessor } from '../../src/state/DeltaMetricProcessor'; diff --git a/auto-merge/js/packages/sdk-metrics/test/state/HashMap.test.ts b/pkgs/sdk/metrics/test/state/HashMap.test.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/test/state/HashMap.test.ts rename to pkgs/sdk/metrics/test/state/HashMap.test.ts index 8ae772989..40285baec 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/HashMap.test.ts +++ b/pkgs/sdk/metrics/test/state/HashMap.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import { MetricAttributes } from '@opentelemetry/api'; +import { MetricAttributes } from '@opentelemetry/sandbox-api'; import { HashMap } from '../../src/state/HashMap'; import { hashAttributes } from '../../src/utils'; diff --git a/auto-merge/js/packages/sdk-metrics/test/state/MeterSharedState.test.ts b/pkgs/sdk/metrics/test/state/MeterSharedState.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/state/MeterSharedState.test.ts rename to pkgs/sdk/metrics/test/state/MeterSharedState.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/state/MetricCollector.test.ts b/pkgs/sdk/metrics/test/state/MetricCollector.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/state/MetricCollector.test.ts rename to pkgs/sdk/metrics/test/state/MetricCollector.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts b/pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts rename to pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts index 26a48a0ba..423e38e19 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/MetricStorageRegistry.test.ts +++ b/pkgs/sdk/metrics/test/state/MetricStorageRegistry.test.ts @@ -15,9 +15,9 @@ */ import { MetricStorageRegistry } from '../../src/state/MetricStorageRegistry'; -import { diag, ValueType } from '@opentelemetry/api'; +import { diag, ValueType } from '@opentelemetry/sandbox-api'; import { MetricStorage } from '../../src/state/MetricStorage'; -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { MetricCollectorHandle } from '../../src/state/MetricCollector'; import { MetricData, InstrumentDescriptor, InstrumentType } from '../../src'; import { Maybe } from '../../src/utils'; diff --git a/auto-merge/js/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts b/pkgs/sdk/metrics/test/state/MultiWritableMetricStorage.test.ts similarity index 94% rename from auto-merge/js/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts rename to pkgs/sdk/metrics/test/state/MultiWritableMetricStorage.test.ts index f2ee109f1..e6de563c3 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/MultiWritableMetricStorage.test.ts +++ b/pkgs/sdk/metrics/test/state/MultiWritableMetricStorage.test.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; -import { MetricAttributes } from '@opentelemetry/api'; -import { hrTime } from '@opentelemetry/core'; +import * as api from '@opentelemetry/sandbox-api'; +import { MetricAttributes } from '@opentelemetry/sandbox-api'; +import { hrTime } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { MultiMetricStorage } from '../../src/state/MultiWritableMetricStorage'; import { WritableMetricStorage } from '../../src/state/WritableMetricStorage'; diff --git a/auto-merge/js/packages/sdk-metrics/test/state/ObservableRegistry.test.ts b/pkgs/sdk/metrics/test/state/ObservableRegistry.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/state/ObservableRegistry.test.ts rename to pkgs/sdk/metrics/test/state/ObservableRegistry.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts b/pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts rename to pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts index 8e568be19..4b26ec540 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/SyncMetricStorage.test.ts +++ b/pkgs/sdk/metrics/test/state/SyncMetricStorage.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { SumAggregator } from '../../src/aggregator'; diff --git a/auto-merge/js/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts b/pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts similarity index 99% rename from auto-merge/js/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts rename to pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts index 8d0f165cd..e4fd1018b 100644 --- a/auto-merge/js/packages/sdk-metrics/test/state/TemporalMetricProcessor.test.ts +++ b/pkgs/sdk/metrics/test/state/TemporalMetricProcessor.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { SumAggregator } from '../../src/aggregator'; diff --git a/auto-merge/js/packages/sdk-metrics/test/test-utils.ts b/pkgs/sdk/metrics/test/test-utils.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/test-utils.ts rename to pkgs/sdk/metrics/test/test-utils.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/util.ts b/pkgs/sdk/metrics/test/util.ts similarity index 96% rename from auto-merge/js/packages/sdk-metrics/test/util.ts rename to pkgs/sdk/metrics/test/util.ts index fa7a54b07..79d295393 100644 --- a/auto-merge/js/packages/sdk-metrics/test/util.ts +++ b/pkgs/sdk/metrics/test/util.ts @@ -20,9 +20,9 @@ import { MetricAttributes, ObservableCallback, ValueType, -} from '@opentelemetry/api'; -import { InstrumentationScope } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-api'; +import { InstrumentationScope } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; import { InstrumentDescriptor, @@ -35,7 +35,7 @@ import { ScopeMetrics, } from '../src/export/MetricData'; import { isNotNullish } from '../src/utils'; -import { HrTime } from '@opentelemetry/api'; +import { HrTime } from '@opentelemetry/sandbox-api'; import { Histogram } from '../src/aggregator/types'; import { AggregationTemporality } from '../src/export/AggregationTemporality'; diff --git a/auto-merge/js/packages/sdk-metrics/test/utils.test.ts b/pkgs/sdk/metrics/test/utils.test.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/test/utils.test.ts rename to pkgs/sdk/metrics/test/utils.test.ts index 16ec0a2b3..7965f389e 100644 --- a/auto-merge/js/packages/sdk-metrics/test/utils.test.ts +++ b/pkgs/sdk/metrics/test/utils.test.ts @@ -23,7 +23,7 @@ import { TimeoutError, } from '../src/utils'; import { assertRejects } from './test-utils'; -import { MetricAttributes } from '@opentelemetry/api'; +import { MetricAttributes } from '@opentelemetry/sandbox-api'; describe('utils', () => { afterEach(() => { diff --git a/auto-merge/js/packages/sdk-metrics/test/view/Aggregation.test.ts b/pkgs/sdk/metrics/test/view/Aggregation.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/view/Aggregation.test.ts rename to pkgs/sdk/metrics/test/view/Aggregation.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/view/AttributesProcessor.test.ts b/pkgs/sdk/metrics/test/view/AttributesProcessor.test.ts similarity index 97% rename from auto-merge/js/packages/sdk-metrics/test/view/AttributesProcessor.test.ts rename to pkgs/sdk/metrics/test/view/AttributesProcessor.test.ts index 8d38efacd..dd2fd6334 100644 --- a/auto-merge/js/packages/sdk-metrics/test/view/AttributesProcessor.test.ts +++ b/pkgs/sdk/metrics/test/view/AttributesProcessor.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import { context } from '@opentelemetry/api'; +import { context } from '@opentelemetry/sandbox-api'; import { NoopAttributesProcessor } from '../../src/view/AttributesProcessor'; import { FilteringAttributesProcessor } from '../../src/view/AttributesProcessor'; diff --git a/auto-merge/js/packages/sdk-metrics/test/view/Predicate.test.ts b/pkgs/sdk/metrics/test/view/Predicate.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/view/Predicate.test.ts rename to pkgs/sdk/metrics/test/view/Predicate.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/view/View.test.ts b/pkgs/sdk/metrics/test/view/View.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/view/View.test.ts rename to pkgs/sdk/metrics/test/view/View.test.ts diff --git a/auto-merge/js/packages/sdk-metrics/test/view/ViewRegistry.test.ts b/pkgs/sdk/metrics/test/view/ViewRegistry.test.ts similarity index 100% rename from auto-merge/js/packages/sdk-metrics/test/view/ViewRegistry.test.ts rename to pkgs/sdk/metrics/test/view/ViewRegistry.test.ts diff --git a/pkgs/sdk/metrics/tsconfig.esm.json b/pkgs/sdk/metrics/tsconfig.esm.json new file mode 100644 index 000000000..d0d0ce24d --- /dev/null +++ b/pkgs/sdk/metrics/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/metrics/tsconfig.esnext.json b/pkgs/sdk/metrics/tsconfig.esnext.json new file mode 100644 index 000000000..8e1d797d3 --- /dev/null +++ b/pkgs/sdk/metrics/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/metrics/tsconfig.json b/pkgs/sdk/metrics/tsconfig.json new file mode 100644 index 000000000..e4729001d --- /dev/null +++ b/pkgs/sdk/metrics/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/.eslintignore b/pkgs/sdk/trace/base/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/.eslintignore rename to pkgs/sdk/trace/base/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-resources/.eslintrc.js b/pkgs/sdk/trace/base/.eslintrc.js similarity index 75% rename from auto-merge/js/packages/opentelemetry-resources/.eslintrc.js rename to pkgs/sdk/trace/base/.eslintrc.js index 36847df9f..c3bb93bde 100644 --- a/auto-merge/js/packages/opentelemetry-resources/.eslintrc.js +++ b/pkgs/sdk/trace/base/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.base.js') + ...require('../../../../eslint.base.js') } diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/.npmignore b/pkgs/sdk/trace/base/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/.npmignore rename to pkgs/sdk/trace/base/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/LICENSE b/pkgs/sdk/trace/base/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/LICENSE rename to pkgs/sdk/trace/base/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/README.md b/pkgs/sdk/trace/base/README.md similarity index 94% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/README.md rename to pkgs/sdk/trace/base/README.md index 6d7b65589..5c0b62bb8 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/README.md +++ b/pkgs/sdk/trace/base/README.md @@ -22,8 +22,8 @@ npm install --save @opentelemetry/sdk-trace-base ## Usage ```js -const opentelemetry = require('@opentelemetry/api'); -const { BasicTracerProvider } = require('@opentelemetry/sdk-trace-base'); +const opentelemetry = require('@opentelemetry/sandbox-api'); +const { BasicTracerProvider } = require('@opentelemetry/sandbox-sdk-trace-base'); // To start a trace, you first need to initialize the Tracer provider. // NOTE: The default OpenTelemetry tracer provider does not record any tracing information. @@ -60,7 +60,7 @@ Samples every trace regardless of upstream sampling decisions. const { AlwaysOnSampler, BasicTracerProvider, -} = require("@opentelemetry/sdk-trace-base"); +} = require("@opentelemetry/sandbox-sdk-trace-base"); const tracerProvider = new BasicTracerProvider({ sampler: new AlwaysOnSampler() @@ -75,7 +75,7 @@ Doesn't sample any trace, regardless of upstream sampling decisions. const { AlwaysOffSampler, BasicTracerProvider, -} = require("@opentelemetry/sdk-trace-base"); +} = require("@opentelemetry/sandbox-sdk-trace-base"); const tracerProvider = new BasicTracerProvider({ sampler: new AlwaysOffSampler() @@ -93,7 +93,7 @@ The `TraceIDRatioSampler` may be used with the `ParentBasedSampler` to respect t const { BasicTracerProvider, TraceIdRatioBasedSampler, -} = require("@opentelemetry/sdk-trace-base"); +} = require("@opentelemetry/sandbox-sdk-trace-base"); const tracerProvider = new BasicTracerProvider({ // See details of ParentBasedSampler below @@ -141,7 +141,7 @@ const { BasicTracerProvider, ParentBasedSampler, TraceIdRatioBasedSampler, -} = require("@opentelemetry/sdk-trace-base"); +} = require("@opentelemetry/sandbox-sdk-trace-base"); const tracerProvider = new BasicTracerProvider({ sampler: new ParentBasedSampler({ diff --git a/auto-merge/js/api/karma.conf.js b/pkgs/sdk/trace/base/karma.conf.js similarity index 85% rename from auto-merge/js/api/karma.conf.js rename to pkgs/sdk/trace/base/karma.conf.js index 5f7d9f888..ec0186739 100644 --- a/auto-merge/js/api/karma.conf.js +++ b/pkgs/sdk/trace/base/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../karma.webpack'); -const karmaBaseConfig = require('../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/sdk/trace/base/karma.debug.conf.js b/pkgs/sdk/trace/base/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/sdk/trace/base/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/auto-merge/js/api/karma.worker.js b/pkgs/sdk/trace/base/karma.worker.js similarity index 85% rename from auto-merge/js/api/karma.worker.js rename to pkgs/sdk/trace/base/karma.worker.js index 7917d5a00..ed61054b0 100644 --- a/auto-merge/js/api/karma.worker.js +++ b/pkgs/sdk/trace/base/karma.worker.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../karma.webpack'); -const karmaBaseConfig = require('../karma.worker'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.worker'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/sdk/trace/base/package.json b/pkgs/sdk/trace/base/package.json new file mode 100644 index 000000000..a2c271a46 --- /dev/null +++ b/pkgs/sdk/trace/base/package.json @@ -0,0 +1,125 @@ +{ + "name": "@opentelemetry/sandbox-sdk-trace-base", + "version": "1.15.2", + "description": "OpenTelemetry Tracing", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "browser": { + "./src/platform/index.ts": "./src/platform/browser/index.ts", + "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", + "./build/src/platform/index.js": "./build/src/platform/browser/index.js" + }, + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "npm run tdd:node", + "tdd:browser": "karma start", + "tdd:node": "npm run test -- --watch-extensions ts --watch", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@opentelemetry/resources": "npm:@opentelemetry/resources@1.9.0", + "@opentelemetry/sandbox-api": "1.4.1", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/sdk/trace/base/rollup.config.js b/pkgs/sdk/trace/base/rollup.config.js new file mode 100644 index 000000000..59bc3bc1c --- /dev/null +++ b/pkgs/sdk/trace/base/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.sdk-trace-base", inputName, "otel-sndbx.sdk-trace-base", version); diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts b/pkgs/sdk/trace/base/src/BasicTracerProvider.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts rename to pkgs/sdk/trace/base/src/BasicTracerProvider.ts index c06f5cdcb..ed9866cb2 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts +++ b/pkgs/sdk/trace/base/src/BasicTracerProvider.ts @@ -21,15 +21,15 @@ import { TextMapPropagator, trace, TracerProvider, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { CompositePropagator, W3CBaggagePropagator, W3CTraceContextPropagator, getEnv, merge, -} from '@opentelemetry/core'; -import { IResource, Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-core'; +import { IResource, Resource } from '@opentelemetry/sandbox-resources'; import { SpanProcessor, Tracer } from '.'; import { loadDefaultConfig } from './config'; import { MultiSpanProcessor } from './MultiSpanProcessor'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/IdGenerator.ts b/pkgs/sdk/trace/base/src/IdGenerator.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/IdGenerator.ts rename to pkgs/sdk/trace/base/src/IdGenerator.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts b/pkgs/sdk/trace/base/src/MultiSpanProcessor.ts similarity index 94% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts rename to pkgs/sdk/trace/base/src/MultiSpanProcessor.ts index f5eb8f772..aaeb6de9e 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/MultiSpanProcessor.ts +++ b/pkgs/sdk/trace/base/src/MultiSpanProcessor.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { Context } from '@opentelemetry/api'; -import { globalErrorHandler } from '@opentelemetry/core'; +import { Context } from '@opentelemetry/sandbox-api'; +import { globalErrorHandler } from '@opentelemetry/sandbox-core'; import { ReadableSpan } from './export/ReadableSpan'; import { Span } from './Span'; import { SpanProcessor } from './SpanProcessor'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Sampler.ts b/pkgs/sdk/trace/base/src/Sampler.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Sampler.ts rename to pkgs/sdk/trace/base/src/Sampler.ts index 0a4236e88..412438d5b 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Sampler.ts +++ b/pkgs/sdk/trace/base/src/Sampler.ts @@ -20,7 +20,7 @@ import { SpanAttributes, SpanKind, TraceState, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; /** * A sampling decision that determines how a {@link Span} will be recorded diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Span.ts b/pkgs/sdk/trace/base/src/Span.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Span.ts rename to pkgs/sdk/trace/base/src/Span.ts index 31fb1555a..3b32bd4ba 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Span.ts +++ b/pkgs/sdk/trace/base/src/Span.ts @@ -28,7 +28,7 @@ import { SpanStatus, SpanStatusCode, TimeInput, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { addHrTimes, millisToHrTime, @@ -41,9 +41,9 @@ import { isTimeInputHrTime, otperformance, sanitizeAttributes, -} from '@opentelemetry/core'; -import { IResource } from '@opentelemetry/resources'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-core'; +import { IResource } from '@opentelemetry/sandbox-resources'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import { ExceptionEventName } from './enums'; import { ReadableSpan } from './export/ReadableSpan'; import { SpanProcessor } from './SpanProcessor'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts b/pkgs/sdk/trace/base/src/SpanProcessor.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts rename to pkgs/sdk/trace/base/src/SpanProcessor.ts index dc9b2232f..a68c983d1 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/SpanProcessor.ts +++ b/pkgs/sdk/trace/base/src/SpanProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context } from '@opentelemetry/api'; +import { Context } from '@opentelemetry/sandbox-api'; import { ReadableSpan } from './export/ReadableSpan'; import { Span } from './Span'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts b/pkgs/sdk/trace/base/src/TimedEvent.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts rename to pkgs/sdk/trace/base/src/TimedEvent.ts index 1f835ba71..bd187c71f 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/TimedEvent.ts +++ b/pkgs/sdk/trace/base/src/TimedEvent.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { HrTime, SpanAttributes } from '@opentelemetry/api'; +import { HrTime, SpanAttributes } from '@opentelemetry/sandbox-api'; /** * Represents a timed event. diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Tracer.ts b/pkgs/sdk/trace/base/src/Tracer.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Tracer.ts rename to pkgs/sdk/trace/base/src/Tracer.ts index b77a9427e..c366e9817 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/Tracer.ts +++ b/pkgs/sdk/trace/base/src/Tracer.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { InstrumentationLibrary, sanitizeAttributes, isTracingSuppressed, -} from '@opentelemetry/core'; -import { IResource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-core'; +import { IResource } from '@opentelemetry/sandbox-resources'; import { BasicTracerProvider } from './BasicTracerProvider'; import { Span } from './Span'; import { GeneralLimits, SpanLimits, TracerConfig } from './types'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/config.ts b/pkgs/sdk/trace/base/src/config.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/config.ts rename to pkgs/sdk/trace/base/src/config.ts index 3448b793d..da5e94ae8 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/config.ts +++ b/pkgs/sdk/trace/base/src/config.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { diag } from '@opentelemetry/api'; -import { getEnv, TracesSamplerValues, ENVIRONMENT } from '@opentelemetry/core'; +import { diag } from '@opentelemetry/sandbox-api'; +import { getEnv, TracesSamplerValues, ENVIRONMENT } from '@opentelemetry/sandbox-core'; import { Sampler } from './Sampler'; import { AlwaysOffSampler } from './sampler/AlwaysOffSampler'; import { AlwaysOnSampler } from './sampler/AlwaysOnSampler'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/enums.ts b/pkgs/sdk/trace/base/src/enums.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/enums.ts rename to pkgs/sdk/trace/base/src/enums.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts b/pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts rename to pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts index d760ff580..b93e57347 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts +++ b/pkgs/sdk/trace/base/src/export/BatchSpanProcessorBase.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { context, Context, diag, TraceFlags } from '@opentelemetry/api'; +import { context, Context, diag, TraceFlags } from '@opentelemetry/sandbox-api'; import { BindOnceFuture, ExportResultCode, @@ -22,7 +22,7 @@ import { globalErrorHandler, suppressTracing, unrefTimer, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { Span } from '../Span'; import { SpanProcessor } from '../SpanProcessor'; import { BufferConfig } from '../types'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts b/pkgs/sdk/trace/base/src/export/ConsoleSpanExporter.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts rename to pkgs/sdk/trace/base/src/export/ConsoleSpanExporter.ts index 596b3cefd..228068030 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/ConsoleSpanExporter.ts +++ b/pkgs/sdk/trace/base/src/export/ConsoleSpanExporter.ts @@ -20,7 +20,7 @@ import { ExportResult, ExportResultCode, hrTimeToMicroseconds, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; /** * This is implementation of {@link SpanExporter} that prints spans to the diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts b/pkgs/sdk/trace/base/src/export/InMemorySpanExporter.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts rename to pkgs/sdk/trace/base/src/export/InMemorySpanExporter.ts index 4a755ea8c..52c32e9f7 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/InMemorySpanExporter.ts +++ b/pkgs/sdk/trace/base/src/export/InMemorySpanExporter.ts @@ -16,7 +16,7 @@ import { SpanExporter } from './SpanExporter'; import { ReadableSpan } from './ReadableSpan'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; /** * This class can be used for testing purposes. It stores the exported spans diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts b/pkgs/sdk/trace/base/src/export/NoopSpanProcessor.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts rename to pkgs/sdk/trace/base/src/export/NoopSpanProcessor.ts index 21e608e28..7513ab99a 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/NoopSpanProcessor.ts +++ b/pkgs/sdk/trace/base/src/export/NoopSpanProcessor.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context } from '@opentelemetry/api'; +import { Context } from '@opentelemetry/sandbox-api'; import { ReadableSpan } from './ReadableSpan'; import { Span } from '../Span'; import { SpanProcessor } from '../SpanProcessor'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts b/pkgs/sdk/trace/base/src/export/ReadableSpan.ts similarity index 88% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts rename to pkgs/sdk/trace/base/src/export/ReadableSpan.ts index 20ffea4c5..6c537696f 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/ReadableSpan.ts +++ b/pkgs/sdk/trace/base/src/export/ReadableSpan.ts @@ -21,9 +21,9 @@ import { HrTime, Link, SpanContext, -} from '@opentelemetry/api'; -import { IResource } from '@opentelemetry/resources'; -import { InstrumentationLibrary } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { IResource } from '@opentelemetry/sandbox-resources'; +import { InstrumentationLibrary } from '@opentelemetry/sandbox-core'; import { TimedEvent } from '../TimedEvent'; export interface ReadableSpan { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts b/pkgs/sdk/trace/base/src/export/SimpleSpanProcessor.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts rename to pkgs/sdk/trace/base/src/export/SimpleSpanProcessor.ts index 463e8376b..7fef7c685 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/SimpleSpanProcessor.ts +++ b/pkgs/sdk/trace/base/src/export/SimpleSpanProcessor.ts @@ -14,19 +14,19 @@ * limitations under the License. */ -import { Context, TraceFlags } from '@opentelemetry/api'; +import { Context, TraceFlags } from '@opentelemetry/sandbox-api'; import { internal, ExportResultCode, globalErrorHandler, BindOnceFuture, ExportResult, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { Span } from '../Span'; import { SpanProcessor } from '../SpanProcessor'; import { ReadableSpan } from './ReadableSpan'; import { SpanExporter } from './SpanExporter'; -import { Resource } from '@opentelemetry/resources'; +import { Resource } from '@opentelemetry/sandbox-resources'; /** * An implementation of the {@link SpanProcessor} that converts the {@link Span} diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts b/pkgs/sdk/trace/base/src/export/SpanExporter.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts rename to pkgs/sdk/trace/base/src/export/SpanExporter.ts index c9ca9c0c8..fa5795112 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/export/SpanExporter.ts +++ b/pkgs/sdk/trace/base/src/export/SpanExporter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/core'; +import { ExportResult } from '@opentelemetry/sandbox-core'; import { ReadableSpan } from './ReadableSpan'; /** diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/index.ts b/pkgs/sdk/trace/base/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/index.ts rename to pkgs/sdk/trace/base/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/browser/RandomIdGenerator.ts b/pkgs/sdk/trace/base/src/platform/browser/RandomIdGenerator.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/browser/RandomIdGenerator.ts rename to pkgs/sdk/trace/base/src/platform/browser/RandomIdGenerator.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts b/pkgs/sdk/trace/base/src/platform/browser/export/BatchSpanProcessor.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/browser/export/BatchSpanProcessor.ts rename to pkgs/sdk/trace/base/src/platform/browser/export/BatchSpanProcessor.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/browser/index.ts b/pkgs/sdk/trace/base/src/platform/browser/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/browser/index.ts rename to pkgs/sdk/trace/base/src/platform/browser/index.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/index.ts b/pkgs/sdk/trace/base/src/platform/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/index.ts rename to pkgs/sdk/trace/base/src/platform/index.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/node/RandomIdGenerator.ts b/pkgs/sdk/trace/base/src/platform/node/RandomIdGenerator.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/node/RandomIdGenerator.ts rename to pkgs/sdk/trace/base/src/platform/node/RandomIdGenerator.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts b/pkgs/sdk/trace/base/src/platform/node/export/BatchSpanProcessor.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/node/export/BatchSpanProcessor.ts rename to pkgs/sdk/trace/base/src/platform/node/export/BatchSpanProcessor.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/node/index.ts b/pkgs/sdk/trace/base/src/platform/node/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/platform/node/index.ts rename to pkgs/sdk/trace/base/src/platform/node/index.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOffSampler.ts b/pkgs/sdk/trace/base/src/sampler/AlwaysOffSampler.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOffSampler.ts rename to pkgs/sdk/trace/base/src/sampler/AlwaysOffSampler.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOnSampler.ts b/pkgs/sdk/trace/base/src/sampler/AlwaysOnSampler.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/AlwaysOnSampler.ts rename to pkgs/sdk/trace/base/src/sampler/AlwaysOnSampler.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts b/pkgs/sdk/trace/base/src/sampler/ParentBasedSampler.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts rename to pkgs/sdk/trace/base/src/sampler/ParentBasedSampler.ts index 6f89ac643..38aebf67b 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/ParentBasedSampler.ts +++ b/pkgs/sdk/trace/base/src/sampler/ParentBasedSampler.ts @@ -22,8 +22,8 @@ import { SpanKind, TraceFlags, trace, -} from '@opentelemetry/api'; -import { globalErrorHandler } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { globalErrorHandler } from '@opentelemetry/sandbox-core'; import { AlwaysOffSampler } from './AlwaysOffSampler'; import { AlwaysOnSampler } from './AlwaysOnSampler'; import { Sampler, SamplingResult } from '../Sampler'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts b/pkgs/sdk/trace/base/src/sampler/TraceIdRatioBasedSampler.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts rename to pkgs/sdk/trace/base/src/sampler/TraceIdRatioBasedSampler.ts index aca52ac22..d4467d36a 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/sampler/TraceIdRatioBasedSampler.ts +++ b/pkgs/sdk/trace/base/src/sampler/TraceIdRatioBasedSampler.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { isValidTraceId } from '@opentelemetry/api'; +import { isValidTraceId } from '@opentelemetry/sandbox-api'; import { Sampler, SamplingDecision, SamplingResult } from '../Sampler'; /** Sampler that samples a given fraction of traces based of trace id deterministically. */ diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/types.ts b/pkgs/sdk/trace/base/src/types.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/types.ts rename to pkgs/sdk/trace/base/src/types.ts index 99eeedbe8..aac8b1328 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/types.ts +++ b/pkgs/sdk/trace/base/src/types.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { ContextManager, TextMapPropagator } from '@opentelemetry/api'; -import { IResource } from '@opentelemetry/resources'; +import { ContextManager, TextMapPropagator } from '@opentelemetry/sandbox-api'; +import { IResource } from '@opentelemetry/sandbox-resources'; import { IdGenerator } from './IdGenerator'; import { Sampler } from './Sampler'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/utility.ts b/pkgs/sdk/trace/base/src/utility.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/src/utility.ts rename to pkgs/sdk/trace/base/src/utility.ts index 819d725d4..70687d008 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/src/utility.ts +++ b/pkgs/sdk/trace/base/src/utility.ts @@ -21,7 +21,7 @@ import { DEFAULT_ATTRIBUTE_COUNT_LIMIT, DEFAULT_ATTRIBUTE_VALUE_LENGTH_LIMIT, getEnvWithoutDefaults, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; /** * Function to merge Default configuration (as specified in './config') with diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts b/pkgs/sdk/trace/base/test/browser/export/BatchSpanProcessor.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/browser/export/BatchSpanProcessor.test.ts rename to pkgs/sdk/trace/base/test/browser/export/BatchSpanProcessor.test.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts b/pkgs/sdk/trace/base/test/common/BasicTracerProvider.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts rename to pkgs/sdk/trace/base/test/common/BasicTracerProvider.test.ts index 7a0483ffa..f341c5683 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/BasicTracerProvider.test.ts +++ b/pkgs/sdk/trace/base/test/common/BasicTracerProvider.test.ts @@ -26,10 +26,10 @@ import { TextMapGetter, propagation, diag, -} from '@opentelemetry/api'; -import { CompositePropagator } from '@opentelemetry/core'; -import { TraceState, W3CTraceContextPropagator } from '@opentelemetry/core'; -import { Resource } from '@opentelemetry/resources'; +} from '@opentelemetry/sandbox-api'; +import { CompositePropagator } from '@opentelemetry/sandbox-core'; +import { TraceState, W3CTraceContextPropagator } from '@opentelemetry/sandbox-core'; +import { Resource } from '@opentelemetry/sandbox-resources'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts b/pkgs/sdk/trace/base/test/common/MultiSpanProcessor.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts rename to pkgs/sdk/trace/base/test/common/MultiSpanProcessor.test.ts index 7412a121c..6c6fe23ef 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/MultiSpanProcessor.test.ts +++ b/pkgs/sdk/trace/base/test/common/MultiSpanProcessor.test.ts @@ -26,7 +26,7 @@ import { import { setGlobalErrorHandler, loggingErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import { MultiSpanProcessor } from '../../src/MultiSpanProcessor'; class TestProcessor implements SpanProcessor { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Sampler.test.ts b/pkgs/sdk/trace/base/test/common/Sampler.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Sampler.test.ts rename to pkgs/sdk/trace/base/test/common/Sampler.test.ts index 381975496..a990bc09b 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Sampler.test.ts +++ b/pkgs/sdk/trace/base/test/common/Sampler.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { context, SpanKind } from '@opentelemetry/api'; +import { context, SpanKind } from '@opentelemetry/sandbox-api'; import { AlwaysOffSampler, AlwaysOnSampler, diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts b/pkgs/sdk/trace/base/test/common/Span.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts rename to pkgs/sdk/trace/base/test/common/Span.test.ts index 11a94ffc7..4dcd7d749 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts +++ b/pkgs/sdk/trace/base/test/common/Span.test.ts @@ -24,7 +24,7 @@ import { HrTime, SpanAttributes, SpanAttributeValue, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { DEFAULT_ATTRIBUTE_COUNT_LIMIT, DEFAULT_ATTRIBUTE_VALUE_LENGTH_LIMIT, @@ -32,8 +32,8 @@ import { hrTimeToMilliseconds, hrTimeToNanoseconds, otperformance as performance, -} from '@opentelemetry/core'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-core'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { BasicTracerProvider, Span, SpanProcessor } from '../../src'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts b/pkgs/sdk/trace/base/test/common/Tracer.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts rename to pkgs/sdk/trace/base/test/common/Tracer.test.ts index 359816874..cb6c3488f 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/Tracer.test.ts +++ b/pkgs/sdk/trace/base/test/common/Tracer.test.ts @@ -27,13 +27,13 @@ import { trace, TraceFlags, TraceState, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { getSpan } from '@opentelemetry/api/build/src/trace/context-utils'; import { InstrumentationLibrary, sanitizeAttributes, suppressTracing, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { AlwaysOffSampler, diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/config.test.ts b/pkgs/sdk/trace/base/test/common/config.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/config.test.ts rename to pkgs/sdk/trace/base/test/common/config.test.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts b/pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts rename to pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts index 069287fc5..b57204a46 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/BatchSpanProcessorBase.test.ts +++ b/pkgs/sdk/trace/base/test/common/export/BatchSpanProcessorBase.test.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { diag, ROOT_CONTEXT } from '@opentelemetry/api'; +import { diag, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; import { ExportResultCode, loggingErrorHandler, setGlobalErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { @@ -29,12 +29,12 @@ import { InMemorySpanExporter, Span, } from '../../../src'; -import { context } from '@opentelemetry/api'; +import { context } from '@opentelemetry/sandbox-api'; import { TestRecordOnlySampler } from './TestRecordOnlySampler'; import { TestTracingSpanExporter } from './TestTracingSpanExporter'; import { TestStackContextManager } from './TestStackContextManager'; import { BatchSpanProcessorBase } from '../../../src/export/BatchSpanProcessorBase'; -import { Resource, ResourceAttributes } from '@opentelemetry/resources'; +import { Resource, ResourceAttributes } from '@opentelemetry/sandbox-resources'; function createSampledSpan(spanName: string): Span { const tracer = new BasicTracerProvider({ diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts b/pkgs/sdk/trace/base/test/common/export/ConsoleSpanExporter.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts rename to pkgs/sdk/trace/base/test/common/export/ConsoleSpanExporter.test.ts index d005a2f80..fe9bf2071 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/ConsoleSpanExporter.test.ts +++ b/pkgs/sdk/trace/base/test/common/export/ConsoleSpanExporter.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import { SpanContext, TraceFlags } from '@opentelemetry/api'; -import { TraceState } from '@opentelemetry/core'; +import { SpanContext, TraceFlags } from '@opentelemetry/sandbox-api'; +import { TraceState } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts b/pkgs/sdk/trace/base/test/common/export/InMemorySpanExporter.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts rename to pkgs/sdk/trace/base/test/common/export/InMemorySpanExporter.test.ts index 585610514..546b46f18 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/InMemorySpanExporter.test.ts +++ b/pkgs/sdk/trace/base/test/common/export/InMemorySpanExporter.test.ts @@ -20,8 +20,8 @@ import { SimpleSpanProcessor, BasicTracerProvider, } from '../../../src'; -import { context, trace } from '@opentelemetry/api'; -import { ExportResult, ExportResultCode } from '@opentelemetry/core'; +import { context, trace } from '@opentelemetry/sandbox-api'; +import { ExportResult, ExportResultCode } from '@opentelemetry/sandbox-core'; describe('InMemorySpanExporter', () => { let memoryExporter: InMemorySpanExporter; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts b/pkgs/sdk/trace/base/test/common/export/SimpleSpanProcessor.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts rename to pkgs/sdk/trace/base/test/common/export/SimpleSpanProcessor.test.ts index 94e86eeed..c6ebfc3a2 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/SimpleSpanProcessor.test.ts +++ b/pkgs/sdk/trace/base/test/common/export/SimpleSpanProcessor.test.ts @@ -20,12 +20,12 @@ import { SpanContext, SpanKind, TraceFlags, -} from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-api'; import { ExportResultCode, loggingErrorHandler, setGlobalErrorHandler, -} from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import * as sinon from 'sinon'; import { @@ -36,8 +36,8 @@ import { } from '../../../src'; import { TestStackContextManager } from './TestStackContextManager'; import { TestTracingSpanExporter } from './TestTracingSpanExporter'; -import { Resource, ResourceAttributes } from '@opentelemetry/resources'; -import { Resource as Resource190 } from '@opentelemetry/resources_1.9.0'; +import { Resource, ResourceAttributes } from '@opentelemetry/sandbox-resources'; +import { Resource as Resource190 } from '@opentelemetry/resources'; import { TestExporterWithDelay } from './TestExporterWithDelay'; describe('SimpleSpanProcessor', () => { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts b/pkgs/sdk/trace/base/test/common/export/TestExporterWithDelay.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts rename to pkgs/sdk/trace/base/test/common/export/TestExporterWithDelay.ts index d10dab527..84d70c145 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestExporterWithDelay.ts +++ b/pkgs/sdk/trace/base/test/common/export/TestExporterWithDelay.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/core'; +import { ExportResult } from '@opentelemetry/sandbox-core'; import { InMemorySpanExporter, ReadableSpan } from '../../../src'; /** diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestRecordOnlySampler.ts b/pkgs/sdk/trace/base/test/common/export/TestRecordOnlySampler.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestRecordOnlySampler.ts rename to pkgs/sdk/trace/base/test/common/export/TestRecordOnlySampler.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts b/pkgs/sdk/trace/base/test/common/export/TestStackContextManager.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts rename to pkgs/sdk/trace/base/test/common/export/TestStackContextManager.ts index 3413a4aa1..154551205 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestStackContextManager.ts +++ b/pkgs/sdk/trace/base/test/common/export/TestStackContextManager.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ContextManager, Context, ROOT_CONTEXT } from '@opentelemetry/api'; +import { ContextManager, Context, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; /** * A test-only ContextManager that uses an in-memory stack to keep track of diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts b/pkgs/sdk/trace/base/test/common/export/TestTracingSpanExporter.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts rename to pkgs/sdk/trace/base/test/common/export/TestTracingSpanExporter.ts index 89eae8d8b..79aac1d40 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/export/TestTracingSpanExporter.ts +++ b/pkgs/sdk/trace/base/test/common/export/TestTracingSpanExporter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/core'; +import { ExportResult } from '@opentelemetry/sandbox-core'; import { BasicTracerProvider, InMemorySpanExporter, diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/platform/RandomIdGenerator.test.ts b/pkgs/sdk/trace/base/test/common/platform/RandomIdGenerator.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/platform/RandomIdGenerator.test.ts rename to pkgs/sdk/trace/base/test/common/platform/RandomIdGenerator.test.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/AlwaysOffSampler.test.ts b/pkgs/sdk/trace/base/test/common/sampler/AlwaysOffSampler.test.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/AlwaysOffSampler.test.ts rename to pkgs/sdk/trace/base/test/common/sampler/AlwaysOffSampler.test.ts index d591dc53e..106ce2057 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/AlwaysOffSampler.test.ts +++ b/pkgs/sdk/trace/base/test/common/sampler/AlwaysOffSampler.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { AlwaysOffSampler } from '../../../src/sampler/AlwaysOffSampler'; describe('AlwaysOffSampler', () => { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/AlwaysOnSampler.test.ts b/pkgs/sdk/trace/base/test/common/sampler/AlwaysOnSampler.test.ts similarity index 95% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/AlwaysOnSampler.test.ts rename to pkgs/sdk/trace/base/test/common/sampler/AlwaysOnSampler.test.ts index 95825dc79..fcda13f8c 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/AlwaysOnSampler.test.ts +++ b/pkgs/sdk/trace/base/test/common/sampler/AlwaysOnSampler.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { AlwaysOnSampler } from '../../../src/sampler/AlwaysOnSampler'; describe('AlwaysOnSampler', () => { diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/ParentBasedSampler.test.ts b/pkgs/sdk/trace/base/test/common/sampler/ParentBasedSampler.test.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/ParentBasedSampler.test.ts rename to pkgs/sdk/trace/base/test/common/sampler/ParentBasedSampler.test.ts index 22ebfb809..eea1e9704 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/ParentBasedSampler.test.ts +++ b/pkgs/sdk/trace/base/test/common/sampler/ParentBasedSampler.test.ts @@ -14,8 +14,8 @@ * limitations under the License. */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; -import { TraceFlags, SpanKind, trace } from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; +import { TraceFlags, SpanKind, trace } from '@opentelemetry/sandbox-api'; import { AlwaysOnSampler, ParentBasedSampler, diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/TraceIdRatioBasedSampler.test.ts b/pkgs/sdk/trace/base/test/common/sampler/TraceIdRatioBasedSampler.test.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/TraceIdRatioBasedSampler.test.ts rename to pkgs/sdk/trace/base/test/common/sampler/TraceIdRatioBasedSampler.test.ts index d40219f95..00b1b85ed 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/sampler/TraceIdRatioBasedSampler.test.ts +++ b/pkgs/sdk/trace/base/test/common/sampler/TraceIdRatioBasedSampler.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { TraceIdRatioBasedSampler } from '../../../src/sampler/TraceIdRatioBasedSampler'; const spanContext = (traceId = '1') => ({ diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/util.ts b/pkgs/sdk/trace/base/test/common/util.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/common/util.ts rename to pkgs/sdk/trace/base/test/common/util.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/index-webpack.ts b/pkgs/sdk/trace/base/test/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/index-webpack.ts rename to pkgs/sdk/trace/base/test/index-webpack.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-base/test/index-webpack.worker.ts b/pkgs/sdk/trace/base/test/index-webpack.worker.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-base/test/index-webpack.worker.ts rename to pkgs/sdk/trace/base/test/index-webpack.worker.ts diff --git a/pkgs/sdk/trace/base/tsconfig.esm.json b/pkgs/sdk/trace/base/tsconfig.esm.json new file mode 100644 index 000000000..ed5341aa3 --- /dev/null +++ b/pkgs/sdk/trace/base/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/trace/base/tsconfig.esnext.json b/pkgs/sdk/trace/base/tsconfig.esnext.json new file mode 100644 index 000000000..2f8a78e6b --- /dev/null +++ b/pkgs/sdk/trace/base/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/trace/base/tsconfig.json b/pkgs/sdk/trace/base/tsconfig.json new file mode 100644 index 000000000..33f0e4587 --- /dev/null +++ b/pkgs/sdk/trace/base/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintignore b/pkgs/sdk/trace/web/.eslintignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintignore rename to pkgs/sdk/trace/web/.eslintignore diff --git a/pkgs/sdk/trace/web/.eslintrc.js b/pkgs/sdk/trace/web/.eslintrc.js new file mode 100644 index 000000000..18b4667aa --- /dev/null +++ b/pkgs/sdk/trace/web/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "browser": true, + }, + ...require('../../../../eslint.base.js') +} diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/.npmignore b/pkgs/sdk/trace/web/.npmignore similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/.npmignore rename to pkgs/sdk/trace/web/.npmignore diff --git a/auto-merge/js/packages/sdk-metrics/LICENSE b/pkgs/sdk/trace/web/LICENSE similarity index 100% rename from auto-merge/js/packages/sdk-metrics/LICENSE rename to pkgs/sdk/trace/web/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/README.md b/pkgs/sdk/trace/web/README.md similarity index 90% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/README.md rename to pkgs/sdk/trace/web/README.md index 8eccf7fc1..68cfc5007 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/README.md +++ b/pkgs/sdk/trace/web/README.md @@ -35,10 +35,10 @@ import { ConsoleSpanExporter, SimpleSpanProcessor, WebTracerProvider, -} from '@opentelemetry/sdk-trace-web'; -import { DocumentLoad } from '@opentelemetry/plugin-document-load'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; +} from '@opentelemetry/sandbox-sdk-trace-web'; +import { DocumentLoad } from '@opentelemetry/sandbox-plugin-document-load'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import { registerInstrumentations } from '@opentelemetry/sandbox-instrumentation'; const provider = new WebTracerProvider(); provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/karma.conf.js b/pkgs/sdk/trace/web/karma.conf.js similarity index 86% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/karma.conf.js rename to pkgs/sdk/trace/web/karma.conf.js index 09cb7c72d..ddd3016ec 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/karma.conf.js +++ b/pkgs/sdk/trace/web/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../karma.webpack'); -const karmaBaseConfig = require('../../karma.base'); +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/pkgs/sdk/trace/web/karma.debug.conf.js b/pkgs/sdk/trace/web/karma.debug.conf.js new file mode 100644 index 000000000..02f69db6b --- /dev/null +++ b/pkgs/sdk/trace/web/karma.debug.conf.js @@ -0,0 +1,22 @@ +/*! + * 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 + * + * 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. +*/ + +const karmaBaseConfig = require("../../../../karma.base"); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + })); +}; diff --git a/pkgs/sdk/trace/web/karma.worker.js b/pkgs/sdk/trace/web/karma.worker.js new file mode 100644 index 000000000..f2126608c --- /dev/null +++ b/pkgs/sdk/trace/web/karma.worker.js @@ -0,0 +1,24 @@ +/*! + * 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 + * + * 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. + */ + +const karmaWebpackConfig = require('../../../../karma.webpack'); +const karmaBaseConfig = require('../../../../karma.worker'); + +module.exports = (config) => { + config.set(Object.assign({}, karmaBaseConfig, { + webpack: karmaWebpackConfig + })) +}; diff --git a/pkgs/sdk/trace/web/package.json b/pkgs/sdk/trace/web/package.json new file mode 100644 index 000000000..ab7ae169a --- /dev/null +++ b/pkgs/sdk/trace/web/package.json @@ -0,0 +1,123 @@ +{ + "name": "@opentelemetry/sandbox-sdk-trace-web", + "version": "1.15.2", + "description": "OpenTelemetry Web Tracer", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "tdd": "karma start", + "test": "npm run test:node && npm run test:browser && npm run test:webworker", + "test:browser": "nyc karma start ./karma.conf.js --single-run", + "test:debug": "nyc karma start ./karma.debug.conf.js --wait", + "test:node": "", + "test:webworker": "", + "version": "node ../../../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "web", + "tracing", + "profiling", + "metrics", + "stats" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@babel/core": "7.22.10", + "@opentelemetry/sandbox-api": "1.4.1", + "@opentelemetry/sandbox-context-zone": "1.15.2", + "@opentelemetry/sandbox-propagator-b3": "1.15.2", + "@opentelemetry/sandbox-resources": "1.15.2", + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-jquery": "0.2.4", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0", + "webpack-cli": "4.10.0", + "webpack-merge": "5.9.0" + }, + "peerDependencies": { + "@opentelemetry/sandbox-api": "1.4.1" + }, + "dependencies": { + "@opentelemetry/sandbox-core": "1.15.2", + "@opentelemetry/sandbox-sdk-trace-base": "1.15.2", + "@opentelemetry/sandbox-semantic-conventions": "1.15.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/sdk/trace/web/rollup.config.js b/pkgs/sdk/trace/web/rollup.config.js new file mode 100644 index 000000000..c8d21aff9 --- /dev/null +++ b/pkgs/sdk/trace/web/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.sdk-trace-web", inputName, "otel-sndbx.sdk-trace-web", version); diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts b/pkgs/sdk/trace/web/src/StackContextManager.ts similarity index 99% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts rename to pkgs/sdk/trace/web/src/StackContextManager.ts index b15b0b03c..9d759ab42 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/StackContextManager.ts +++ b/pkgs/sdk/trace/web/src/StackContextManager.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/api'; +import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; /** * Stack Context Manager for managing the state in web diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts b/pkgs/sdk/trace/web/src/WebTracerProvider.ts similarity index 97% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts rename to pkgs/sdk/trace/web/src/WebTracerProvider.ts index 0317f48f8..9deea075f 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts +++ b/pkgs/sdk/trace/web/src/WebTracerProvider.ts @@ -18,7 +18,7 @@ import { BasicTracerProvider, SDKRegistrationConfig, TracerConfig, -} from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-sdk-trace-base'; import { StackContextManager } from './StackContextManager'; /** diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/enums/PerformanceTimingNames.ts b/pkgs/sdk/trace/web/src/enums/PerformanceTimingNames.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/src/enums/PerformanceTimingNames.ts rename to pkgs/sdk/trace/web/src/enums/PerformanceTimingNames.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/index.ts b/pkgs/sdk/trace/web/src/index.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/src/index.ts rename to pkgs/sdk/trace/web/src/index.ts index d7bfeaf38..7a2af63ab 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/index.ts +++ b/pkgs/sdk/trace/web/src/index.ts @@ -19,4 +19,4 @@ export * from './StackContextManager'; export * from './enums/PerformanceTimingNames'; export * from './types'; export * from './utils'; -export * from '@opentelemetry/sdk-trace-base'; +export * from '@opentelemetry/sandbox-sdk-trace-base'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/types.ts b/pkgs/sdk/trace/web/src/types.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/src/types.ts rename to pkgs/sdk/trace/web/src/types.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/utils.ts b/pkgs/sdk/trace/web/src/utils.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/src/utils.ts rename to pkgs/sdk/trace/web/src/utils.ts index b3f583676..c675ddaab 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/src/utils.ts +++ b/pkgs/sdk/trace/web/src/utils.ts @@ -20,13 +20,13 @@ import { PropagateTraceHeaderCorsUrls, } from './types'; import { PerformanceTimingNames as PTN } from './enums/PerformanceTimingNames'; -import * as api from '@opentelemetry/api'; +import * as api from '@opentelemetry/sandbox-api'; import { hrTimeToNanoseconds, timeInputToHrTime, urlMatches, -} from '@opentelemetry/core'; -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +} from '@opentelemetry/sandbox-core'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; // Used to normalize relative URLs let urlNormalizingAnchor: HTMLAnchorElement | undefined; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/NodeGlobalsFoolProofing.test.ts b/pkgs/sdk/trace/web/test/NodeGlobalsFoolProofing.test.ts similarity index 93% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/NodeGlobalsFoolProofing.test.ts rename to pkgs/sdk/trace/web/test/NodeGlobalsFoolProofing.test.ts index 19090be56..ec807d855 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/NodeGlobalsFoolProofing.test.ts +++ b/pkgs/sdk/trace/web/test/NodeGlobalsFoolProofing.test.ts @@ -19,9 +19,9 @@ import { propagation, trace, ProxyTracerProvider, -} from '@opentelemetry/api'; -import { Resource } from '@opentelemetry/resources'; -import { Tracer } from '@opentelemetry/sdk-trace-base'; +} from '@opentelemetry/sandbox-api'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import { Tracer } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import { StackContextManager, WebTracerProvider } from '../src'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts b/pkgs/sdk/trace/web/test/StackContextManager.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts rename to pkgs/sdk/trace/web/test/StackContextManager.test.ts index bcad24015..5846781b8 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/StackContextManager.test.ts +++ b/pkgs/sdk/trace/web/test/StackContextManager.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createContextKey, ROOT_CONTEXT } from '@opentelemetry/api'; +import { createContextKey, ROOT_CONTEXT } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import { StackContextManager } from '../src'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts b/pkgs/sdk/trace/web/test/WebTracerProvider.test.ts similarity index 90% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts rename to pkgs/sdk/trace/web/test/WebTracerProvider.test.ts index de63292a6..c70bd31ce 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts +++ b/pkgs/sdk/trace/web/test/WebTracerProvider.test.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import { context, ContextManager, trace } from '@opentelemetry/api'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { B3Propagator } from '@opentelemetry/propagator-b3'; -import { Resource } from '@opentelemetry/resources'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; -import { Span, Tracer } from '@opentelemetry/sdk-trace-base'; +import { context, ContextManager, trace } from '@opentelemetry/sandbox-api'; +import { ZoneContextManager } from '@opentelemetry/sandbox-context-zone'; +import { B3Propagator } from '@opentelemetry/sandbox-propagator-b3'; +import { Resource } from '@opentelemetry/sandbox-resources'; +import { SemanticResourceAttributes } from '@opentelemetry/sandbox-semantic-conventions'; +import { Span, Tracer } from '@opentelemetry/sandbox-sdk-trace-base'; import * as assert from 'assert'; import { WebTracerConfig } from '../src'; import { WebTracerProvider } from '../src/WebTracerProvider'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/index-webpack.ts b/pkgs/sdk/trace/web/test/index-webpack.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/index-webpack.ts rename to pkgs/sdk/trace/web/test/index-webpack.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/index-webpack.worker.ts b/pkgs/sdk/trace/web/test/index-webpack.worker.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/index-webpack.worker.ts rename to pkgs/sdk/trace/web/test/index-webpack.worker.ts diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/registration.test.ts b/pkgs/sdk/trace/web/test/registration.test.ts similarity index 96% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/registration.test.ts rename to pkgs/sdk/trace/web/test/registration.test.ts index 0de022a65..bac1ee462 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/registration.test.ts +++ b/pkgs/sdk/trace/web/test/registration.test.ts @@ -19,8 +19,8 @@ import { propagation, trace, ProxyTracerProvider, -} from '@opentelemetry/api'; -import { CompositePropagator } from '@opentelemetry/core'; +} from '@opentelemetry/sandbox-api'; +import { CompositePropagator } from '@opentelemetry/sandbox-core'; import * as assert from 'assert'; import { StackContextManager, WebTracerProvider } from '../src'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/utils.test.ts b/pkgs/sdk/trace/web/test/utils.test.ts similarity index 98% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/utils.test.ts rename to pkgs/sdk/trace/web/test/utils.test.ts index dd00e6b06..eb56f46e0 100644 --- a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/utils.test.ts +++ b/pkgs/sdk/trace/web/test/utils.test.ts @@ -17,10 +17,10 @@ import { hrTimeToNanoseconds, otperformance as performance, -} from '@opentelemetry/core'; -import * as core from '@opentelemetry/core'; -import * as tracing from '@opentelemetry/sdk-trace-base'; -import { HrTime } from '@opentelemetry/api'; +} from '@opentelemetry/sandbox-core'; +import * as core from '@opentelemetry/sandbox-core'; +import * as tracing from '@opentelemetry/sandbox-sdk-trace-base'; +import { HrTime } from '@opentelemetry/sandbox-api'; import * as assert from 'assert'; import * as sinon from 'sinon'; diff --git a/auto-merge/js/packages/opentelemetry-sdk-trace-web/test/window/utils.test.ts b/pkgs/sdk/trace/web/test/window/utils.test.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-sdk-trace-web/test/window/utils.test.ts rename to pkgs/sdk/trace/web/test/window/utils.test.ts diff --git a/pkgs/sdk/trace/web/tsconfig.esm.json b/pkgs/sdk/trace/web/tsconfig.esm.json new file mode 100644 index 000000000..ed5341aa3 --- /dev/null +++ b/pkgs/sdk/trace/web/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/trace/web/tsconfig.esnext.json b/pkgs/sdk/trace/web/tsconfig.esnext.json new file mode 100644 index 000000000..2f8a78e6b --- /dev/null +++ b/pkgs/sdk/trace/web/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/sdk/trace/web/tsconfig.json b/pkgs/sdk/trace/web/tsconfig.json new file mode 100644 index 000000000..33f0e4587 --- /dev/null +++ b/pkgs/sdk/trace/web/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/packages/sdk-metrics/.eslintignore b/pkgs/semantic-conventions/.eslintignore similarity index 100% rename from auto-merge/js/packages/sdk-metrics/.eslintignore rename to pkgs/semantic-conventions/.eslintignore diff --git a/auto-merge/js/packages/opentelemetry-propagator-b3/.eslintrc.js b/pkgs/semantic-conventions/.eslintrc.js similarity index 100% rename from auto-merge/js/packages/opentelemetry-propagator-b3/.eslintrc.js rename to pkgs/semantic-conventions/.eslintrc.js diff --git a/auto-merge/js/packages/sdk-metrics/.npmignore b/pkgs/semantic-conventions/.npmignore similarity index 100% rename from auto-merge/js/packages/sdk-metrics/.npmignore rename to pkgs/semantic-conventions/.npmignore diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/LICENSE b/pkgs/semantic-conventions/LICENSE similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/LICENSE rename to pkgs/semantic-conventions/LICENSE diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/README.md b/pkgs/semantic-conventions/README.md similarity index 94% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/README.md rename to pkgs/semantic-conventions/README.md index bf2700473..c8850aa41 100644 --- a/auto-merge/js/packages/opentelemetry-semantic-conventions/README.md +++ b/pkgs/semantic-conventions/README.md @@ -14,7 +14,7 @@ npm install --save @opentelemetry/semantic-conventions ## Usage ```ts -import { SemanticAttributes } from '@opentelemetry/semantic-conventions'; +import { SemanticAttributes } from '@opentelemetry/sandbox-semantic-conventions'; const span = tracer.startSpan().startSpan(spanName, spanOptions) .setAttributes({ diff --git a/pkgs/semantic-conventions/package.json b/pkgs/semantic-conventions/package.json new file mode 100644 index 000000000..cf3814c45 --- /dev/null +++ b/pkgs/semantic-conventions/package.json @@ -0,0 +1,103 @@ +{ + "name": "@opentelemetry/sandbox-semantic-conventions", + "version": "1.15.2", + "description": "OpenTelemetry semantic conventions", + "main": "build/src/index.js", + "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "build": "npm run compile && npm run package", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "compile": "npm run lint:fix-quiet && npm run version && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "lint": "eslint . --ext .ts", + "lint:fix": "npm run lint -- --fix", + "lint:fix-quiet": "npm run lint -- --fix --quiet", + "package": "npx rollup -c ./rollup.config.js --bundleConfigAsCjs", + "peer-api-check": "node ../../scripts/peer-api-check.js", + "prepublishOnly": "npm run compile", + "rebuild": "npm run clean && npm run build", + "test": "", + "test:browser": "", + "test:debug": "", + "test:node": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:webworker": "", + "version": "node ../../scripts/version-update.js", + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" + }, + "keywords": [ + "opentelemetry", + "nodejs", + "tracing", + "attributes", + "semantic conventions" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "files": [ + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@types/jquery": "^3.5.14", + "@types/mocha": "^10.0.0", + "@types/node": "^18.14.2", + "@types/sinon": "^10.0.13", + "@types/webpack-env": "1.16.3", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "6.1.1", + "chromium": "^3.0.3", + "codecov": "^3.8.3", + "cross-var": "1.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.5.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.2.1", + "istanbul-instrumenter-loader": "3.0.1", + "karma": "6.3.16", + "karma-chrome-launcher": "3.1.0", + "karma-coverage-istanbul-reporter": "3.0.3", + "karma-mocha": "^2.0.1", + "karma-mocha-webworker": "1.3.0", + "karma-spec-reporter": "^0.0.34", + "karma-typescript": "^5.5.3", + "karma-webpack": "^4.0.2", + "mocha": "10.0.0", + "nock": "13.3.2", + "nyc": "^15.1.0", + "pako": "^2.0.3", + "prettier": "2.8.8", + "puppeteer": "^14.2.1", + "sinon": "^14.0.0", + "ts-loader": "8.4.0", + "ts-mocha": "10.0.0", + "typedoc": "^0.23.26", + "typedoc-plugin-missing-exports": "^1.0.0", + "typedoc-plugin-resolve-crossmodule-references": "^0.3.3", + "typescript": "^4.9.5", + "webpack": "^4.46.0" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions", + "sideEffects": false +} \ No newline at end of file diff --git a/pkgs/semantic-conventions/rollup.config.js b/pkgs/semantic-conventions/rollup.config.js new file mode 100644 index 000000000..99e511a80 --- /dev/null +++ b/pkgs/semantic-conventions/rollup.config.js @@ -0,0 +1,21 @@ +/*! + * 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 + * + * 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. +*/ + +import { createConfig } from "../../rollup.base.config"; +const version = require("./package.json").version; +const inputName = "build/esm/index.js"; + +export default createConfig("opentelemetry.sandbox.web.semantic-conventions", inputName, "otel-sndbx.semantic-conventions", version); diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/src/index.ts b/pkgs/semantic-conventions/src/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/src/index.ts rename to pkgs/semantic-conventions/src/index.ts diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/src/resource/SemanticResourceAttributes.ts b/pkgs/semantic-conventions/src/resource/SemanticResourceAttributes.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/src/resource/SemanticResourceAttributes.ts rename to pkgs/semantic-conventions/src/resource/SemanticResourceAttributes.ts diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/src/resource/index.ts b/pkgs/semantic-conventions/src/resource/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/src/resource/index.ts rename to pkgs/semantic-conventions/src/resource/index.ts diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts b/pkgs/semantic-conventions/src/trace/SemanticAttributes.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts rename to pkgs/semantic-conventions/src/trace/SemanticAttributes.ts diff --git a/auto-merge/js/packages/opentelemetry-semantic-conventions/src/trace/index.ts b/pkgs/semantic-conventions/src/trace/index.ts similarity index 100% rename from auto-merge/js/packages/opentelemetry-semantic-conventions/src/trace/index.ts rename to pkgs/semantic-conventions/src/trace/index.ts diff --git a/pkgs/semantic-conventions/tsconfig.esm.json b/pkgs/semantic-conventions/tsconfig.esm.json new file mode 100644 index 000000000..6f96cbec1 --- /dev/null +++ b/pkgs/semantic-conventions/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "outDir": "build/esm", + "rootDir": "src", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/semantic-conventions/tsconfig.esnext.json b/pkgs/semantic-conventions/tsconfig.esnext.json new file mode 100644 index 000000000..2525ac36a --- /dev/null +++ b/pkgs/semantic-conventions/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "outDir": "build/esnext", + "rootDir": "src", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} \ No newline at end of file diff --git a/pkgs/semantic-conventions/tsconfig.json b/pkgs/semantic-conventions/tsconfig.json new file mode 100644 index 000000000..cb48d4258 --- /dev/null +++ b/pkgs/semantic-conventions/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "build", + "rootDir": "." + }, + "files": [], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} \ No newline at end of file diff --git a/auto-merge/js/prettier.config.js b/prettier.config.js similarity index 100% rename from auto-merge/js/prettier.config.js rename to prettier.config.js diff --git a/auto-merge/js/scripts/generate-protos.js b/scripts/generate-protos.js similarity index 100% rename from auto-merge/js/scripts/generate-protos.js rename to scripts/generate-protos.js diff --git a/auto-merge/js/scripts/peer-api-check.js b/scripts/peer-api-check.js similarity index 100% rename from auto-merge/js/scripts/peer-api-check.js rename to scripts/peer-api-check.js diff --git a/auto-merge/js/scripts/semconv/.gitignore b/scripts/semconv/.gitignore similarity index 100% rename from auto-merge/js/scripts/semconv/.gitignore rename to scripts/semconv/.gitignore diff --git a/auto-merge/js/scripts/semconv/generate.sh b/scripts/semconv/generate.sh similarity index 100% rename from auto-merge/js/scripts/semconv/generate.sh rename to scripts/semconv/generate.sh diff --git a/auto-merge/js/scripts/semconv/templates/SemanticAttributes.ts.j2 b/scripts/semconv/templates/SemanticAttributes.ts.j2 similarity index 100% rename from auto-merge/js/scripts/semconv/templates/SemanticAttributes.ts.j2 rename to scripts/semconv/templates/SemanticAttributes.ts.j2 diff --git a/auto-merge/js/scripts/update-ts-configs-constants.js b/scripts/update-ts-configs-constants.js similarity index 100% rename from auto-merge/js/scripts/update-ts-configs-constants.js rename to scripts/update-ts-configs-constants.js diff --git a/auto-merge/js/scripts/update-ts-configs.js b/scripts/update-ts-configs.js similarity index 100% rename from auto-merge/js/scripts/update-ts-configs.js rename to scripts/update-ts-configs.js diff --git a/auto-merge/js/scripts/version-update.js b/scripts/version-update.js similarity index 90% rename from auto-merge/js/scripts/version-update.js rename to scripts/version-update.js index b0aee8845..323ee6832 100644 --- a/auto-merge/js/scripts/version-update.js +++ b/scripts/version-update.js @@ -39,10 +39,13 @@ const content = `/* * limitations under the License. */ -// this is autogenerated file, see scripts/version-update.js +// this is autogenerated file for ${pjson.name}, see scripts/version-update.js export const VERSION = '${pjson.version}'; `; const fileUrl = path.join(appRoot, "src", "version.ts") fs.writeFileSync(fileUrl, content); + +// Returning zero to tell npm that we completed successfully +process.exit(0); diff --git a/auto-merge/js/tsconfig.base.es5.json b/tsconfig.base.es5.json similarity index 100% rename from auto-merge/js/tsconfig.base.es5.json rename to tsconfig.base.es5.json diff --git a/auto-merge/js/tsconfig.base.esm.json b/tsconfig.base.esm.json similarity index 100% rename from auto-merge/js/tsconfig.base.esm.json rename to tsconfig.base.esm.json diff --git a/auto-merge/js/tsconfig.base.esnext.json b/tsconfig.base.esnext.json similarity index 100% rename from auto-merge/js/tsconfig.base.esnext.json rename to tsconfig.base.esnext.json diff --git a/auto-merge/js/tsconfig.base.json b/tsconfig.base.json similarity index 100% rename from auto-merge/js/tsconfig.base.json rename to tsconfig.base.json diff --git a/auto-merge/js/tsconfig.esm.json b/tsconfig.esm.json similarity index 100% rename from auto-merge/js/tsconfig.esm.json rename to tsconfig.esm.json diff --git a/auto-merge/js/tsconfig.esnext.json b/tsconfig.esnext.json similarity index 100% rename from auto-merge/js/tsconfig.esnext.json rename to tsconfig.esnext.json diff --git a/auto-merge/js/tsconfig.json b/tsconfig.json similarity index 100% rename from auto-merge/js/tsconfig.json rename to tsconfig.json diff --git a/auto-merge/js/webpack.node-polyfills.js b/webpack.node-polyfills.js similarity index 100% rename from auto-merge/js/webpack.node-polyfills.js rename to webpack.node-polyfills.js