Skip to content

Commit 42e9c10

Browse files
authored
Merge branch 'master' into http-option-require-parent
2 parents a5872d5 + 23677a1 commit 42e9c10

File tree

46 files changed

+35
-441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+35
-441
lines changed

.circleci/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ cache_1: &cache_1
1010
- ./node_modules
1111
- ./package-lock.json
1212
- packages/opentelemetry-api/node_modules
13-
- packages/opentelemetry-base/node_modules
1413
- packages/opentelemetry-context-async-hooks/node_modules
1514
- packages/opentelemetry-context-base/node_modules
1615
- packages/opentelemetry-context-zone/node_modules

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem
142142
| [@opentelemetry/metrics][otel-metrics] | This module provides instruments and meters for reporting of time series data. |
143143
| [@opentelemetry/node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. |
144144
| [@opentelemetry/web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. |
145-
| [@opentelemetry/base][otel-base] | This package provides base code for the SDK packages (tracing and metrics). |
146145

147146
### Compatible Exporters
148147

@@ -202,7 +201,6 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
202201

203202
[docs]: https://open-telemetry.github.io/opentelemetry-js
204203

205-
[otel-base]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-base
206204
[otel-metrics]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-metrics
207205
[otel-node]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node
208206

packages/opentelemetry-base/LICENSE

-201
This file was deleted.

packages/opentelemetry-base/README.md

-28
This file was deleted.

packages/opentelemetry-base/package.json

-62
This file was deleted.

packages/opentelemetry-base/src/index.ts

-18
This file was deleted.

packages/opentelemetry-base/src/platform/browser/index.ts

-17
This file was deleted.

packages/opentelemetry-base/src/platform/index.ts

-20
This file was deleted.

packages/opentelemetry-base/src/platform/node/index.ts

-17
This file was deleted.

0 commit comments

Comments
 (0)