From 863c4d4028a485fc70d4868457a57eebd818ea66 Mon Sep 17 00:00:00 2001 From: shashi3kiran3 <142459084+shashi3kiran3@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:14:50 -0700 Subject: [PATCH 01/24] chore(sdk-node): deprecate methods in favor of constructor options (#3996) (#4076) Co-authored-by: Daniel Dyla --- .../packages/opentelemetry-instrumentation-http/package.json | 2 +- .../packages/opentelemetry-instrumentation/package.json | 2 +- experimental/packages/shim-opencensus/package.json | 2 +- packages/opentelemetry-sdk-trace-node/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 19b0d5651..ed70652df 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -77,7 +77,7 @@ "@opentelemetry/core": "1.15.2", "@opentelemetry/instrumentation": "0.41.2", "@opentelemetry/semantic-conventions": "1.15.2", - "semver": "^7.5.1" + "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 859058695..497ddb1b2 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -74,7 +74,7 @@ "@types/shimmer": "^1.0.2", "import-in-the-middle": "1.4.2", "require-in-the-middle": "^7.1.1", - "semver": "^7.5.1", + "semver": "^7.5.2", "shimmer": "^1.2.1" }, "peerDependencies": { diff --git a/experimental/packages/shim-opencensus/package.json b/experimental/packages/shim-opencensus/package.json index 3c9d4e820..75651fc75 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -71,7 +71,7 @@ "dependencies": { "@opentelemetry/core": "1.15.2", "require-in-the-middle": "^7.1.1", - "semver": "^7.5.1" + "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index bd88e07fd..f4d44f0f9 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -70,7 +70,7 @@ "@opentelemetry/propagator-b3": "1.15.2", "@opentelemetry/propagator-jaeger": "1.15.2", "@opentelemetry/sdk-trace-base": "1.15.2", - "semver": "^7.5.1" + "semver": "^7.5.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node", "sideEffects": false From dfe9bdd32cd06c7de31804b86ae6f11131303fbc Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 23 Aug 2023 20:36:11 +0200 Subject: [PATCH 02/24] chore(deps): update prettier to v3 and prettier-plugin-eslint to v5 (#4075) * chore(deps): update dependency prettier to v3 * chore: bump prettier-plugin-eslint and apply rules --------- Co-authored-by: Mend Renovate Co-authored-by: Daniel Dyla --- api/src/metrics/Meter.ts | 12 ++++++------ api/src/metrics/Metric.ts | 18 +++++++++--------- api/src/metrics/ObservableResult.ts | 4 ++-- .../test/node/OTLPLogExporter.test.ts | 5 ++++- .../exporter-logs-otlp-proto/test/logHelper.ts | 5 ++++- .../test/node/nodeHelpers.ts | 5 ++++- .../test/traceHelper.ts | 5 ++++- .../src/OTLPMetricExporterBase.ts | 2 +- .../test/node/nodeHelpers.ts | 5 ++++- .../test/metricsHelper.ts | 5 ++++- .../src/http.ts | 4 ++-- .../otlp-exporter-base/src/OTLPExporterBase.ts | 2 +- .../browser/OTLPExporterBrowserBase.ts | 2 +- .../src/platform/node/OTLPExporterNodeBase.ts | 2 +- .../src/OTLPGRPCExporterNodeBase.ts | 2 +- .../browser/OTLPProtoExporterBrowserBase.ts | 2 +- .../platform/node/OTLPProtoExporterNodeBase.ts | 2 +- .../src/export/BatchLogRecordProcessorBase.ts | 5 ++++- package.json | 4 ++-- .../opentelemetry-core/src/utils/callback.ts | 7 +++++-- .../test/utils/merge.test.ts | 5 ++++- .../src/export/BatchSpanProcessorBase.ts | 9 ++++++--- .../src/aggregator/ExponentialHistogram.ts | 5 ++++- .../sdk-metrics/src/state/MeterSharedState.ts | 2 +- packages/sdk-metrics/src/view/Aggregation.ts | 5 ++++- 25 files changed, 80 insertions(+), 44 deletions(-) diff --git a/api/src/metrics/Meter.ts b/api/src/metrics/Meter.ts index c399fc5fb..1405ae747 100644 --- a/api/src/metrics/Meter.ts +++ b/api/src/metrics/Meter.ts @@ -85,7 +85,7 @@ export interface Meter { * @param [options] the metric options. */ createUpDownCounter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, >( name: string, options?: MetricOptions @@ -100,7 +100,7 @@ export interface Meter { * @param [options] the metric options. */ createObservableGauge< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, >( name: string, options?: MetricOptions @@ -115,7 +115,7 @@ export interface Meter { * @param [options] the metric options. */ createObservableCounter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, >( name: string, options?: MetricOptions @@ -130,7 +130,7 @@ export interface Meter { * @param [options] the metric options. */ createObservableUpDownCounter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, >( name: string, options?: MetricOptions @@ -151,7 +151,7 @@ export interface Meter { * @param observables the observables associated with this batch observable callback */ addBatchObservableCallback< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, >( callback: BatchObservableCallback, observables: Observable[] @@ -167,7 +167,7 @@ export interface Meter { * @param observables the observables associated with this batch observable callback */ removeBatchObservableCallback< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, >( callback: BatchObservableCallback, observables: Observable[] diff --git a/api/src/metrics/Metric.ts b/api/src/metrics/Metric.ts index 36d773441..533aa264b 100644 --- a/api/src/metrics/Metric.ts +++ b/api/src/metrics/Metric.ts @@ -63,7 +63,7 @@ export enum ValueType { *
    */ export interface Counter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > { /** * Increment value of counter by the input. Inputs must not be negative. @@ -72,7 +72,7 @@ export interface Counter< } export interface UpDownCounter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > { /** * Increment value of counter by the input. Inputs may be negative. @@ -81,7 +81,7 @@ export interface UpDownCounter< } export interface Histogram< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > { /** * Records a measurement. Value of the measurement must not be negative. @@ -103,7 +103,7 @@ export type MetricAttributeValue = AttributeValue; * The observable callback for Observable instruments. */ export type ObservableCallback< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > = ( observableResult: ObservableResult ) => void | Promise; @@ -112,13 +112,13 @@ export type ObservableCallback< * The observable callback for a batch of Observable instruments. */ export type BatchObservableCallback< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > = ( observableResult: BatchObservableResult ) => void | Promise; export interface Observable< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > { /** * Sets up a function that will be called whenever a metric collection is initiated. @@ -134,11 +134,11 @@ export interface Observable< } export type ObservableCounter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > = Observable; export type ObservableUpDownCounter< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > = Observable; export type ObservableGauge< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > = Observable; diff --git a/api/src/metrics/ObservableResult.ts b/api/src/metrics/ObservableResult.ts index 5b4f9e962..29a82db12 100644 --- a/api/src/metrics/ObservableResult.ts +++ b/api/src/metrics/ObservableResult.ts @@ -20,7 +20,7 @@ import { MetricAttributes, Observable } from './Metric'; * Interface that is being used in callback function for Observable Metric. */ export interface ObservableResult< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > { /** * Observe a measurement of the value associated with the given attributes. @@ -41,7 +41,7 @@ export interface ObservableResult< * Interface that is being used in batch observable callback function. */ export interface BatchObservableResult< - AttributesTypes extends MetricAttributes = MetricAttributes + AttributesTypes extends MetricAttributes = MetricAttributes, > { /** * Observe a measurement of the value associated with the given attributes. 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 2ae11142a..6dac23b58 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 @@ -35,7 +35,10 @@ import { ExportResultCode } from '@opentelemetry/core'; let fakeRequest: PassThrough; class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { + constructor( + private _code: number, + private _msg?: string + ) { super(); } diff --git a/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts b/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts index 7b8c8e8b9..54a752af1 100644 --- a/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts +++ b/experimental/packages/exporter-logs-otlp-proto/test/logHelper.ts @@ -167,7 +167,10 @@ export function ensureExportLogsServiceRequestIsSet( } export class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { + constructor( + private _code: number, + private _msg?: string + ) { super(); } diff --git a/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts b/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts index 1219f2d97..d2dce6517 100644 --- a/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts +++ b/experimental/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts @@ -17,7 +17,10 @@ import { Stream } from 'stream'; export class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { + constructor( + private _code: number, + private _msg?: string + ) { super(); } diff --git a/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts b/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts index 5e2b71c57..ff6a9c7b8 100644 --- a/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts +++ b/experimental/packages/exporter-trace-otlp-proto/test/traceHelper.ts @@ -261,7 +261,10 @@ export function ensureExportTraceServiceRequestIsSet( } export class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { + constructor( + private _code: number, + private _msg?: string + ) { super(); } 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 21177777f..db8a4a32e 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterBase.ts @@ -109,7 +109,7 @@ export class OTLPMetricExporterBase< OTLPMetricExporterOptions, ResourceMetrics, IExportMetricsServiceRequest - > + >, > implements PushMetricExporter { public _otlpExporter: T; diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts index 1219f2d97..d2dce6517 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/node/nodeHelpers.ts @@ -17,7 +17,10 @@ import { Stream } from 'stream'; export class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { + constructor( + private _code: number, + private _msg?: string + ) { super(); } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts index 0012f0c11..27b816fe1 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/test/metricsHelper.ts @@ -224,7 +224,10 @@ export function ensureExportMetricsServiceRequestIsSet( } export class MockedResponse extends Stream { - constructor(private _code: number, private _msg?: string) { + constructor( + private _code: number, + private _msg?: string + ) { super(); } diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts index 15ca92a45..9422bbc9e 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts @@ -105,7 +105,7 @@ export class HttpInstrumentation extends InstrumentationBase { init(): [ InstrumentationNodeModuleDefinition, - InstrumentationNodeModuleDefinition + InstrumentationNodeModuleDefinition, ] { return [this._getHttpsInstrumentation(), this._getHttpInstrumentation()]; } @@ -237,7 +237,7 @@ export class HttpInstrumentation extends InstrumentationBase { // https://nodejs.org/dist/latest/docs/api/http.html#http_http_get_options_callback // https://github.com/googleapis/cloud-trace-nodejs/blob/master/src/instrumentations/instrumentation-http.ts#L198 return function outgoingGetRequest< - T extends http.RequestOptions | string | url.URL + T extends http.RequestOptions | string | url.URL, >(options: T, ...args: HttpRequestArgs): http.ClientRequest { const req = clientRequest(options, ...args); req.end(); diff --git a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts index c96030578..2c55a7f91 100644 --- a/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts +++ b/experimental/packages/otlp-exporter-base/src/OTLPExporterBase.ts @@ -33,7 +33,7 @@ import { configureExporterTimeout } from './util'; export abstract class OTLPExporterBase< T extends OTLPExporterConfigBase, ExportItem, - ServiceRequest + ServiceRequest, > { public readonly url: string; public readonly hostname: string | undefined; diff --git a/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts b/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts index 57556d81a..2888e317d 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts +++ b/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts @@ -27,7 +27,7 @@ import { getEnv, baggageUtils } from '@opentelemetry/core'; */ export abstract class OTLPExporterBrowserBase< ExportItem, - ServiceRequest + ServiceRequest, > extends OTLPExporterBase { protected _headers: Record; private _useXHR: boolean = false; diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts b/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts index 088a0fd0a..5a8b1dfdf 100644 --- a/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts +++ b/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts @@ -30,7 +30,7 @@ import { getEnv, baggageUtils } from '@opentelemetry/core'; */ export abstract class OTLPExporterNodeBase< ExportItem, - ServiceRequest + ServiceRequest, > extends OTLPExporterBase< OTLPExporterNodeConfigBase, ExportItem, diff --git a/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts b/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts index 884505daa..b4f06472c 100644 --- a/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts +++ b/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts @@ -34,7 +34,7 @@ import { */ export abstract class OTLPGRPCExporterNodeBase< ExportItem, - ServiceRequest + ServiceRequest, > extends OTLPExporterBase< OTLPGRPCExporterConfigNode, ExportItem, diff --git a/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts b/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts index 34c80d6e8..4bc9e5c70 100644 --- a/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts +++ b/experimental/packages/otlp-proto-exporter-base/src/platform/browser/OTLPProtoExporterBrowserBase.ts @@ -30,7 +30,7 @@ import { getExportRequestProto } from '../util'; */ export abstract class OTLPProtoExporterBrowserBase< ExportItem, - ServiceRequest + ServiceRequest, > extends OTLPExporterBaseMain { constructor(config: OTLPExporterConfigBase = {}) { super(config); diff --git a/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts b/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts index c0ff4b6b3..17804c47b 100644 --- a/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts +++ b/experimental/packages/otlp-proto-exporter-base/src/platform/node/OTLPProtoExporterNodeBase.ts @@ -36,7 +36,7 @@ type SendFn = ( */ export abstract class OTLPProtoExporterNodeBase< ExportItem, - ServiceRequest + ServiceRequest, > extends OTLPExporterBaseMain { private _send!: SendFn; diff --git a/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts b/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts index 92d42fe44..027f103c0 100644 --- a/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts +++ b/experimental/packages/sdk-logs/src/export/BatchLogRecordProcessorBase.ts @@ -42,7 +42,10 @@ export abstract class BatchLogRecordProcessorBase private _timer: NodeJS.Timeout | undefined; private _shutdownOnce: BindOnceFuture; - constructor(private readonly _exporter: LogRecordExporter, config?: T) { + constructor( + private readonly _exporter: LogRecordExporter, + config?: T + ) { const env = getEnv(); this._maxExportBatchSize = config?.maxExportBatchSize ?? env.OTEL_BLRP_MAX_EXPORT_BATCH_SIZE; diff --git a/package.json b/package.json index 864a548b0..963f7b826 100644 --- a/package.json +++ b/package.json @@ -69,13 +69,13 @@ "eslint-config-prettier": "8.5.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "4.2.1", + "eslint-plugin-prettier": "5.0.0", "gh-pages": "5.0.0", "lerna": "7.1.4", "@lerna/legacy-package-management": "7.1.4", "linkinator": "5.0.1", "markdownlint-cli": "0.35.0", - "prettier": "2.8.8", + "prettier": "3.0.2", "semver": "7.5.4", "typedoc": "0.22.18", "typedoc-plugin-missing-exports": "1.0.0", diff --git a/packages/opentelemetry-core/src/utils/callback.ts b/packages/opentelemetry-core/src/utils/callback.ts index ebbad5f96..56c900c2a 100644 --- a/packages/opentelemetry-core/src/utils/callback.ts +++ b/packages/opentelemetry-core/src/utils/callback.ts @@ -22,11 +22,14 @@ import { Deferred } from './promise'; export class BindOnceFuture< R, This = unknown, - T extends (this: This, ...args: unknown[]) => R = () => R + T extends (this: This, ...args: unknown[]) => R = () => R, > { private _isCalled = false; private _deferred = new Deferred(); - constructor(private _callback: T, private _that: This) {} + constructor( + private _callback: T, + private _that: This + ) {} get isCalled() { return this._isCalled; diff --git a/packages/opentelemetry-core/test/utils/merge.test.ts b/packages/opentelemetry-core/test/utils/merge.test.ts index 76e9ab2fe..56c08c832 100644 --- a/packages/opentelemetry-core/test/utils/merge.test.ts +++ b/packages/opentelemetry-core/test/utils/merge.test.ts @@ -272,7 +272,10 @@ class A { } class B extends A { - constructor(name = 'foo', private _ver = 1) { + constructor( + name = 'foo', + private _ver = 1 + ) { super(name); } getVer() { diff --git a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts index d760ff580..7d84e0c73 100644 --- a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts +++ b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts @@ -46,7 +46,10 @@ export abstract class BatchSpanProcessorBase private _shutdownOnce: BindOnceFuture; private _droppedSpansCount: number = 0; - constructor(private readonly _exporter: SpanExporter, config?: T) { + constructor( + private readonly _exporter: SpanExporter, + config?: T + ) { const env = getEnv(); this._maxExportBatchSize = typeof config?.maxExportBatchSize === 'number' @@ -200,8 +203,8 @@ export abstract class BatchSpanProcessorBase doExport(); } else { Promise.all( - pendingResources.map(resource => - resource.waitForAsyncAttributes?.() + pendingResources.map( + resource => resource.waitForAsyncAttributes?.() ) ).then(doExport, err => { globalErrorHandler(err); diff --git a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts index 51c71ee21..bceb86b8e 100644 --- a/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts +++ b/packages/sdk-metrics/src/aggregator/ExponentialHistogram.ts @@ -52,7 +52,10 @@ class HighLow { static combine(h1: HighLow, h2: HighLow): HighLow { return new HighLow(Math.min(h1.low, h2.low), Math.max(h1.high, h2.high)); } - constructor(public low: number, public high: number) {} + constructor( + public low: number, + public high: number + ) {} } const MAX_SCALE = 20; diff --git a/packages/sdk-metrics/src/state/MeterSharedState.ts b/packages/sdk-metrics/src/state/MeterSharedState.ts index 330d293ee..099a21c0d 100644 --- a/packages/sdk-metrics/src/state/MeterSharedState.ts +++ b/packages/sdk-metrics/src/state/MeterSharedState.ts @@ -110,7 +110,7 @@ export class MeterSharedState { private _registerMetricStorage< MetricStorageType extends MetricStorageConstructor, - R extends InstanceType + R extends InstanceType, >( descriptor: InstrumentDescriptor, MetricStorageType: MetricStorageType diff --git a/packages/sdk-metrics/src/view/Aggregation.ts b/packages/sdk-metrics/src/view/Aggregation.ts index f36394c5b..821b55ec2 100644 --- a/packages/sdk-metrics/src/view/Aggregation.ts +++ b/packages/sdk-metrics/src/view/Aggregation.ts @@ -125,7 +125,10 @@ export class ExplicitBucketHistogramAggregation extends Aggregation { * @param boundaries the bucket boundaries of the histogram aggregation * @param _recordMinMax If set to true, min and max will be recorded. Otherwise, min and max will not be recorded. */ - constructor(boundaries: number[], private readonly _recordMinMax = true) { + constructor( + boundaries: number[], + private readonly _recordMinMax = true + ) { super(); if (boundaries === undefined || boundaries.length === 0) { throw new Error('HistogramAggregator should be created with boundaries.'); From c230076c690baefb9de78da821a109699bb5bb72 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 23 Aug 2023 20:42:58 +0200 Subject: [PATCH 03/24] chore(deps): update dependency gh-pages to v6 (#4058) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 963f7b826..1bc2622a4 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "eslint-plugin-header": "3.1.1", "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "5.0.0", - "gh-pages": "5.0.0", + "gh-pages": "6.0.0", "lerna": "7.1.4", "@lerna/legacy-package-management": "7.1.4", "linkinator": "5.0.1", From 8ac369f87e792702045f9847c7ab4ac72aa48ce2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 24 Aug 2023 14:48:43 +0200 Subject: [PATCH 04/24] chore(deps): update all patch versions (#4050) --- 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 +- .../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 +- .../opentelemetry-instrumentation-fetch/package.json | 2 +- .../opentelemetry-instrumentation-grpc/package.json | 2 +- .../opentelemetry-instrumentation-http/package.json | 4 ++-- .../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 | 4 ++-- experimental/packages/otlp-proto-exporter-base/package.json | 4 ++-- experimental/packages/otlp-transformer/package.json | 2 +- experimental/packages/sdk-logs/package.json | 2 +- experimental/packages/shim-opencensus/package.json | 2 +- package.json | 6 +++--- 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 | 4 ++-- 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 | 4 ++-- 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 | 4 ++-- packages/opentelemetry-shim-opentracing/package.json | 2 +- packages/sdk-metrics/package.json | 2 +- packages/template/package.json | 2 +- 43 files changed, 53 insertions(+), 53 deletions(-) diff --git a/api/package.json b/api/package.json index d2e4572f5..7369e951c 100644 --- a/api/package.json +++ b/api/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.1.4", + "lerna": "7.1.5", "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 23d69298f..eb7081e51 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.4", + "lerna": "7.1.5", "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 06d473b6b..617a8acfc 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.4", + "lerna": "7.1.5", "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 d3c2fb9b1..1a9becddc 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.1.4", + "lerna": "7.1.5", "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 5abf5d1b6..487d2bf3e 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -90,7 +90,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 4a210f122..b1163fa6d 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/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.4", + "lerna": "7.1.5", "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 7d310c875..c9568d703 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.1.4", + "lerna": "7.1.5", "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 8bed923c8..ac7287672 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.1.4", + "lerna": "7.1.5", "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 1b143605c..6bc5f4c77 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/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.4", + "lerna": "7.1.5", "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 c5c56290b..266089024 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -67,7 +67,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 b1156ba3f..bb20957c8 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.1.4", + "lerna": "7.1.5", "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 6cfc836a0..1bfc020b2 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.1.4", + "lerna": "7.1.5", "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 e27d1c89f..d42edbd99 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.1.4", + "lerna": "7.1.5", "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 327e452c9..b81d783d0 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.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 2b219797d..8b4f2ff8b 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.1.4", + "lerna": "7.1.5", "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 4e3b39bce..ebed7aa92 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -63,7 +63,7 @@ "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 ed70652df..b61e290b4 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -59,9 +59,9 @@ "axios": "1.4.0", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "request": "2.88.2", "request-promise-native": "1.0.9", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 2b12f444d..feab1cc9f 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.1.4", + "lerna": "7.1.5", "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 497ddb1b2..90ccb5055 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -100,7 +100,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 857c8c79d..e13f7a31e 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -71,7 +71,7 @@ "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 9896eaaf8..9853508ca 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/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.4", + "lerna": "7.1.5", "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 66bf284d2..f9fbf252f 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -59,10 +59,10 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", "nyc": "15.1.0", - "protobufjs-cli": "1.1.1", + "protobufjs-cli": "1.1.2", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 6426bf9eb..ff177d8eb 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -66,10 +66,10 @@ "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", "nyc": "15.1.0", - "protobufjs-cli": "1.1.1", + "protobufjs-cli": "1.1.2", "sinon": "15.1.2", "ts-loader": "8.4.0", "ts-mocha": "10.0.0", diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 6b48eacda..f5b1a5946 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.4", + "lerna": "7.1.5", "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 5c53b8417..59b3a0497 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -87,7 +87,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 75651fc75..77693eb53 100644 --- a/experimental/packages/shim-opencensus/package.json +++ b/experimental/packages/shim-opencensus/package.json @@ -57,7 +57,7 @@ "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", "nyc": "15.1.0", "sinon": "15.1.2", diff --git a/package.json b/package.json index 1bc2622a4..21e1a41ef 100644 --- a/package.json +++ b/package.json @@ -71,9 +71,9 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "5.0.0", "gh-pages": "6.0.0", - "lerna": "7.1.4", - "@lerna/legacy-package-management": "7.1.4", - "linkinator": "5.0.1", + "lerna": "7.1.5", + "@lerna/legacy-package-management": "7.1.5", + "linkinator": "5.0.2", "markdownlint-cli": "0.35.0", "prettier": "3.0.2", "semver": "7.5.4", diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 362127101..866b103a4 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.4", + "lerna": "7.1.5", "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 ba41bbe51..d945bddb7 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.1.4", + "lerna": "7.1.5", "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 5b9581933..0c0efd45b 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.1.4", + "lerna": "7.1.5", "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 061821f18..e2b3e90b6 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.4", + "lerna": "7.1.5", "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 162997425..2da2d8971 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -51,9 +51,9 @@ "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "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 c68c7eb44..e42729700 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -76,9 +76,9 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "sinon": "15.1.2", "ts-loader": "8.4.0", diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 2a50fd93e..9a9674b97 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.4", + "lerna": "7.1.5", "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 868cb0c2a..6a6b3a703 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.4", + "lerna": "7.1.5", "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 bed20a954..7615592d7 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -76,9 +76,9 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "sinon": "15.1.2", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 2e741d532..b4bc4e41c 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.4", + "lerna": "7.1.5", "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 f4d44f0f9..22641f7ed 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.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 1d31e720e..4c6ee6e89 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -60,7 +60,7 @@ "@opentelemetry/context-zone": "1.15.2", "@opentelemetry/propagator-b3": "1.15.2", "@opentelemetry/resources": "1.15.2", - "@types/jquery": "3.5.16", + "@types/jquery": "3.5.17", "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/sinon": "10.0.16", @@ -77,7 +77,7 @@ "karma-mocha-webworker": "1.3.0", "karma-spec-reporter": "0.0.36", "karma-webpack": "4.0.2", - "lerna": "7.1.4", + "lerna": "7.1.5", "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 bca2bd960..9e17927e3 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -54,9 +54,9 @@ "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", - "lerna": "7.1.4", + "lerna": "7.1.5", "mocha": "10.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "sinon": "15.1.2", "ts-mocha": "10.0.0", diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 123ed49b8..a15916cea 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.4", + "lerna": "7.1.5", "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 7de85fe7e..af3b5952e 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/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.4", + "lerna": "7.1.5", "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 cb538a503..09b643b65 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.4", + "lerna": "7.1.5", "typescript": "4.4.4" }, "Add these to devDependencies for testing": { From ff29576ce9eaeed3681a9bcbd2f84668c396e5fd Mon Sep 17 00:00:00 2001 From: Simon Berz Date: Sat, 26 Aug 2023 20:34:27 +0200 Subject: [PATCH 05/24] fix(mongodb): remove broken type export `V4Connection` (#1644) The type `V4Connection` re-introduced in #1170 is missing any type definitions or imports for `Document`, breaking the build with Typescript strict mode. `V4Connection` in `types.ts` is not referenced anywhere (the type definition in `internal-types.ts` is used. So lets just drop this type definition. BREAKING CHANGE: removes the broken exported type `V4Connection`. Fixes #1639 Signed-off-by: Simon Berz --- .../src/types.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/types.ts b/plugins/node/opentelemetry-instrumentation-mongodb/src/types.ts index e0389de00..e2da03421 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/src/types.ts +++ b/plugins/node/opentelemetry-instrumentation-mongodb/src/types.ts @@ -69,14 +69,3 @@ export enum MongodbCommandType { COUNT = 'count', UNKNOWN = 'unknown', } - -// https://github.com/mongodb/node-mongodb-native/blob/v4.2.2/src/cmap/connection.ts -export type V4Connection = { - id: number | ''; - command( - ns: any, - cmd: Document, - options: undefined | unknown, - callback: any - ): void; -}; From 3308a54588cd0ce5874c37b4d6f7afe1127810c2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 27 Aug 2023 00:23:23 +0200 Subject: [PATCH 06/24] chore(deps): update dependency sinon to v15.2.0 (#1650) Co-authored-by: Amir Blum --- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 2 +- detectors/node/opentelemetry-resource-detector-aws/package.json | 2 +- .../node/opentelemetry-resource-detector-container/package.json | 2 +- .../node/opentelemetry-resource-detector-github/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-sampler-aws-xray/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/instrumentation-fs/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-dns/package.json | 2 +- plugins/node/opentelemetry-instrumentation-express/package.json | 2 +- plugins/node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-koa/package.json | 2 +- plugins/node/opentelemetry-instrumentation-mysql/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-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 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 5b4876246..92a000605 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -51,7 +51,7 @@ "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 5fd6ac7a1..8842a1c1b 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -50,7 +50,7 @@ "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 3db5c093b..969455e74 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -45,7 +45,7 @@ "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 bc2781ea2..d415202c8 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -52,7 +52,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 b5ec7ff08..3d377823c 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -44,7 +44,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 296e25eca..59d87def3 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -50,7 +50,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 5e12fae80..124a41405 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -53,7 +53,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 e85006398..9ba06be68 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -69,7 +69,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 43cef7bf6..d8febb497 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -52,7 +52,7 @@ "expect": "29.2.0", "mocha": "7.2.0", "nyc": "15.1.0", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" } diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index afb90e170..d4696142e 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -59,7 +59,7 @@ "expect": "29.2.0", "mocha": "7.2.0", "nock": "13.3.2", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-mocha": "10.0.0", "nyc": "15.1.0", "typescript": "4.4.4", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index cd1947970..25b95d351 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -64,7 +64,7 @@ "mocha": "7.2.0", "ts-mocha": "10.0.0", "nyc": "15.1.0", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "typescript": "4.4.4" }, diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index b47bcee23..2c3ecae7e 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -60,7 +60,7 @@ "nyc": "15.1.0", "rimraf": "5.0.1", "semver": "^7.3.2", - "sinon": "14.0.2", + "sinon": "15.2.0", "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 9440c9beb..bb7ef17b5 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -53,7 +53,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 27b3906fb..5fcac2735 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -71,7 +71,7 @@ "nock": "13.3.2", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index f8dc6a44e..ac10d6c20 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -58,7 +58,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 8013cfb2f..74b4ad073 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -59,7 +59,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 99cafb888..7fff2c28f 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -57,7 +57,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 063d9b29a..83b816890 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -59,7 +59,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index c5913ef87..ccf97d824 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -63,7 +63,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "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 26a0a4765..e93bd6302 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -61,7 +61,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 145e9c932..e89f44bcb 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -58,7 +58,7 @@ "mysql": "2.18.1", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-mocha": "10.0.0", "typescript": "4.4.4" }, diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index c03678824..834e75457 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -56,7 +56,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 ac2b6725a..832cd7cd4 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -68,7 +68,7 @@ "pg-pool": "3.4.1", "rimraf": "5.0.1", "safe-stable-stringify": "^2.4.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "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 32462b023..43090c478 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -60,7 +60,7 @@ "pino": "8.3.1", "rimraf": "5.0.1", "semver": "7.5.4", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "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 09e7efc5e..ed6d74e6d 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -58,7 +58,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index e5b9a955f..97e8b04e1 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -67,7 +67,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 9252e36f3..f13efc04e 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -67,7 +67,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 48a9124e4..825cdf578 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -69,7 +69,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index a2d0d47a2..10c1cff8e 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -71,7 +71,7 @@ "react": "17.0.2", "react-dom": "17.0.2", "rimraf": "5.0.1", - "sinon": "15.0.1", + "sinon": "15.2.0", "ts-loader": "8.3.0", "ts-mocha": "10.0.0", "typescript": "4.4.4", From 808e614d14439f60fe0ded288d4eb9d39d3a9395 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 27 Aug 2023 07:00:23 +0200 Subject: [PATCH 07/24] chore(deps): update all patch versions (#1645) --- .../package.json | 2 +- .../node/opentelemetry-resource-detector-aws/package.json | 2 +- .../opentelemetry-resource-detector-container/package.json | 2 +- .../node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../node/opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 2 +- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../opentelemetry-instrumentation-document-load/package.json | 2 +- .../web/opentelemetry-instrumentation-long-task/package.json | 4 ++-- .../package.json | 4 ++-- plugins/web/opentelemetry-plugin-react-load/package.json | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 92a000605..90632061c 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.16.19", "@types/sinon": "10.0.16", "mocha": "7.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "rimraf": "5.0.1", "sinon": "15.2.0", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 8842a1c1b..54c17d369 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.16", "mocha": "7.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "rimraf": "5.0.1", "sinon": "15.2.0", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 969455e74..3673462a2 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.16", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "rimraf": "5.0.1", "sinon": "15.2.0", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index df555c017..562e8cd09 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": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "rimraf": "5.0.1", "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 451da8a95..feeff8a99 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": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "rimraf": "5.0.1", "ts-mocha": "10.0.0", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 59d87def3..8c52b19f5 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.22.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index d4696142e..e1a0d3267 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -58,7 +58,7 @@ "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "sinon": "15.2.0", "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 5fcac2735..867b575ee 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -68,7 +68,7 @@ "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", - "nock": "13.3.2", + "nock": "13.3.3", "nyc": "15.1.0", "rimraf": "5.0.1", "sinon": "15.2.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 97e8b04e1..0a15925c5 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.22.10", + "@babel/core": "7.22.11", "@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 f13efc04e..e63c510e2 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -47,10 +47,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.16", + "@types/jquery": "3.5.17", "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/sinon": "10.0.16", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 825cdf578..44cdc3138 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -47,12 +47,12 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@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/jquery": "3.5.17", "@types/mocha": "7.0.2", "@types/node": "18.16.19", "@types/sinon": "10.0.16", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 10c1cff8e..aa015af21 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -47,12 +47,12 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@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.64", + "@types/react": "17.0.65", "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", "@types/shimmer": "1.0.2", From 0fbacbae42bb84aa78d5a7e17607dd996626f517 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Sun, 27 Aug 2023 19:25:55 +0300 Subject: [PATCH 08/24] chore: remove gts from packages (#1643) --- packages/opentelemetry-sampler-aws-xray/package.json | 1 - plugins/node/instrumentation-cucumber/package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index e1a0d3267..13c728f05 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -63,7 +63,6 @@ "ts-mocha": "10.0.0", "nyc": "15.1.0", "typescript": "4.4.4", - "gts": "3.1.1", "@typescript-eslint/eslint-plugin": "5.8.1", "@typescript-eslint/parser": "5.8.1" }, diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 2c3ecae7e..a2dcea8eb 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -55,7 +55,6 @@ "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", "@types/sinon": "10.0.16", - "gts": "3.1.1", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", From a556179cc6e6066af85666d3921606e9b4a75511 Mon Sep 17 00:00:00 2001 From: AasthaTechO Date: Tue, 29 Aug 2023 10:48:46 +0530 Subject: [PATCH 09/24] chore(deps): update dependency semver to v7.5.4 (#1646) * chore(deps): update dependency semver to v7.5.4 * chore(deps): align semver versions across repo * chore(deps): pin semver version v7.5.4 --- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- plugins/node/opentelemetry-instrumentation-restify/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index a2dcea8eb..f0e61d0e9 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -58,7 +58,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "semver": "^7.3.2", + "semver": "7.5.4", "sinon": "15.2.0", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 7fff2c28f..1e048fe17 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -64,7 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "semver": "^7.3.2" + "semver": "7.5.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index a53ab9ced..370e121bc 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -58,7 +58,7 @@ "nyc": "15.1.0", "restify": "11.1.0", "rimraf": "5.0.1", - "semver": "^7.3.7", + "semver": "7.5.4", "test-all-versions": "^5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" From d9cd8d7efcea66e70dab3de8f847f05a7fc9943f Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Tue, 29 Aug 2023 10:12:32 +0300 Subject: [PATCH 10/24] fix(instrumentation-dns): use caret range for semver regular dependency (#1654) --- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 1e048fe17..d1143fb92 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -64,7 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "semver": "7.5.4" + "semver": "^7.5.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme" } From 0cc9a0b10bd96b73e2881ee60be6df3c9d49d70b Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 29 Aug 2023 10:36:23 +0200 Subject: [PATCH 11/24] fix(renovate): remove faulty '@types/node' rule and explicitly apply it to the whole repo (#4091) --- renovate.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/renovate.json b/renovate.json index 5a106908e..c7d143d79 100644 --- a/renovate.json +++ b/renovate.json @@ -19,14 +19,9 @@ { "matchPackageNames": ["typescript", "webpack", "webpack-cli"], "dependencyDashboardApproval": true - }, - { - "matchPaths": ["experimental/backwards-compatibility/**"], - "matchPackageNames": ["@types/node"], - "enabled": false } ], - "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0"], + "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0", "@types/node"], "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc"], "labels": ["dependencies"] } From a793321c623a79b89caacb720f3cdaa64addc095 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Tue, 29 Aug 2023 08:37:14 -0400 Subject: [PATCH 12/24] feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers (#4077) Co-authored-by: Daniel Dyla Co-authored-by: Marc Pichler --- CHANGELOG.md | 1 + experimental/CHANGELOG.md | 2 ++ .../src/PrometheusExporter.ts | 1 + .../src/export/types.ts | 10 ++++++++++ .../src/export/PeriodicExportingMetricReader.ts | 9 +++++++++ 5 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e750882..ec685bdbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ 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) +* feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#4077](https://github.com/open-telemetry/opentelemetry-js/pull/4077) @aabmass ### :bug: (Bug Fix) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 0c4f724d8..3972a9b75 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -18,6 +18,8 @@ All notable changes to experimental packages in this project will be documented ### :rocket: (Enhancement) +* feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#4077](https://github.com/open-telemetry/opentelemetry-js/pull/4077) @aabmass + ### :bug: (Bug Fix) ### :books: (Refine Doc) diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts index 8f84c5134..42e4fc41e 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts @@ -62,6 +62,7 @@ export class PrometheusExporter extends MetricReader { aggregationSelector: _instrumentType => Aggregation.Default(), aggregationTemporalitySelector: _instrumentType => AggregationTemporality.CUMULATIVE, + metricProducers: config.metricProducers, }); this._host = config.host || diff --git a/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts index f43c45681..78721a90c 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts +++ b/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import { MetricProducer } from '@opentelemetry/sdk-metrics'; + /** * Configuration interface for prometheus exporter */ @@ -56,4 +58,12 @@ export interface ExporterConfig { * @default false */ preventServerStart?: boolean; + + /** + * **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[]; } diff --git a/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts b/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts index 2371ecb67..5ecafff68 100644 --- a/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts +++ b/packages/sdk-metrics/src/export/PeriodicExportingMetricReader.ts @@ -25,6 +25,7 @@ import { MetricReader } from './MetricReader'; import { PushMetricExporter } from './MetricExporter'; import { callWithTimeout, TimeoutError } from '../utils'; import { diag } from '@opentelemetry/api'; +import { MetricProducer } from './MetricProducer'; export type PeriodicExportingMetricReaderOptions = { /** @@ -40,6 +41,13 @@ export type PeriodicExportingMetricReaderOptions = { * Milliseconds for the async observable callback to timeout. */ exportTimeoutMillis?: number; + /** + * **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[]; }; /** @@ -59,6 +67,7 @@ export class PeriodicExportingMetricReader extends MetricReader { ), aggregationTemporalitySelector: options.exporter.selectAggregationTemporality?.bind(options.exporter), + metricProducers: options.metricProducers, }); if ( From 6e7df295bf7cb7c9cba5bf7d4a683ae6dc61408a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 29 Aug 2023 14:44:46 +0200 Subject: [PATCH 13/24] fix(deps): update dependency axios to v1.5.0 (#4089) Co-authored-by: Marc Pichler --- .../packages/opentelemetry-instrumentation-http/package.json | 2 +- integration-tests/propagation-validation-server/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index b61e290b4..9777f7a18 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -56,7 +56,7 @@ "@types/semver": "7.5.0", "@types/sinon": "10.0.16", "@types/superagent": "4.1.18", - "axios": "1.4.0", + "axios": "1.5.0", "codecov": "3.8.3", "cross-var": "1.1.0", "lerna": "7.1.5", diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 505797007..2e52beae0 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -15,7 +15,7 @@ "@opentelemetry/context-async-hooks": "1.15.2", "@opentelemetry/core": "1.15.2", "@opentelemetry/sdk-trace-base": "1.15.2", - "axios": "1.4.0", + "axios": "1.5.0", "body-parser": "1.19.0", "express": "4.17.3" }, From d8a14ea5b2a5d66e27f4705c5e51f788a024897c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 29 Aug 2023 14:45:34 +0200 Subject: [PATCH 14/24] chore(deps): update all patch versions (#4087) Co-authored-by: Marc Pichler --- 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-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 | 4 ++-- 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/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-node/package.json | 2 +- packages/opentelemetry-sdk-trace-web/package.json | 2 +- packages/sdk-metrics/package.json | 2 +- selenium-tests/package.json | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 1a9becddc..d77260bb8 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.10", + "@babel/core": "7.22.11", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.2", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 487d2bf3e..b5b1f8f1c 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "1.4.1", "@opentelemetry/api-logs": "0.41.2", "@opentelemetry/resources": "1.15.2", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index b1163fa6d..70177cc4f 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.10", + "@babel/core": "7.22.11", "@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 c9568d703..46473c9ab 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.10", + "@babel/core": "7.22.11", "@grpc/proto-loader": "^0.7.3", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-exporter-base": "0.41.2", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index ac7287672..fc03b1965 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.10", + "@babel/core": "7.22.11", "@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 6bc5f4c77..c187fb9cd 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.10", + "@babel/core": "7.22.11", "@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 266089024..6874a8d98 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.10", + "@babel/core": "7.22.11", "@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 bb20957c8..4b3c0332a 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.10", + "@babel/core": "7.22.11", "@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 1bfc020b2..7fe60c0dd 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.10", + "@babel/core": "7.22.11", "@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 d42edbd99..7582bbe51 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.10", + "@babel/core": "7.22.11", "@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 8b4f2ff8b..920d0a91b 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.2", "@opentelemetry/propagator-b3": "1.15.2", diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index ebed7aa92..b85656844 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -59,7 +59,7 @@ "@protobuf-ts/runtime-rpc": "2.9.1", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/semver": "7.5.0", + "@types/semver": "7.5.1", "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 9777f7a18..6036fa0c1 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -53,7 +53,7 @@ "@types/mocha": "10.0.1", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.18", - "@types/semver": "7.5.0", + "@types/semver": "7.5.1", "@types/sinon": "10.0.16", "@types/superagent": "4.1.18", "axios": "1.5.0", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index feab1cc9f..5e81576c2 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "1.4.1", "@opentelemetry/context-zone": "1.15.2", "@opentelemetry/propagator-b3": "1.15.2", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 90ccb5055..37f839ea5 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -81,12 +81,12 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "1.4.1", "@opentelemetry/sdk-metrics": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/semver": "7.5.0", + "@types/semver": "7.5.1", "@types/sinon": "10.0.16", "@types/webpack-env": "1.16.3", "babel-loader": "8.3.0", diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index e13f7a31e..887032269 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -67,7 +67,7 @@ "@opentelemetry/context-async-hooks": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/semver": "7.5.0", + "@types/semver": "7.5.1", "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 9853508ca..623a68698 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.2" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@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 f9fbf252f..f91d29e13 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "1.4.1", "@opentelemetry/otlp-transformer": "0.41.2", "@opentelemetry/resources": "1.15.2", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index ff177d8eb..b8b6f6ae1 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.10", + "@babel/core": "7.22.11", "@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 59b3a0497..1689f7ccb 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": ">=1.4.0 <1.5.0", "@opentelemetry/api-logs": "0.41.2", "@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 d945bddb7..2df641b92 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.10", + "@babel/core": "7.22.11", "@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 0c0efd45b..aecb55eb0 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.10", + "@babel/core": "7.22.11", "@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 e42729700..3dedccc8d 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.1", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 22641f7ed..dd0ad05ca 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -50,7 +50,7 @@ "@opentelemetry/semantic-conventions": "1.15.2", "@types/mocha": "10.0.1", "@types/node": "18.6.5", - "@types/semver": "7.5.0", + "@types/semver": "7.5.1", "@types/sinon": "10.0.16", "codecov": "3.8.3", "cross-var": "1.1.0", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 4c6ee6e89..3e1997cfd 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.10", + "@babel/core": "7.22.11", "@opentelemetry/api": ">=1.0.0 <1.5.0", "@opentelemetry/context-zone": "1.15.2", "@opentelemetry/propagator-b3": "1.15.2", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index af3b5952e..d3f069054 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -54,7 +54,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@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 ef1173873..3a3483e57 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -31,7 +31,7 @@ "access": "restricted" }, "devDependencies": { - "@babel/core": "7.22.10", + "@babel/core": "7.22.11", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.22.10", "@babel/plugin-transform-runtime": "7.22.10", From 432d43942e4114f198465f1c9073d850a7663d4d Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 29 Aug 2023 14:51:46 +0200 Subject: [PATCH 15/24] chore(sdk-node): add notice to manually install '@opentelemetry/exporter-jaeger' (#4068) Co-authored-by: Daniel Dyla --- experimental/CHANGELOG.md | 3 +++ experimental/packages/opentelemetry-sdk-node/package.json | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 3972a9b75..76d136bd8 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -15,6 +15,9 @@ All notable changes to experimental packages in this project will be documented * `NodeSDK.configureLoggerProvider()`, please use constructor options instead * `NodeSDK.addResource()`, please use constructor options instead * `NodeSDK.detectResources()`, this is not necessary anymore, resources are now auto-detected on startup. +* chore(sdk-node): add notice that '@opentelemetry/exporter-jaeger' has to be installed manually in the next version [#4068](https://github.com/open-telemetry/opentelemetry-js/pull/4068) @pichlermarc + * Starting with 0.43.0 '@opentelemetry/exporter-jaeger' will no longer be a dependency of this package. To continue using '@opentelemetry/exporter-jaeger', please install it manually. + * NOTE: `@opentelemetry/exporter-jaeger` is deprecated, consider switching to one of the alternatives described [here](https://www.npmjs.com/package/@opentelemetry/exporter-jaeger) ### :rocket: (Enhancement) diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 887032269..1b7057807 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -17,7 +17,8 @@ "watch": "tsc --build --watch", "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" + "peer-api-check": "node ../../../scripts/peer-api-check.js", + "postinstall": "node -e \"console.log(\\\"\\x1b[95m%s\\x1b[0m\\\", \\\"@opentelemetry/sdk-node - warning: Starting with 0.43.0 '@opentelemetry/exporter-jaeger' will no longer be automatically installed by this package. To continue using '@opentelemetry/exporter-jaeger', please install it manually.\\n(NOTE: '@opentelemetry/exporter-jaeger' is deprecated, consider switching to one of the alternatives described in https://www.npmjs.com/package/@opentelemetry/exporter-jaeger)\\\");\"" }, "keywords": [ "opentelemetry", From c84637f2640aae39c45ec9a9d07a96c21059a70a Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 29 Aug 2023 15:29:16 +0200 Subject: [PATCH 16/24] fix(exporter-logs-otlp-http): add @opentelemetry/api-logs as dependency (#3968) Co-authored-by: Daniel Dyla --- experimental/CHANGELOG.md | 2 ++ experimental/packages/exporter-logs-otlp-http/package.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 76d136bd8..b796a557b 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -25,6 +25,8 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) +* fix(exporter-logs-otlp-http): add @opentelemetry/api-logs as dependency + ### :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 b5b1f8f1c..3f0c192b0 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -73,7 +73,6 @@ "devDependencies": { "@babel/core": "7.22.11", "@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", @@ -102,12 +101,13 @@ "webpack-merge": "5.9.0" }, "peerDependencies": { - "@opentelemetry/api-logs": ">=0.38.0" + "@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/api-logs": "0.41.2", "@opentelemetry/sdk-logs": "0.41.2" } } From 67f66d2e0e8ea9f5d9b46819d4f736fa1e0666b6 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 29 Aug 2023 16:38:36 +0200 Subject: [PATCH 17/24] fix(fastify): Make sure consturctor patching works with esm (#1624) * fix(fastify): Make sure consturctor patching works with esm * ref: Streamline fastify wrapping Align this with how other instrumentations wrap. * Revert "ref: Streamline fastify wrapping" This reverts commit cbffbc731fe81a559d355d3e6b2e726b8a3509ec. * fix linting --------- Co-authored-by: Marc Pichler Co-authored-by: Amir Blum --- .../src/instrumentation.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts index fcaf3114e..fd6aaa89c 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts @@ -197,14 +197,14 @@ export class FastifyInstrumentation extends InstrumentationBase { }; } - private _patchConstructor( - original: () => FastifyInstance - ): () => FastifyInstance { + private _patchConstructor(moduleExports: { + fastify: () => FastifyInstance; + }): () => FastifyInstance { const instrumentation = this; this._diag.debug('Patching fastify constructor function'); function fastify(this: FastifyInstance, ...args: any) { - const app: FastifyInstance = original.apply(this, args); + const app: FastifyInstance = moduleExports.fastify.apply(this, args); app.addHook('onRequest', instrumentation._hookOnRequest()); app.addHook('preHandler', instrumentation._hookPreHandler()); From 0b1f5b65987fdee3fea9f79e597ab3a702ed76d9 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Wed, 30 Aug 2023 09:57:34 +0300 Subject: [PATCH 18/24] chore(tedious) align supported versions in code tests and docs (#1655) --- plugins/node/instrumentation-tedious/.tav.yml | 2 +- plugins/node/instrumentation-tedious/README.md | 2 +- plugins/node/instrumentation-tedious/package.json | 4 ++-- plugins/node/instrumentation-tedious/src/instrumentation.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/node/instrumentation-tedious/.tav.yml b/plugins/node/instrumentation-tedious/.tav.yml index 22db58919..f71ec0c6f 100644 --- a/plugins/node/instrumentation-tedious/.tav.yml +++ b/plugins/node/instrumentation-tedious/.tav.yml @@ -1,6 +1,6 @@ tedious: # 4.0.0 is broken: https://github.com/tediousjs/tedious/commit/4eceb48 - versions: "1.11.0 || 1.14.0 || 2.7.1 || 3.0.1 || 4.2.0 || ^6.7.0 || 8.3.0 || 9.2.3 || 11.0.9 || 11.2.0 || 11.4.0 || ^11.8.0 || ^12.3.0 || ^13.2.0 || ^14.0.0" + versions: "1.11.0 || 1.14.0 || 2.7.1 || 3.0.1 || 4.2.0 || ^6.7.0 || 8.3.0 || 9.2.3 || 11.0.9 || 11.2.0 || 11.4.0 || ^11.8.0 || ^12.3.0 || ^13.2.0 || ^14.0.0 || ^15.0.0" commands: npm run test # Fix missing `test-utils` package diff --git a/plugins/node/instrumentation-tedious/README.md b/plugins/node/instrumentation-tedious/README.md index 8644b8694..ee8a9ee53 100644 --- a/plugins/node/instrumentation-tedious/README.md +++ b/plugins/node/instrumentation-tedious/README.md @@ -17,7 +17,7 @@ npm install --save @opentelemetry/instrumentation-tedious ## Supported Versions -- `>=1.11.0` +- `>=1.11.0 <=15` ## Usage diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 9f749f96a..a39361656 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -56,7 +56,7 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", - "tedious": "14.1.0", + "tedious": "15.1.3", "test-all-versions": "5.0.1", "ts-mocha": "10.0.0", "typescript": "4.4.4" @@ -64,7 +64,7 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.41.2", "@opentelemetry/semantic-conventions": "^1.0.0", - "@types/tedious": "^4.0.6" + "@types/tedious": "^4.0.10" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-tedious#readme" } diff --git a/plugins/node/instrumentation-tedious/src/instrumentation.ts b/plugins/node/instrumentation-tedious/src/instrumentation.ts index b7f4a03c5..7484dd49f 100644 --- a/plugins/node/instrumentation-tedious/src/instrumentation.ts +++ b/plugins/node/instrumentation-tedious/src/instrumentation.ts @@ -74,7 +74,7 @@ export class TediousInstrumentation extends InstrumentationBase< return [ new InstrumentationNodeModuleDefinition( TediousInstrumentation.COMPONENT, - ['*'], + ['>=1.11.0 <=15'], (moduleExports: any, moduleVersion) => { this._diag.debug(`Patching tedious@${moduleVersion}`); From 78472a705cae53a952171e726d135d3c8fd83ba3 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Wed, 30 Aug 2023 11:08:00 +0300 Subject: [PATCH 19/24] chore: align @types/node to core repo and disable renovate (#1653) --- .../opentelemetry-resource-detector-alibaba-cloud/package.json | 2 +- detectors/node/opentelemetry-resource-detector-aws/package.json | 2 +- .../node/opentelemetry-resource-detector-container/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 +- renovate.json | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 90632061c..ca5f1eb10 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.1", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "mocha": "7.2.0", "nock": "13.3.3", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 54c17d369..148d24f70 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.1", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "mocha": "7.2.0", "nock": "13.3.3", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 3673462a2..418b48ca2 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -38,7 +38,7 @@ "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.34.1", "@types/mocha": "8.2.3", - "@types/node": "^18.0.0", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index 562e8cd09..d6a2bfa91 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.1", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/semver": "7.5.0", "mocha": "7.2.0", "nock": "13.3.3", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index d415202c8..7280c3c40 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 feeff8a99..539a7bf44 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.1", "@opentelemetry/sdk-node": "^0.41.2", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/semver": "7.5.0", "mocha": "7.2.0", "nock": "13.3.3", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 3d377823c..7517c0ecb 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 8c52b19f5..bfddd027b 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -36,7 +36,7 @@ "@babel/core": "7.22.11", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "@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 124a41405..778c831d5 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 9ba06be68..6a297cc8f 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "@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 d8febb497..dd918e191 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.1", "@types/mocha": "^9.1.1", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@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 c00df91c9..f9e7f9f59 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.16.19", + "@types/node": "18.6.5", "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 13c728f05..d5ccc476d 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -53,7 +53,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.34.0", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 666efaf3b..34ecf3032 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.16.19", + "@types/node": "18.6.5", "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 b4de2b434..75f96ade4 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.16.19", + "@types/node": "18.6.5", "typescript": "4.4.4" }, "dependencies": { diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 25b95d351..c019fd602 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -57,7 +57,7 @@ "@types/lodash": "4.14.197", "@types/mocha": "8.2.3", "@types/sinon": "10.0.16", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "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 a3e04058b..2b350dcc8 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.16.19", + "@types/node": "18.6.5", "dataloader": "2.2.2", "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 bb7ef17b5..260d6f684 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.16.19", + "@types/node": "18.6.5", "@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 efa60e0ca..29d48f63d 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.1", "@types/lru-cache": "7.10.9", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "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 1792f23ed..3bf7a8292 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.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "expect": "29.2.0", "mocha": "7.2.0", "mongoose": "6.11.5", diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 7f63a9d14..d0c9626d9 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.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "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 a39361656..f2be4c36f 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.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index ac6ae383c..79e48a550 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.16.19", + "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 867b575ee..11b235d81 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -62,7 +62,7 @@ "@opentelemetry/contrib-test-utils": "^0.34.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 ac10d6c20..ce9d9830d 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 74b4ad073..986bd0d96 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.16.19", + "@types/node": "18.6.5", "@types/semver": "7.5.0", "@types/sinon": "10.0.16", "cassandra-driver": "4.6.4", diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 9a0e442bf..a4642c6e6 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.16.19", + "@types/node": "18.6.5", "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 d1143fb92..f620edde5 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.16.19", + "@types/node": "18.6.5", "@types/semver": "7.5.0", "@types/shimmer": "1.0.2", "@types/sinon": "10.0.16", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 83b816890..53a363867 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 61b2dbd42..394120e6e 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.17", "@types/mocha": "7.0.2", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "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 96e9afb8a..967f4aeef 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -51,7 +51,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/generic-pool": "^3.1.9", "@types/mocha": "7.0.2", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@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 29e2f78a6..f79331cc5 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.16.19", + "@types/node": "18.6.5", "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 5eee760f2..a24f73d38 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.16.19", + "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index ccf97d824..aa673e8fd 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.16", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "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 b0033f3a9..878e3f8d9 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.16.19", + "@types/node": "18.6.5", "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 e93bd6302..ab9445e41 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 c74965293..0920edcd5 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.16.19", + "@types/node": "18.6.5", "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 bced6107b..d93d6a2e8 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.16.19", + "@types/node": "18.6.5", "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 e89f44bcb..3e85fb50d 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.1", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 56725c9ba..0cdc9eefc 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.16.19", + "@types/node": "18.6.5", "@types/semver": "7.5.0", "mocha": "7.2.0", "mysql2": "2.3.3", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 3eef3c20e..74ed64c04 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.16.19", + "@types/node": "18.6.5", "@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 834e75457..59155f64a 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 832cd7cd4..5d527b93e 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "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 43090c478..8d605692b 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.16.19", + "@types/node": "18.6.5", "@types/semver": "7.5.0", "@types/sinon": "10.0.16", "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 0da797d48..487d92dda 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.16.19", + "@types/node": "18.6.5", "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 4f2970af3..12937e07b 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.16.19", + "@types/node": "18.6.5", "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 370e121bc..9bc537f98 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.16.19", + "@types/node": "18.6.5", "@types/restify": "4.3.9", "@types/semver": "7.5.0", "mocha": "7.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 9e1dd493e..64d17d14b 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.16.19", + "@types/node": "18.6.5", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index ed6d74e6d..caf593143 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.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "@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 0a15925c5..ea22b03e3 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.22.11", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "@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 e63c510e2..753b8ad4e 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.17", "@types/mocha": "7.0.2", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "@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 44cdc3138..608a53203 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.17", "@types/mocha": "7.0.2", - "@types/node": "18.16.19", + "@types/node": "18.6.5", "@types/sinon": "10.0.16", "@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 aa015af21..40d955f78 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.16.19", + "@types/node": "18.6.5", "@types/react": "17.0.65", "@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 8584b4575..1e1e78eef 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.16.19", + "@types/node": "18.6.5", "@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 4b80ad2e7..692c128b6 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.16.19", + "@types/node": "18.6.5", "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 cd8ea5369..38afd3242 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.16.19", + "@types/node": "18.6.5", "@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 d9b82d2db..67b203761 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.16.19", + "@types/node": "18.6.5", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", diff --git a/renovate.json b/renovate.json index 8d4c9f6f0..57188e226 100644 --- a/renovate.json +++ b/renovate.json @@ -33,7 +33,7 @@ "schedule": ["before 3am every weekday"] } ], - "ignoreDeps": ["lerna", "lerna-changelog"], + "ignoreDeps": ["lerna", "lerna-changelog", "@types/node"], "ignorePaths": ["archive/**", "examples/**"], "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc" ], "schedule": [ From cd4998a4b5e29d05f4a11cd93a26ecf712729e9f Mon Sep 17 00:00:00 2001 From: Dima Voytenko Date: Wed, 30 Aug 2023 07:04:34 -0700 Subject: [PATCH 20/24] feat(api): add attributes argument to recordException API (#4071) Co-authored-by: Marc Pichler --- CHANGELOG.md | 1 + api/CHANGELOG.md | 4 ++ api/src/trace/NonRecordingSpan.ts | 6 +- api/src/trace/span.ts | 13 ++++ .../opentelemetry-sdk-trace-base/src/Span.ts | 18 ++++- .../test/common/Span.test.ts | 71 +++++++++++++++++++ 6 files changed, 110 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec685bdbb..049f668cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) +* feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071) * feat(sdk-metrics): implement MetricProducer specification [#4007](https://github.com/open-telemetry/opentelemetry-js/pull/4007) * feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#4077](https://github.com/open-telemetry/opentelemetry-js/pull/4077) @aabmass diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 5b5205007..a1dcf67d4 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## Unreleased +### :rocket: (Enhancement) + +* feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071) + ## 1.4.1 ### :bug: (Bug Fix) diff --git a/api/src/trace/NonRecordingSpan.ts b/api/src/trace/NonRecordingSpan.ts index a9e5bcaf9..dc7e3de3d 100644 --- a/api/src/trace/NonRecordingSpan.ts +++ b/api/src/trace/NonRecordingSpan.ts @@ -71,5 +71,9 @@ export class NonRecordingSpan implements Span { } // By default does nothing - recordException(_exception: Exception, _time?: TimeInput): void {} + recordException( + _exception: Exception, + _attributesOrStartTime?: SpanAttributes | TimeInput, + _time?: TimeInput + ): void {} } diff --git a/api/src/trace/span.ts b/api/src/trace/span.ts index d80b8c262..59eb233a8 100644 --- a/api/src/trace/span.ts +++ b/api/src/trace/span.ts @@ -126,4 +126,17 @@ export interface Span { * use the current time. */ recordException(exception: Exception, time?: TimeInput): void; + + /** + * Sets exception as a span event + * @param exception the exception the only accepted values are string or Error + * @param [attributes] the attributes that will be added to the error event. + * @param [time] the time to set as Span's event time. If not provided, + * use the current time. + */ + recordException( + exception: Exception, + attributes?: SpanAttributes, + time?: TimeInput + ): void; } diff --git a/packages/opentelemetry-sdk-trace-base/src/Span.ts b/packages/opentelemetry-sdk-trace-base/src/Span.ts index 31fb1555a..ea3526b29 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Span.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Span.ts @@ -272,7 +272,18 @@ export class Span implements APISpan, ReadableSpan { return this._ended === false; } - recordException(exception: Exception, time?: TimeInput): void { + recordException( + exception: Exception, + attributesOrStartTime?: SpanAttributes | TimeInput, + timeStamp?: TimeInput + ): void { + if (isTimeInput(attributesOrStartTime)) { + if (!isTimeInput(timeStamp)) { + timeStamp = attributesOrStartTime; + } + attributesOrStartTime = undefined; + } + const attributes: SpanAttributes = {}; if (typeof exception === 'string') { attributes[SemanticAttributes.EXCEPTION_MESSAGE] = exception; @@ -290,13 +301,16 @@ export class Span implements APISpan, ReadableSpan { attributes[SemanticAttributes.EXCEPTION_STACKTRACE] = exception.stack; } } + if (attributesOrStartTime) { + Object.assign(attributes, sanitizeAttributes(attributesOrStartTime)); + } // these are minimum requirements from spec if ( attributes[SemanticAttributes.EXCEPTION_TYPE] || attributes[SemanticAttributes.EXCEPTION_MESSAGE] ) { - this.addEvent(ExceptionEventName, attributes, time); + this.addEvent(ExceptionEventName, attributes, timeStamp); } else { diag.warn(`Failed to record an exception ${exception}`); } diff --git a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts index 11a94ffc7..873865a0d 100644 --- a/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts +++ b/packages/opentelemetry-sdk-trace-base/test/common/Span.test.ts @@ -1203,6 +1203,77 @@ describe('Span', () => { const event = span.events[0]; assert.deepStrictEqual(event.time, [0, 123]); }); + + it('should record an exception with provided time as a 3rd arg', () => { + const span = new Span( + tracer, + ROOT_CONTEXT, + name, + spanContext, + SpanKind.CLIENT + ); + // @ts-expect-error writing readonly property. performance time origin is mocked to return ms value of [1,1] + span['_performanceOffset'] = 0; + assert.strictEqual(span.events.length, 0); + span.recordException('boom', undefined, [0, 123]); + const event = span.events[0]; + assert.deepStrictEqual(event.time, [0, 123]); + }); + }); + + describe('when attributes are provided', () => { + it('should sanitized and merge attributes when provided', () => { + const span = new Span( + tracer, + ROOT_CONTEXT, + name, + spanContext, + SpanKind.CLIENT + ); + // @ts-expect-error writing readonly property. performance time origin is mocked to return ms value of [1,1] + span['_performanceOffset'] = 0; + assert.strictEqual(span.events.length, 0); + const exception = { code: 'Error', message: 'boom', stack: 'bar' }; + span.recordException(exception, { + ...validAttributes, + ...invalidAttributes, + } as unknown as SpanAttributes); + const event = span.events[0]; + assert.deepStrictEqual(event.attributes, { + [SemanticAttributes.EXCEPTION_TYPE]: 'Error', + [SemanticAttributes.EXCEPTION_MESSAGE]: 'boom', + [SemanticAttributes.EXCEPTION_STACKTRACE]: 'bar', + ...validAttributes, + }); + }); + + it('should prioritize the provided attributes over generated', () => { + const span = new Span( + tracer, + ROOT_CONTEXT, + name, + spanContext, + SpanKind.CLIENT + ); + // @ts-expect-error writing readonly property. performance time origin is mocked to return ms value of [1,1] + span['_performanceOffset'] = 0; + assert.strictEqual(span.events.length, 0); + const exception = { code: 'Error', message: 'boom', stack: 'bar' }; + span.recordException(exception, { + [SemanticAttributes.EXCEPTION_TYPE]: 'OverrideError', + [SemanticAttributes.EXCEPTION_MESSAGE]: 'override-boom', + [SemanticAttributes.EXCEPTION_STACKTRACE]: 'override-bar', + ...validAttributes, + ...invalidAttributes, + } as unknown as SpanAttributes); + const event = span.events[0]; + assert.deepStrictEqual(event.attributes, { + ...validAttributes, + [SemanticAttributes.EXCEPTION_TYPE]: 'OverrideError', + [SemanticAttributes.EXCEPTION_MESSAGE]: 'override-boom', + [SemanticAttributes.EXCEPTION_STACKTRACE]: 'override-bar', + }); + }); }); describe('when exception code is numeric', () => { From 1da2b1bb1149228dac158b5631cbefd3992fb372 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 30 Aug 2023 16:05:51 +0200 Subject: [PATCH 21/24] chore(deps): update dependency prettier to v3.0.3 (#4092) Co-authored-by: Marc Pichler --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 21e1a41ef..8dd00b632 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@lerna/legacy-package-management": "7.1.5", "linkinator": "5.0.2", "markdownlint-cli": "0.35.0", - "prettier": "3.0.2", + "prettier": "3.0.3", "semver": "7.5.4", "typedoc": "0.22.18", "typedoc-plugin-missing-exports": "1.0.0", From d1436eb7e4543d92e23cb1ceff15bf5cf6c3c65c Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 31 Aug 2023 02:35:52 -0400 Subject: [PATCH 22/24] chore: release main (#1651) --- .release-please-manifest.json | 2 +- metapackages/auto-instrumentations-node/CHANGELOG.md | 8 ++++++++ metapackages/auto-instrumentations-node/package.json | 8 ++++---- .../opentelemetry-instrumentation-dns/CHANGELOG.md | 7 +++++++ .../opentelemetry-instrumentation-dns/package.json | 2 +- .../CHANGELOG.md | 7 +++++++ .../package.json | 2 +- .../CHANGELOG.md | 11 +++++++++++ .../package.json | 2 +- 9 files changed, 41 insertions(+), 8 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 5fc0b0ae6..b29210643 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.1","detectors/node/opentelemetry-resource-detector-aws":"1.3.1","detectors/node/opentelemetry-resource-detector-container":"0.3.1","detectors/node/opentelemetry-resource-detector-gcp":"0.29.1","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.1","metapackages/auto-instrumentations-node":"0.39.1","metapackages/auto-instrumentations-web":"0.33.1","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.1","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.1","plugins/node/instrumentation-amqplib":"0.33.1","plugins/node/instrumentation-cucumber":"0.1.0","plugins/node/instrumentation-dataloader":"0.5.1","plugins/node/instrumentation-fs":"0.8.1","plugins/node/instrumentation-lru-memoizer":"0.33.1","plugins/node/instrumentation-mongoose":"0.33.1","plugins/node/instrumentation-socket.io":"0.34.1","plugins/node/instrumentation-tedious":"0.6.1","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.1","plugins/node/opentelemetry-instrumentation-dns":"0.32.1","plugins/node/opentelemetry-instrumentation-express":"0.33.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.2","plugins/node/opentelemetry-instrumentation-graphql":"0.35.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.1","plugins/node/opentelemetry-instrumentation-koa":"0.36.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.1","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.1","plugins/node/opentelemetry-instrumentation-net":"0.32.1","plugins/node/opentelemetry-instrumentation-pg":"0.36.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.1","plugins/node/opentelemetry-instrumentation-redis":"0.35.1","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.1","plugins/node/opentelemetry-instrumentation-restify":"0.34.0","plugins/node/opentelemetry-instrumentation-router":"0.33.1","plugins/node/opentelemetry-instrumentation-winston":"0.32.1","plugins/web/opentelemetry-instrumentation-document-load":"0.33.1","plugins/web/opentelemetry-instrumentation-long-task":"0.33.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.1","plugins/web/opentelemetry-plugin-react-load":"0.29.1","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.1","detectors/node/opentelemetry-resource-detector-aws":"1.3.1","detectors/node/opentelemetry-resource-detector-container":"0.3.1","detectors/node/opentelemetry-resource-detector-gcp":"0.29.1","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.1","metapackages/auto-instrumentations-node":"0.39.2","metapackages/auto-instrumentations-web":"0.33.1","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.1","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.1","plugins/node/instrumentation-amqplib":"0.33.1","plugins/node/instrumentation-cucumber":"0.1.0","plugins/node/instrumentation-dataloader":"0.5.1","plugins/node/instrumentation-fs":"0.8.1","plugins/node/instrumentation-lru-memoizer":"0.33.1","plugins/node/instrumentation-mongoose":"0.33.1","plugins/node/instrumentation-socket.io":"0.34.1","plugins/node/instrumentation-tedious":"0.6.1","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.1","plugins/node/opentelemetry-instrumentation-dns":"0.32.2","plugins/node/opentelemetry-instrumentation-express":"0.33.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.2","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.2","plugins/node/opentelemetry-instrumentation-graphql":"0.35.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.1","plugins/node/opentelemetry-instrumentation-koa":"0.36.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.1","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.1","plugins/node/opentelemetry-instrumentation-net":"0.32.1","plugins/node/opentelemetry-instrumentation-pg":"0.36.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.1","plugins/node/opentelemetry-instrumentation-redis":"0.35.1","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.1","plugins/node/opentelemetry-instrumentation-restify":"0.34.0","plugins/node/opentelemetry-instrumentation-router":"0.33.1","plugins/node/opentelemetry-instrumentation-winston":"0.32.1","plugins/web/opentelemetry-instrumentation-document-load":"0.33.1","plugins/web/opentelemetry-instrumentation-long-task":"0.33.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.1","plugins/web/opentelemetry-plugin-react-load":"0.29.1","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md index 0c94ded62..e1d34fc42 100644 --- a/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -93,6 +93,14 @@ * dependencies * @opentelemetry/instrumentation-generic-pool bumped from ^0.32.1 to ^0.32.2 +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-dns bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-fastify bumped from ^0.32.1 to ^0.32.2 + * @opentelemetry/instrumentation-mongodb bumped from ^0.36.1 to ^0.37.0 + ## [0.39.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.38.0...auto-instrumentations-node-v0.39.0) (2023-08-14) diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 7517c0ecb..02cfcc1da 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.39.1", + "version": "0.39.2", "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", @@ -58,10 +58,10 @@ "@opentelemetry/instrumentation-connect": "^0.32.1", "@opentelemetry/instrumentation-cucumber": "^0.1.0", "@opentelemetry/instrumentation-dataloader": "^0.5.1", - "@opentelemetry/instrumentation-dns": "^0.32.1", + "@opentelemetry/instrumentation-dns": "^0.32.2", "@opentelemetry/instrumentation-express": "^0.33.1", "@opentelemetry/instrumentation-fs": "^0.8.1", - "@opentelemetry/instrumentation-fastify": "^0.32.1", + "@opentelemetry/instrumentation-fastify": "^0.32.2", "@opentelemetry/instrumentation-generic-pool": "^0.32.2", "@opentelemetry/instrumentation-graphql": "^0.35.1", "@opentelemetry/instrumentation-grpc": "^0.41.2", @@ -72,7 +72,7 @@ "@opentelemetry/instrumentation-koa": "^0.36.0", "@opentelemetry/instrumentation-lru-memoizer": "^0.33.1", "@opentelemetry/instrumentation-memcached": "^0.32.1", - "@opentelemetry/instrumentation-mongodb": "^0.36.1", + "@opentelemetry/instrumentation-mongodb": "^0.37.0", "@opentelemetry/instrumentation-mongoose": "^0.33.1", "@opentelemetry/instrumentation-mysql": "^0.34.1", "@opentelemetry/instrumentation-mysql2": "^0.34.1", diff --git a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md index 17552ee8a..e20f9927d 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.32.1...instrumentation-dns-v0.32.2) (2023-08-30) + + +### Bug Fixes + +* **instrumentation-dns:** use caret range for semver regular dependency ([#1654](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1654)) ([d9cd8d7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d9cd8d7efcea66e70dab3de8f847f05a7fc9943f)) + ## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.32.0...instrumentation-dns-v0.32.1) (2023-08-14) diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index f620edde5..b1c4da844 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.32.1", + "version": "0.32.2", "description": "OpenTelemetry dns 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 ea7538e3b..82b74cdf8 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.32.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.1...instrumentation-fastify-v0.32.2) (2023-08-30) + + +### Bug Fixes + +* **fastify:** Make sure consturctor patching works with esm ([#1624](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1624)) ([67f66d2](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/67f66d2e0e8ea9f5d9b46819d4f736fa1e0666b6)) + ## [0.32.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.0...instrumentation-fastify-v0.32.1) (2023-08-14) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 394120e6e..afaf52ae1 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.32.1", + "version": "0.32.2", "description": "OpenTelemetry fastify automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md index 95305cd62..a74be0b8d 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [0.37.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.36.1...instrumentation-mongodb-v0.37.0) (2023-08-30) + + +### âš  BREAKING CHANGES + +* **mongodb:** removes the broken exported type `V4Connection`. + +### Bug Fixes + +* **mongodb:** remove broken type export `V4Connection` ([#1644](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1644)) ([ff29576](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ff29576ce9eaeed3681a9bcbd2f84668c396e5fd)), closes [#1639](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1639) + ## [0.36.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.36.0...instrumentation-mongodb-v0.36.1) (2023-08-14) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index d93d6a2e8..7ca917af5 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.36.1", + "version": "0.37.0", "description": "OpenTelemetry mongodb automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", From 5b7f619130b7b9b219804289109297cacb55eb1a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 31 Aug 2023 13:04:59 +0200 Subject: [PATCH 23/24] chore(deps): update dependency @babel/preset-env to v7.22.14 (#4103) --- 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 3a3483e57..48dfb2108 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -35,7 +35,7 @@ "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.22.10", "@babel/plugin-transform-runtime": "7.22.10", - "@babel/preset-env": "7.22.10", + "@babel/preset-env": "7.22.14", "@opentelemetry/api": "^1.0.0", "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", From f91c374cbe3fbafed1738ec9fa0f173d4add8306 Mon Sep 17 00:00:00 2001 From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Date: Fri, 1 Sep 2023 23:40:33 +0000 Subject: [PATCH 24/24] [AutoMerge] staging @ [c572756...](https://github.com/open-telemetry/opentelemetry-sandbox-web-js/commit/c5727564d2dd5df7d9b5afc4fa3a573fd22f37aa) ### 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/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 --- .../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 +- .../core}/package.json | 85 +++++++---- 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 ++++ .../exporters/otlp/logs/http}/package.json | 92 +++++++----- .../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 | 90 +++++++----- .../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 | 80 +++++++---- .../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 1238 files changed, 7492 insertions(+), 5229 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/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/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 (51%) 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%) rename {auto-merge/js/packages/opentelemetry-core => pkgs/core}/package.json (50%) 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 rename {auto-merge/js/experimental/packages/exporter-logs-otlp-http => pkgs/exporters/otlp/logs/http}/package.json (50%) 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 (58%) 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 bfddd027b..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.1", - "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.11", - "@opentelemetry/api": "^1.3.0", - "@types/mocha": "8.2.3", - "@types/node": "18.6.5", - "@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.2.0", - "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.1", - "@opentelemetry/instrumentation-fetch": "^0.41.2", - "@opentelemetry/instrumentation-user-interaction": "^0.33.1", - "@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 ea22b03e3..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.1", - "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.11", - "@opentelemetry/api": "^1.3.0", - "@types/mocha": "8.2.3", - "@types/node": "18.6.5", - "@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.2.0", - "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 753b8ad4e..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.1", - "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.11", - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/sdk-trace-base": "^1.8.0", - "@types/jquery": "3.5.17", - "@types/mocha": "7.0.2", - "@types/node": "18.6.5", - "@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.2.0", - "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 608a53203..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.1", - "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.11", - "@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.17", - "@types/mocha": "7.0.2", - "@types/node": "18.6.5", - "@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.2.0", - "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 eb7081e51..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.5", - "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 617a8acfc..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.5", - "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/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 70177cc4f..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.11", - "@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.5", - "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 fc03b1965..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.11", - "@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.5", - "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 c187fb9cd..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.11", - "@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.5", - "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 6874a8d98..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.11", - "@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.5", - "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 920d0a91b..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.11", - "@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.5", - "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 5e81576c2..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.11", - "@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.5", - "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 623a68698..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.11", - "@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.5", - "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 b8b6f6ae1..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.11", - "@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.5", - "mocha": "10.2.0", - "nyc": "15.1.0", - "protobufjs-cli": "1.1.2", - "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 f5b1a5946..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.5", - "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 1689f7ccb..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.11", - "@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.5", - "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 2df641b92..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.11", - "@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.5", - "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 aecb55eb0..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.11", - "@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.5", - "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/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 3dedccc8d..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.11", - "@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.5", - "mocha": "10.2.0", - "nock": "13.3.3", - "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 9a9674b97..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.5", - "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 7615592d7..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.5", - "mocha": "10.2.0", - "nock": "13.3.3", - "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 b4bc4e41c..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.5", - "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 3e1997cfd..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.11", - "@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.17", - "@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.5", - "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 9e17927e3..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.5", - "mocha": "10.2.0", - "nock": "13.3.3", - "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 d3f069054..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.11", - "@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.5", - "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..0848f02dc --- /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.46.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..f9e1e6807 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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..012f5b3ca --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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 51% rename from auto-merge/js/api/package.json rename to pkgs/api/package.json index 7369e951c..f0600c803 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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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.5", + "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..b3af76a5a --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..da4fd6387 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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/auto-merge/js/packages/opentelemetry-core/package.json b/pkgs/core/package.json similarity index 50% rename from auto-merge/js/packages/opentelemetry-core/package.json rename to pkgs/core/package.json index e2b3e90b6..0fc711de1 100644 --- a/auto-merge/js/packages/opentelemetry-core/package.json +++ b/pkgs/core/package.json @@ -1,5 +1,5 @@ { - "name": "@opentelemetry/core", + "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", @@ -14,23 +14,28 @@ "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", + "build": "npm run compile && npm run package", "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 ../../", + "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-quiet": "eslint . --ext .ts --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": "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" + "watch": "npm run version && tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" }, "keywords": [ "opentelemetry", @@ -64,35 +69,55 @@ "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", + "@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", "cross-var": "1.1.0", - "karma": "6.4.2", + "eslint": "8.46.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.5", - "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" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" + "@opentelemetry/sandbox-api": "1.4.1" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.2" + "@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..466e31434 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..16396c2f6 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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 2c55a7f91..fb18885d8 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 2888e317d..35712e256 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 5a8b1dfdf..36bef20aa 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/auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json b/pkgs/exporters/otlp/logs/http/package.json similarity index 50% rename from auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json rename to pkgs/exporters/otlp/logs/http/package.json index 3f0c192b0..1a9d67dab 100644 --- a/auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json +++ b/pkgs/exporters/otlp/logs/http/package.json @@ -1,5 +1,5 @@ { - "name": "@opentelemetry/exporter-logs-otlp-http", + "name": "@opentelemetry/sandbox-exporter-logs-otlp-http", "version": "0.41.2", "publishConfig": { "access": "public" @@ -29,22 +29,27 @@ "node": ">=14" }, "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-quiet": "eslint . --ext .ts --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", @@ -72,42 +77,61 @@ "sideEffects": false, "devDependencies": { "@babel/core": "7.22.11", - "@opentelemetry/api": "1.4.1", - "@opentelemetry/resources": "1.15.2", - "@types/mocha": "10.0.1", - "@types/node": "18.6.5", - "@types/sinon": "10.0.16", + "@opentelemetry/sandbox-api": "1.4.1", + "@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", - "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.46.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.5", - "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.0.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/api-logs": "0.41.2", - "@opentelemetry/sdk-logs": "0.41.2" + "@opentelemetry/sandbox-api-logs": "0.41.2", + "@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 6dac23b58..f0bafff04 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..5da5340ea --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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 54a752af1..d214a5ebd 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 7fe60c0dd..8e005cba8 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-quiet": "eslint . --ext .ts --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.11", - "@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.46.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.5", - "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 db8a4a32e..b0ab67130 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..8648ced70 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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.2", + "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..d1468b770 --- /dev/null +++ b/pkgs/exporters/otlp/proto-base/protos @@ -0,0 +1 @@ +Subproject commit d1468b7700309cec0a3fdfffbfba4e84acf94072 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 4bc9e5c70..a6907f538 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 17804c47b..54cc95664 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..0e9445c91 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..69ea50e99 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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 ff6a9c7b8..199a6a647 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..b2801bbab --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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..2ad0dae90 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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.3", + "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 54392321f..6b9a5b392 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 810b9e32f..2495a8dce 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 58% rename from auto-merge/js/experimental/packages/opentelemetry-instrumentation/package.json rename to pkgs/instrumentations/instrumentation/package.json index 37f839ea5..92f315bc9 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-quiet": "eslint . --ext .ts --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.11", - "@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.1", - "@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.46.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.5", - "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..0eca6970c --- /dev/null +++ b/pkgs/instrumentations/web/auto/package.json @@ -0,0 +1,94 @@ +{ + "name": "@opentelemetry/sandbox-auto-instrumentations-web", + "version": "0.33.1", + "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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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.1", + "@opentelemetry/sandbox-instrumentation-fetch": "0.41.2", + "@opentelemetry/sandbox-instrumentation-user-interaction": "0.33.1", + "@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..b228598af --- /dev/null +++ b/pkgs/instrumentations/web/document-load/package.json @@ -0,0 +1,112 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-document-load", + "version": "0.33.1", + "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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..c53c0bb20 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..5dd88511a --- /dev/null +++ b/pkgs/instrumentations/web/long-task/package.json @@ -0,0 +1,114 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-long-task", + "version": "0.33.1", + "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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..72127b0b0 --- /dev/null +++ b/pkgs/instrumentations/web/user-interaction/package.json @@ -0,0 +1,117 @@ +{ + "name": "@opentelemetry/sandbox-instrumentation-user-interaction", + "version": "0.33.1", + "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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..15702ddd4 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..e65b08356 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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..acdd9e945 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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.3", + "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..023607a0f --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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 027f103c0..bcdd166f3 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..a206abd2d --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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 bceb86b8e..bf4c69b42 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 5ecafff68..38b584403 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'; import { MetricProducer } from './MetricProducer'; 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 099a21c0d..8e4d38c81 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 821b55ec2..8357f3465 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..d0fc7c65c --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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 ea3526b29..9f5634988 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 7d84e0c73..4c6dea1fb 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 873865a0d..ff237b2c7 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..688779d5d --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.11", + "@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.46.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..5a65cfc26 --- /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": "eslint . --ext .ts --fix", + "lint:fix-quiet": "eslint . --ext .ts --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.46.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.3", + "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