Skip to content

Commit

Permalink
Merge 5bdd483 into 87f21ef
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan authored Jul 19, 2023
2 parents 87f21ef + 5bdd483 commit 3083925
Show file tree
Hide file tree
Showing 54 changed files with 53 additions and 118 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :bug: (Bug Fix)

* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)"
[#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan

### :books: (Refine Doc)

### :house: (Internal)
Expand Down
3 changes: 0 additions & 3 deletions api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@
"unionfs": "4.5.1",
"webpack": "4.46.0"
},
"dependencies": {
"tslib": "^2.3.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
"sideEffects": false
}
3 changes: 1 addition & 2 deletions examples/esm-http-ts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Completeness */
"skipLibCheck": true /* Skip type checking all .d.ts files. */,
"importHelpers": true
"skipLibCheck": true /* Skip type checking all .d.ts files. */
},
"include": ["**/*.ts", "**/*.js", "*.config.js"],
"exclude": ["node_modules"]
Expand Down
3 changes: 1 addition & 2 deletions examples/opentelemetry-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@
"@opentelemetry/sdk-metrics": "1.15.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"@opentelemetry/sdk-trace-web": "1.15.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/semantic-conventions": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
}
3 changes: 1 addition & 2 deletions experimental/backwards-compatibility/node14/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.41.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"devDependencies": {
"@types/node": "14.18.25",
Expand Down
3 changes: 1 addition & 2 deletions experimental/backwards-compatibility/node16/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
},
"dependencies": {
"@opentelemetry/sdk-node": "0.41.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/api-events/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"tslib": "^2.3.1"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@types/mocha": "10.0.1",
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/api-logs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"tslib": "^2.3.1"
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@types/mocha": "10.0.1",
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/exporter-logs-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@
"@opentelemetry/core": "1.15.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/sdk-logs": "0.41.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-logs": "0.41.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/exporter-logs-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
"@opentelemetry/core": "1.15.0",
"@opentelemetry/otlp-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/sdk-logs": "0.41.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-logs": "0.41.0"
}
}
3 changes: 1 addition & 2 deletions experimental/packages/exporter-logs-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-logs": "0.41.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/exporter-trace-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@
"@opentelemetry/otlp-grpc-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/exporter-trace-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@
"@opentelemetry/otlp-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/exporter-trace-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@
"@opentelemetry/otlp-proto-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-browser-detector/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@
},
"dependencies": {
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/semantic-conventions": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector"
}
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@
"@opentelemetry/otlp-grpc-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-metrics": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-metrics": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@
"@opentelemetry/otlp-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-metrics": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-metrics": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@
"@opentelemetry/otlp-proto-exporter-base": "0.41.0",
"@opentelemetry/otlp-transformer": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-metrics": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-metrics": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-proto",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-exporter-prometheus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@
"dependencies": {
"@opentelemetry/core": "1.15.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-metrics": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-metrics": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@
"@opentelemetry/core": "1.15.0",
"@opentelemetry/instrumentation": "0.41.0",
"@opentelemetry/sdk-trace-web": "1.15.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/semantic-conventions": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-instrumentation-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "0.41.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/semantic-conventions": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-instrumentation-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@
"@opentelemetry/core": "1.15.0",
"@opentelemetry/instrumentation": "0.41.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"semver": "^7.5.1",
"tslib": "^2.3.1"
"semver": "^7.5.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@
"@opentelemetry/core": "1.15.0",
"@opentelemetry/instrumentation": "0.41.0",
"@opentelemetry/sdk-trace-web": "1.15.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/semantic-conventions": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
"import-in-the-middle": "1.4.1",
"require-in-the-middle": "^7.1.1",
"semver": "^7.5.1",
"shimmer": "^1.2.1",
"tslib": "^2.3.1"
"shimmer": "^1.2.1"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

export { InstrumentationBase } from './instrumentation';
export * from './instrumentation';
8 changes: 1 addition & 7 deletions experimental/packages/opentelemetry-instrumentation/src/platform/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,4 @@
* limitations under the License.
*/

export {
InstrumentationBase,
InstrumentationModuleDefinition,
InstrumentationModuleFile,
InstrumentationNodeModuleDefinition,
InstrumentationNodeModuleFile,
} from './node';
export * from './node';
11 changes: 4 additions & 7 deletions experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export { InstrumentationBase } from './instrumentation';
export { InstrumentationNodeModuleDefinition } from './instrumentationNodeModuleDefinition';
export { InstrumentationNodeModuleFile } from './instrumentationNodeModuleFile';
export {
InstrumentationModuleDefinition,
InstrumentationModuleFile,
} from './types';
export * from './instrumentation';
export * from './instrumentationNodeModuleDefinition';
export * from './instrumentationNodeModuleFile';
export * from './types';
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation/test/node/EsmInstrumentation.test.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import * as assert from 'assert';
import {
InstrumentationBase,
InstrumentationNodeModuleDefinition,
} from '../../build/src/platform/index.js';
} from '../../build/src/index.js';
import * as exported from 'test-esm-module';

class TestInstrumentationWrapFn extends InstrumentationBase {
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@
"@opentelemetry/sdk-metrics": "1.15.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"@opentelemetry/sdk-trace-node": "1.15.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/semantic-conventions": "1.15.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.3.0 <1.5.0"
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/otlp-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/core": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/core": "1.15.0"
},
"devDependencies": {
"@babel/core": "7.22.9",
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/otlp-grpc-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.15.0",
"@opentelemetry/otlp-exporter-base": "0.41.0",
"protobufjs": "^7.2.3",
"tslib": "^2.3.1"
"protobufjs": "^7.2.3"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-grpc-exporter-base",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/otlp-proto-exporter-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@
"dependencies": {
"@opentelemetry/core": "1.15.0",
"@opentelemetry/otlp-exporter-base": "0.41.0",
"protobufjs": "^7.2.3",
"tslib": "^2.3.1"
"protobufjs": "^7.2.3"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-proto-exporter-base",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/otlp-transformer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-logs": "0.41.0",
"@opentelemetry/sdk-metrics": "1.15.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/sdk-trace-base": "1.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/otlp-transformer",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions experimental/packages/sdk-logs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
},
"dependencies": {
"@opentelemetry/core": "1.15.0",
"@opentelemetry/resources": "1.15.0",
"tslib": "^2.3.1"
"@opentelemetry/resources": "1.15.0"
}
}
3 changes: 1 addition & 2 deletions experimental/packages/shim-opencensus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
"dependencies": {
"@opentelemetry/core": "1.15.0",
"require-in-the-middle": "^7.1.1",
"semver": "^7.5.1",
"tslib": "^2.3.1"
"semver": "^7.5.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/shim-opencensus",
"sideEffects": false
Expand Down
3 changes: 1 addition & 2 deletions integration-tests/propagation-validation-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"@opentelemetry/sdk-trace-base": "1.15.0",
"axios": "1.4.0",
"body-parser": "1.19.0",
"express": "4.17.3",
"tslib": "^2.3.1"
"express": "4.17.3"
},
"devDependencies": {
"typescript": "4.4.4"
Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@
"typedoc": "0.22.18",
"typedoc-plugin-missing-exports": "1.0.0",
"typedoc-plugin-resolve-crossmodule-references": "0.2.2",
"typescript": "4.4.4",
"tslib": "^2.3.1"
"typescript": "4.4.4"
},
"changelog": {
"repo": "open-telemetry/opentelemetry-js",
Expand Down
3 changes: 0 additions & 3 deletions packages/opentelemetry-context-async-hooks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
"publishConfig": {
"access": "public"
},
"dependencies": {
"tslib": "^2.3.1"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.5.0",
"@types/mocha": "10.0.1",
Expand Down
3 changes: 0 additions & 3 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@
"@opentelemetry/api": ">=1.0.0 <1.5.0",
"zone.js": "^0.10.2 || ^0.11.0"
},
"dependencies": {
"tslib": "^2.3.1"
},
"sideEffects": false,
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-zone-peer-dep"
}
1 change: 0 additions & 1 deletion packages/opentelemetry-context-zone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
},
"dependencies": {
"@opentelemetry/context-zone-peer-dep": "1.15.0",
"tslib": "^2.3.1",
"zone.js": "^0.11.0"
},
"sideEffects": true,
Expand Down
Loading

0 comments on commit 3083925

Please sign in to comment.