diff --git a/.github/workflows/canary.yaml b/.github/workflows/canary.yaml deleted file mode 100644 index e905410ef6..0000000000 --- a/.github/workflows/canary.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: Deploy Canary Release - -on: - push: - branches: - - main - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - steps: - - name: Checkout 🛎️ - uses: actions/checkout@v2 - with: - # Fetch all history (needed for lerna / semantic release to correctly version) - fetch-depth: 0 - # pulls all tags (needed for lerna / semantic release to correctly version) - - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* - - name: Set up Node.js - uses: actions/setup-node@master - with: - node-version: 14.x - registry-url: https://registry.npmjs.org - scope: '@opentelemetry' - - - name: restore lock files - uses: actions/cache@master # must use unreleased master to cache multiple paths - id: cache - with: - # must be done before bootstrap to not include node_modules files in the cache paths - path: | - package-lock.json - packages/*/package-lock.json - benchmark/*/package-lock.json - backwards-compatability/*/package-lock.json - metapackages/*/package-lock.json - packages/*/package-lock.json - integration-tests/*/package-lock.json - key: ${{ runner.os }}-${{ hashFiles('**/package.json') }} - - - name: Install and Build (cache miss) 🔧 - if: steps.cache.outputs.cache-hit != 'true' - run: | - npm install --ignore-scripts - npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' - npm run compile - - - name: Install and Build (cache hit) 🔧 - if: steps.cache.outputs.cache-hit == 'true' - run: | - npm ci --ignore-scripts - npx lerna bootstrap --hoist --nohoist='zone.js' - npm run compile - - - name: Publish - run: npx lerna publish --canary --yes --no-verify-access - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - # Push new version tag to github - - run: git push --tags diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 874aed7822..d90afefbdc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,12 +8,19 @@ on: jobs: build: + strategy: + fail-fast: false + matrix: + package-group: [".", "experimental"] runs-on: ubuntu-latest + container: + image: node:14 steps: - uses: actions/checkout@v2 - name: Lint changelog file + if: ${{ matrix.package-group == '.' }} uses: avto-dev/markdown-lint@v1 with: # Commenting due to @@ -24,6 +31,7 @@ jobs: args: "./CHANGELOG.md" - name: Lint markdown files + if: ${{ matrix.package-group == '.' }} uses: avto-dev/markdown-lint@v1 with: args: "./**/*.md -i ./CHANGELOG.md" @@ -34,17 +42,21 @@ jobs: with: path: | node_modules + experimental/node_modules */*/node_modules - key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} + experimental/*/*/node_modules + key: lint-${{ matrix.package-group }}-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}-20211009.2 # On a cache miss, install dependencies - name: Bootstrap if: steps.cache.outputs.cache-hit != 'true' + working-directory: ${{ matrix.package-group }} run: | npm install --ignore-scripts npx lerna bootstrap --no-ci --ignore-scripts --hoist --nohoist='zone.js' -- --only=dev - name: Lint + working-directory: ${{ matrix.package-group }} run: | npm run lint npm run lint:examples diff --git a/.github/workflows/peer-api.yaml b/.github/workflows/peer-api.yaml index 2eeafe1d92..2917235bc3 100644 --- a/.github/workflows/peer-api.yaml +++ b/.github/workflows/peer-api.yaml @@ -18,5 +18,9 @@ jobs: - name: Install lerna run: npm install -g lerna - - name: Check API dependency semantics + - name: Check API dependency semantics (stable) run: lerna exec --ignore propagation-validation-server "node ../../scripts/peer-api-check.js" + + - name: Check API dependency semantics (experimental) + working-directory: experimental + run: lerna exec --ignore propagation-validation-server "node ../../../scripts/peer-api-check.js" diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml deleted file mode 100644 index 951fab5f79..0000000000 --- a/.github/workflows/release-please.yml +++ /dev/null @@ -1,14 +0,0 @@ -on: - push: - branches: - - main -name: release-please -jobs: - release-please: - runs-on: ubuntu-latest - steps: - - uses: google-github-actions/release-please-action@v2 - with: - command: manifest - token: ${{secrets.RELEASE_PR_TOKEN}} - default-branch: main \ No newline at end of file diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index bea64d0cdc..e4a4a6d90e 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -6,7 +6,7 @@ on: pull_request: jobs: - unit-test: + node-tests-stable: strategy: fail-fast: false matrix: @@ -29,7 +29,7 @@ jobs: path: | node_modules */*/node_modules - key: unittest-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} + key: node-tests-stable-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} - name: Bootstrap if: steps.cache.outputs.cache-hit != 'true' @@ -38,14 +38,15 @@ jobs: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' - name: Build 🔧 - run: npm run compile + run: | + npm run compile - name: Unit tests run: npm run test - name: Report Coverage run: npm run codecov if: ${{ matrix.node_version == '14' }} - browser-tests: + browser-tests-stable: runs-on: ubuntu-latest container: image: circleci/node:14-browsers @@ -64,17 +65,102 @@ jobs: path: | node_modules */*/node_modules - key: unittest-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} + key: browser-tests-stable-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} + + - name: Bootstrap + if: steps.cache.outputs.cache-hit != 'true' + run: | + npm install --ignore-scripts + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' + + - name: Build 🔧 + run: | + npm run compile + + - name: Unit tests + run: npm run test:browser + - name: Report Coverage + run: npm run codecov:browser + node-tests-experimental: + strategy: + fail-fast: false + matrix: + node_version: ["8", "10", "12", "14", "16"] + runs-on: ubuntu-latest + env: + NPM_CONFIG_UNSAFE_PERM: true + steps: + - name: Checkout + uses: actions/checkout@v1 + + - uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node_version }} + + - name: restore lerna + id: cache + uses: actions/cache@v2 + with: + path: | + experimental/node_modules + experimental/packages/*/node_modules + key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('experimental/**/package.json') }} + + - name: Bootstrap + if: steps.cache.outputs.cache-hit != 'true' + working-directory: experimental + run: | + npm install --ignore-scripts + npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' + + - name: Build 🔧 + working-directory: experimental + run: | + npm run compile + + - name: Unit tests + working-directory: experimental + run: npm run test + - name: Report Coverage + working-directory: experimental + run: npm run codecov + if: ${{ matrix.node_version == '14' }} + browser-tests-experimental: + runs-on: ubuntu-latest + container: + image: circleci/node:14-browsers + env: + NPM_CONFIG_UNSAFE_PERM: true + steps: + - name: Checkout + uses: actions/checkout@v1 + - name: Permission Setup + run: sudo chmod -R 777 /github /__w + + - name: restore lerna + uses: actions/cache@v2 + id: cache + with: + path: | + experimental/node_modules + experimental/packages/*/node_modules + key: browser-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} - name: Bootstrap if: steps.cache.outputs.cache-hit != 'true' + working-directory: experimental run: | npm install --ignore-scripts npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' - name: Build 🔧 - run: npm run compile + working-directory: experimental + run: | + npm run compile + - name: Unit tests + working-directory: experimental run: npm run test:browser - name: Report Coverage + working-directory: experimental run: npm run codecov:browser diff --git a/.release-please-manifest.json b/.release-please-manifest.json deleted file mode 100644 index 09f8d59adc..0000000000 --- a/.release-please-manifest.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "packages/opentelemetry-api-metrics": "0.25.0", - "packages/opentelemetry-context-async-hooks": "0.25.0", - "packages/opentelemetry-context-zone-peer-dep": "0.25.0", - "packages/opentelemetry-context-zone": "0.25.0", - "packages/opentelemetry-core": "0.25.0", - "packages/opentelemetry-exporter-collector-grpc": "0.25.0", - "packages/opentelemetry-exporter-collector-proto": "0.25.0", - "packages/opentelemetry-exporter-collector": "0.25.0", - "packages/opentelemetry-exporter-jaeger": "0.25.0", - "packages/opentelemetry-exporter-prometheus": "0.25.0", - "packages/opentelemetry-exporter-zipkin": "0.25.0", - "packages/opentelemetry-instrumentation-fetch": "0.25.0", - "packages/opentelemetry-instrumentation-grpc": "0.25.0", - "packages/opentelemetry-instrumentation-http": "0.25.0", - "packages/opentelemetry-instrumentation-xml-http-request": "0.25.0", - "packages/opentelemetry-instrumentation": "0.25.0", - "packages/opentelemetry-propagator-b3": "0.25.0", - "packages/opentelemetry-propagator-jaeger": "0.25.0", - "packages/opentelemetry-resources": "0.25.0", - "packages/opentelemetry-sdk-metrics-base": "0.25.0", - "packages/opentelemetry-sdk-node": "0.25.0", - "packages/opentelemetry-sdk-trace-base": "0.25.0", - "packages/opentelemetry-sdk-trace-node": "0.25.0", - "packages/opentelemetry-sdk-trace-web": "0.25.0", - "packages/opentelemetry-semantic-conventions": "0.25.0", - "packages/opentelemetry-shim-opentracing": "0.25.0" -} diff --git a/benchmark/README.md b/benchmark/README.md deleted file mode 100644 index 81ceaab647..0000000000 --- a/benchmark/README.md +++ /dev/null @@ -1,120 +0,0 @@ -# Benchmarks - -## How to run - -To run your benchmark, just: - -```sh -npm run bench -``` - -The minimum sample size is set to 10 to perform statistical analysis on benchmark, you can re-configure that in `benchmark.js`. - -> NOTE: If you're interested in writing benchmark for other APIs, please write a benchmark in the `benchmark/index.js` module. Please refer to the `benchmark/tracer.js` or `benchmark/propagator.js` for more comprehensive examples. - -## Results - -### `v0.5.0` release - -```text -Beginning NoopTracerProvider Benchmark... - 5 tests completed. - - #startSpan x 766,888,261 ops/sec ±1.81% (20 runs sampled) - #startSpan:parent x 755,332,363 ops/sec ±1.51% (20 runs sampled) - #startSpan with attribute x 765,932,668 ops/sec ±1.45% (20 runs sampled) - #startSpan with 30 attributes x 1,333,216 ops/sec ±10.66% (20 runs sampled) - #startSpan with 100 attributes x 477,974 ops/sec ±3.66% (20 runs sampled) - -Beginning BasicTracerProvider Benchmark... - 5 tests completed. - - #startSpan x 94,710 ops/sec ±19.20% (20 runs sampled) - #startSpan:parent x 62,938 ops/sec ±3.77% (20 runs sampled) - #startSpan with attribute x 93,389 ops/sec ±7.70% (20 runs sampled) - #startSpan with 30 attributes x 33,753 ops/sec ±8.07% (20 runs sampled) - #startSpan with 100 attributes x 2,497 ops/sec ±14.78% (20 runs sampled) - -Beginning BasicTracerProvider with SimpleSpanProcessor Benchmark... - 5 tests completed. - - #startSpan x 100,159 ops/sec ±7.17% (20 runs sampled) - #startSpan:parent x 63,848 ops/sec ±5.78% (20 runs sampled) - #startSpan with attribute x 96,301 ops/sec ±9.39% (20 runs sampled) - #startSpan with 30 attributes x 36,410 ops/sec ±2.21% (20 runs sampled) - #startSpan with 100 attributes x 3,549 ops/sec ±3.33% (20 runs sampled) - -Beginning BasicTracerProvider with BatchSpanProcessor Benchmark... - 5 tests completed. - - #startSpan x 90,992 ops/sec ±17.91% (20 runs sampled) - #startSpan:parent x 64,590 ops/sec ±4.18% (20 runs sampled) - #startSpan with attribute x 107,706 ops/sec ±2.21% (20 runs sampled) - #startSpan with 30 attributes x 24,199 ops/sec ±45.57% (20 runs sampled) - #startSpan with 100 attributes x 2,645 ops/sec ±9.86% (20 runs sampled) - -Beginning B3Propagator Benchmark... - 2 tests completed. - - #Inject x 2,018,725 ops/sec ±3.49% (100 runs sampled) - #Extract x 2,040,891 ops/sec ±1.75% (100 runs sampled) - -Beginning HttpTraceContextPropagator Benchmark... - 2 tests completed. - - #Inject x 3,987,007 ops/sec ±1.87% (100 runs sampled) - #Extract x 1,792,743 ops/sec ±0.93% (100 runs sampled) -``` - -### `v0.3.3` release - -```text -Beginning NoopTracerProvider Benchmark... - 5 tests completed. - - #startSpan x 731,516,636 ops/sec ±2.57% (20 runs sampled) - #startSpan:parent x 744,353,590 ops/sec ±3.03% (20 runs sampled) - #startSpan with attribute x 737,451,332 ops/sec ±3.75% (20 runs sampled) - #startSpan with 30 attributes x 1,658,688 ops/sec ±1.23% (20 runs sampled) - #startSpan with 100 attributes x 535,082 ops/sec ±1.55% (20 runs sampled) - -Beginning BasicTracerProvider Benchmark... - 5 tests completed. - - #startSpan x 80,633 ops/sec ±3.57% (20 runs sampled) - #startSpan:parent x 56,228 ops/sec ±2.18% (20 runs sampled) - #startSpan with attribute x 86,710 ops/sec ±1.80% (20 runs sampled) - #startSpan with 30 attributes x 36,331 ops/sec ±1.29% (20 runs sampled) - #startSpan with 100 attributes x 3,549 ops/sec ±3.59% (20 runs sampled) - -Beginning BasicTracerProvider with SimpleSpanProcessor Benchmark... - 5 tests completed. - - #startSpan x 74,539 ops/sec ±4.49% (20 runs sampled) - #startSpan:parent x 48,953 ops/sec ±4.98% (20 runs sampled) - #startSpan with attribute x 79,686 ops/sec ±2.54% (20 runs sampled) - #startSpan with 30 attributes x 26,491 ops/sec ±13.68% (20 runs sampled) - #startSpan with 100 attributes x 2,464 ops/sec ±19.64% (20 runs sampled) - -Beginning BasicTracerProvider with BatchSpanProcessor Benchmark... - 5 tests completed. - - #startSpan x 74,974 ops/sec ±3.57% (20 runs sampled) - #startSpan:parent x 42,390 ops/sec ±20.68% (20 runs sampled) - #startSpan with attribute x 76,497 ops/sec ±2.93% (20 runs sampled) - #startSpan with 30 attributes x 33,042 ops/sec ±2.03% (20 runs sampled) - #startSpan with 100 attributes x 3,459 ops/sec ±4.56% (20 runs sampled) - - -Beginning B3Propagator Benchmark... - 2 tests completed. - - #Inject x 5,086,366 ops/sec ±3.18% (100 runs sampled) - #Extract x 4,859,557 ops/sec ±3.80% (100 runs sampled) - -Beginning HttpTraceContextPropagator Benchmark... - 2 tests completed. - - #Inject x 13,660,710 ops/sec ±1.84% (100 runs sampled) - #Extract x 1,692,010 ops/sec ±0.83% (100 runs sampled) -``` diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js deleted file mode 100644 index 8bc04a47b5..0000000000 --- a/benchmark/benchmark.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; - -const Benchmark = require('benchmark'); -const benchmarks = require('beautify-benchmark'); - -Benchmark.options.maxTime = 0; - -module.exports = (minSamples) => { - Benchmark.options.minSamples = minSamples; - const suite = new Benchmark.Suite(); - - return suite - .on('cycle', event => { - benchmarks.add(event.target); - }) - .on('error', event => { - throw event.target.error; - }) - .on('complete', function () { - benchmarks.log(); - }); -}; diff --git a/benchmark/index.js b/benchmark/index.js deleted file mode 100644 index 745b93b75a..0000000000 --- a/benchmark/index.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const execSync = require('child_process').execSync; -const exec = cmd => execSync(cmd, { stdio: [0, 1, 2] }); - -exec('node benchmark/tracer.js'); -exec('node benchmark/propagator.js'); diff --git a/benchmark/propagator.js b/benchmark/propagator.js deleted file mode 100644 index b201af0198..0000000000 --- a/benchmark/propagator.js +++ /dev/null @@ -1,46 +0,0 @@ -'use strict'; - -const benchmark = require('./benchmark'); -const opentelemetry = require('../packages/opentelemetry-core'); -const api = require('../packages/opentelemetry-api'); -const { Context } = require('../packages/opentelemetry-context-base'); -const { B3Propagator } = require('../packages/opentelemetry-propagator-b3'); - -const setups = [ - { - name: 'B3Propagator', - propagator: new B3Propagator(), - injectCarrier: {}, - extractCarrier: { - 'x-b3-traceid': 'd4cda95b652f4a1592b449d5929fda1b', - 'x-b3-spanid': '6e0c63257de34c92' - } - }, - { - name: 'W3CTraceContextPropagator', - propagator: new opentelemetry.W3CTraceContextPropagator(), - injectCarrier: {}, - extractCarrier: { - traceparent: '00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-00' - } - } -]; - -for (const setup of setups) { - console.log(`Beginning ${setup.name} Benchmark...`); - const propagator = setup.propagator; - const suite = benchmark(100) - .add('#Inject', function () { - propagator.inject( - api.setExtractedSpanContext(Context.ROOT_CONTEXT, { - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92' - }), setup.injectCarrier, api.defaultTextMapSetter); - }) - .add('#Extract', function () { - propagator.extract(Context.ROOT_CONTEXT, setup.extractCarrier, api.defaultTextMapGetter); - }); - - // run async - suite.run({ async: false }); -} diff --git a/benchmark/tracer.js b/benchmark/tracer.js deleted file mode 100644 index 62e30e2fab..0000000000 --- a/benchmark/tracer.js +++ /dev/null @@ -1,71 +0,0 @@ -'use strict'; - -const benchmark = require('./benchmark'); -const opentelemetry = require('../packages/opentelemetry-api'); -const { BasicTracerProvider, BatchSpanProcessor, InMemorySpanExporter, SimpleSpanProcessor } = require('../packages/opentelemetry-sdk-trace-base'); - -// Clear any previous global logger -opentelemetry.diag.setLogger(); - -const setups = [ - { - name: 'NoopTracerProvider', - provider: new opentelemetry.NoopTracerProvider() - }, - { - name: 'BasicTracerProvider', - provider: new BasicTracerProvider() - }, - { - name: 'BasicTracerProvider with SimpleSpanProcessor', - provider: getProvider(new SimpleSpanProcessor(new InMemorySpanExporter())) - }, - { - name: 'BasicTracerProvider with BatchSpanProcessor', - provider: getProvider(new BatchSpanProcessor(new InMemorySpanExporter())) - } -]; - -for (const setup of setups) { - console.log(`Beginning ${setup.name} Benchmark...`); - const tracer = setup.provider.getTracer("benchmark"); - const suite = benchmark(20) - .add('#startSpan', function () { - const span = tracer.startSpan('op'); - span.end(); - }) - .add('#startSpan:parent', function () { - const span = tracer.startSpan('op'); - const childSpan = tracer.startSpan('client-op', { parent: span }); - childSpan.end(); - span.end(); - }) - .add('#startSpan with attribute', function () { - const span = tracer.startSpan('op'); - span.setAttribute('attr-key-one', 'attr-value-one'); - span.end(); - }) - .add('#startSpan with 30 attributes', function () { - const span = tracer.startSpan('op'); - for (let j = 0; j < 30; j++) { - span.setAttribute('attr-key-' + j, 'attr-value-' + j); - } - span.end(); - }) - .add('#startSpan with 100 attributes', function () { - const span = tracer.startSpan('op'); - for (let j = 0; j < 100; j++) { - span.setAttribute('attr-key-' + j, 'attr-value-' + j); - } - span.end(); - }); - - // run async - suite.run({ async: false }); -} -function getProvider(processor) { - const provider = new BasicTracerProvider(); - provider.addSpanProcessor(processor); - return provider; -} - diff --git a/experimental/lerna.json b/experimental/lerna.json new file mode 100644 index 0000000000..99276cc155 --- /dev/null +++ b/experimental/lerna.json @@ -0,0 +1,8 @@ +{ + "lerna": "3.13.4", + "version": "0.25.0", + "npmClient": "npm", + "packages": [ + "packages/*" + ] +} diff --git a/experimental/package.json b/experimental/package.json new file mode 120000 index 0000000000..4e26811d41 --- /dev/null +++ b/experimental/package.json @@ -0,0 +1 @@ +../package.json \ No newline at end of file diff --git a/packages/opentelemetry-api-metrics/.eslintignore b/experimental/packages/opentelemetry-api-metrics/.eslintignore similarity index 100% rename from packages/opentelemetry-api-metrics/.eslintignore rename to experimental/packages/opentelemetry-api-metrics/.eslintignore diff --git a/packages/opentelemetry-api-metrics/.eslintrc.js b/experimental/packages/opentelemetry-api-metrics/.eslintrc.js similarity index 74% rename from packages/opentelemetry-api-metrics/.eslintrc.js rename to experimental/packages/opentelemetry-api-metrics/.eslintrc.js index e20344660f..b9004d2025 100644 --- a/packages/opentelemetry-api-metrics/.eslintrc.js +++ b/experimental/packages/opentelemetry-api-metrics/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-api-metrics/LICENSE b/experimental/packages/opentelemetry-api-metrics/LICENSE similarity index 100% rename from packages/opentelemetry-api-metrics/LICENSE rename to experimental/packages/opentelemetry-api-metrics/LICENSE diff --git a/packages/opentelemetry-api-metrics/README.md b/experimental/packages/opentelemetry-api-metrics/README.md similarity index 100% rename from packages/opentelemetry-api-metrics/README.md rename to experimental/packages/opentelemetry-api-metrics/README.md diff --git a/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js b/experimental/packages/opentelemetry-api-metrics/karma.conf.js similarity index 86% rename from packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js rename to experimental/packages/opentelemetry-api-metrics/karma.conf.js index 3019564a15..6174839d65 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js +++ b/experimental/packages/opentelemetry-api-metrics/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/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json similarity index 95% rename from packages/opentelemetry-api-metrics/package.json rename to experimental/packages/opentelemetry-api-metrics/package.json index 1a9f36ee75..83950b2687 100644 --- a/packages/opentelemetry-api-metrics/package.json +++ b/experimental/packages/opentelemetry-api-metrics/package.json @@ -21,10 +21,10 @@ "build": "npm run compile", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "opentelemetry", diff --git a/packages/opentelemetry-api-metrics/src/NoopMeter.ts b/experimental/packages/opentelemetry-api-metrics/src/NoopMeter.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/NoopMeter.ts rename to experimental/packages/opentelemetry-api-metrics/src/NoopMeter.ts diff --git a/packages/opentelemetry-api-metrics/src/NoopMeterProvider.ts b/experimental/packages/opentelemetry-api-metrics/src/NoopMeterProvider.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/NoopMeterProvider.ts rename to experimental/packages/opentelemetry-api-metrics/src/NoopMeterProvider.ts diff --git a/packages/opentelemetry-api-metrics/src/api/global-utils.ts b/experimental/packages/opentelemetry-api-metrics/src/api/global-utils.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/api/global-utils.ts rename to experimental/packages/opentelemetry-api-metrics/src/api/global-utils.ts diff --git a/packages/opentelemetry-api-metrics/src/api/metrics.ts b/experimental/packages/opentelemetry-api-metrics/src/api/metrics.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/api/metrics.ts rename to experimental/packages/opentelemetry-api-metrics/src/api/metrics.ts diff --git a/packages/opentelemetry-api-metrics/src/index.ts b/experimental/packages/opentelemetry-api-metrics/src/index.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/index.ts rename to experimental/packages/opentelemetry-api-metrics/src/index.ts diff --git a/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts b/experimental/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts rename to experimental/packages/opentelemetry-api-metrics/src/platform/browser/globalThis.ts diff --git a/packages/opentelemetry-api-metrics/src/platform/browser/index.ts b/experimental/packages/opentelemetry-api-metrics/src/platform/browser/index.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/platform/browser/index.ts rename to experimental/packages/opentelemetry-api-metrics/src/platform/browser/index.ts diff --git a/packages/opentelemetry-api-metrics/src/platform/index.ts b/experimental/packages/opentelemetry-api-metrics/src/platform/index.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/platform/index.ts rename to experimental/packages/opentelemetry-api-metrics/src/platform/index.ts diff --git a/packages/opentelemetry-api-metrics/src/platform/node/globalThis.ts b/experimental/packages/opentelemetry-api-metrics/src/platform/node/globalThis.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/platform/node/globalThis.ts rename to experimental/packages/opentelemetry-api-metrics/src/platform/node/globalThis.ts diff --git a/packages/opentelemetry-api-metrics/src/platform/node/index.ts b/experimental/packages/opentelemetry-api-metrics/src/platform/node/index.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/platform/node/index.ts rename to experimental/packages/opentelemetry-api-metrics/src/platform/node/index.ts diff --git a/packages/opentelemetry-api-metrics/src/types/BatchObserverResult.ts b/experimental/packages/opentelemetry-api-metrics/src/types/BatchObserverResult.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/BatchObserverResult.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/BatchObserverResult.ts diff --git a/packages/opentelemetry-api-metrics/src/types/BoundInstrument.ts b/experimental/packages/opentelemetry-api-metrics/src/types/BoundInstrument.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/BoundInstrument.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/BoundInstrument.ts diff --git a/packages/opentelemetry-api-metrics/src/types/Meter.ts b/experimental/packages/opentelemetry-api-metrics/src/types/Meter.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/Meter.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/Meter.ts diff --git a/packages/opentelemetry-api-metrics/src/types/MeterProvider.ts b/experimental/packages/opentelemetry-api-metrics/src/types/MeterProvider.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/MeterProvider.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/MeterProvider.ts diff --git a/packages/opentelemetry-api-metrics/src/types/Metric.ts b/experimental/packages/opentelemetry-api-metrics/src/types/Metric.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/Metric.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/Metric.ts diff --git a/packages/opentelemetry-api-metrics/src/types/Observation.ts b/experimental/packages/opentelemetry-api-metrics/src/types/Observation.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/Observation.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/Observation.ts diff --git a/packages/opentelemetry-api-metrics/src/types/ObserverResult.ts b/experimental/packages/opentelemetry-api-metrics/src/types/ObserverResult.ts similarity index 100% rename from packages/opentelemetry-api-metrics/src/types/ObserverResult.ts rename to experimental/packages/opentelemetry-api-metrics/src/types/ObserverResult.ts diff --git a/packages/opentelemetry-api-metrics/test/api/api.test.ts b/experimental/packages/opentelemetry-api-metrics/test/api/api.test.ts similarity index 100% rename from packages/opentelemetry-api-metrics/test/api/api.test.ts rename to experimental/packages/opentelemetry-api-metrics/test/api/api.test.ts diff --git a/packages/opentelemetry-api-metrics/test/api/global.test.ts b/experimental/packages/opentelemetry-api-metrics/test/api/global.test.ts similarity index 100% rename from packages/opentelemetry-api-metrics/test/api/global.test.ts rename to experimental/packages/opentelemetry-api-metrics/test/api/global.test.ts diff --git a/packages/opentelemetry-api-metrics/test/index-webpack.ts b/experimental/packages/opentelemetry-api-metrics/test/index-webpack.ts similarity index 100% rename from packages/opentelemetry-api-metrics/test/index-webpack.ts rename to experimental/packages/opentelemetry-api-metrics/test/index-webpack.ts diff --git a/packages/opentelemetry-api-metrics/test/noop-implementations/noop-meter.test.ts b/experimental/packages/opentelemetry-api-metrics/test/noop-implementations/noop-meter.test.ts similarity index 100% rename from packages/opentelemetry-api-metrics/test/noop-implementations/noop-meter.test.ts rename to experimental/packages/opentelemetry-api-metrics/test/noop-implementations/noop-meter.test.ts diff --git a/packages/opentelemetry-api-metrics/tsconfig.docs.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.docs.json similarity index 100% rename from packages/opentelemetry-api-metrics/tsconfig.docs.json rename to experimental/packages/opentelemetry-api-metrics/tsconfig.docs.json diff --git a/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.esm.json similarity index 78% rename from packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json rename to experimental/packages/opentelemetry-api-metrics/tsconfig.esm.json index a94adff6aa..379f547a46 100644 --- a/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-api-metrics/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/packages/opentelemetry-api-metrics/tsconfig.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.json similarity index 75% rename from packages/opentelemetry-api-metrics/tsconfig.json rename to experimental/packages/opentelemetry-api-metrics/tsconfig.json index b8d88215e4..ff9d6942fb 100644 --- a/packages/opentelemetry-api-metrics/tsconfig.json +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.es5.json", + "extends": "../../../tsconfig.es5.json", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/packages/opentelemetry-instrumentation-fetch/.eslintignore b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintignore similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/.eslintignore rename to experimental/packages/opentelemetry-instrumentation-fetch/.eslintignore diff --git a/packages/opentelemetry-instrumentation/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js similarity index 75% rename from packages/opentelemetry-instrumentation/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js index 9dfe62f9b8..e41d9a9299 100644 --- a/packages/opentelemetry-instrumentation/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-instrumentation-fetch/.npmignore b/experimental/packages/opentelemetry-instrumentation-fetch/.npmignore similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/.npmignore rename to experimental/packages/opentelemetry-instrumentation-fetch/.npmignore diff --git a/packages/opentelemetry-instrumentation-fetch/LICENSE b/experimental/packages/opentelemetry-instrumentation-fetch/LICENSE similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/LICENSE rename to experimental/packages/opentelemetry-instrumentation-fetch/LICENSE diff --git a/packages/opentelemetry-instrumentation-fetch/README.md b/experimental/packages/opentelemetry-instrumentation-fetch/README.md similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/README.md rename to experimental/packages/opentelemetry-instrumentation-fetch/README.md diff --git a/packages/opentelemetry-instrumentation-fetch/images/trace1.png b/experimental/packages/opentelemetry-instrumentation-fetch/images/trace1.png similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/images/trace1.png rename to experimental/packages/opentelemetry-instrumentation-fetch/images/trace1.png diff --git a/packages/opentelemetry-instrumentation-fetch/images/trace2.png b/experimental/packages/opentelemetry-instrumentation-fetch/images/trace2.png similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/images/trace2.png rename to experimental/packages/opentelemetry-instrumentation-fetch/images/trace2.png diff --git a/packages/opentelemetry-instrumentation-fetch/images/trace3.png b/experimental/packages/opentelemetry-instrumentation-fetch/images/trace3.png similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/images/trace3.png rename to experimental/packages/opentelemetry-instrumentation-fetch/images/trace3.png diff --git a/packages/opentelemetry-instrumentation-fetch/karma.conf.js b/experimental/packages/opentelemetry-instrumentation-fetch/karma.conf.js similarity index 86% rename from packages/opentelemetry-instrumentation-fetch/karma.conf.js rename to experimental/packages/opentelemetry-instrumentation-fetch/karma.conf.js index edcd9f055f..5e6d4aae41 100644 --- a/packages/opentelemetry-instrumentation-fetch/karma.conf.js +++ b/experimental/packages/opentelemetry-instrumentation-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/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json similarity index 95% rename from packages/opentelemetry-instrumentation-fetch/package.json rename to experimental/packages/opentelemetry-instrumentation-fetch/package.json index a18712648f..97a2f00ead 100644 --- a/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -12,12 +12,12 @@ "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", + "version": "node ../../../scripts/version-update.js", "tdd": "karma start", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "fetch", diff --git a/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts rename to experimental/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts diff --git a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/src/fetch.ts rename to experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts diff --git a/packages/opentelemetry-instrumentation-fetch/src/index.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/src/index.ts rename to experimental/packages/opentelemetry-instrumentation-fetch/src/index.ts diff --git a/packages/opentelemetry-instrumentation-fetch/src/types.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/src/types.ts rename to experimental/packages/opentelemetry-instrumentation-fetch/src/types.ts diff --git a/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts rename to experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts diff --git a/packages/opentelemetry-instrumentation-fetch/test/index-webpack.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/index-webpack.ts similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/test/index-webpack.ts rename to experimental/packages/opentelemetry-instrumentation-fetch/test/index-webpack.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json similarity index 54% rename from packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json rename to experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json index a94adff6aa..6bbf1dbea5 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.esm.json", + "extends": "../../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.esm.json" + } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json new file mode 100644 index 0000000000..41fa3be237 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation" + } + ] +} diff --git a/packages/opentelemetry-instrumentation-grpc/.eslintignore b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/.eslintignore rename to experimental/packages/opentelemetry-instrumentation-grpc/.eslintignore diff --git a/packages/opentelemetry-instrumentation-grpc/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js similarity index 65% rename from packages/opentelemetry-instrumentation-grpc/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js index f726f3becb..f756f4488b 100644 --- a/packages/opentelemetry-instrumentation-grpc/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-instrumentation-grpc/.npmignore b/experimental/packages/opentelemetry-instrumentation-grpc/.npmignore similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/.npmignore rename to experimental/packages/opentelemetry-instrumentation-grpc/.npmignore diff --git a/packages/opentelemetry-instrumentation-grpc/LICENSE b/experimental/packages/opentelemetry-instrumentation-grpc/LICENSE similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/LICENSE rename to experimental/packages/opentelemetry-instrumentation-grpc/LICENSE diff --git a/packages/opentelemetry-instrumentation-grpc/README.md b/experimental/packages/opentelemetry-instrumentation-grpc/README.md similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/README.md rename to experimental/packages/opentelemetry-instrumentation-grpc/README.md diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json similarity index 94% rename from packages/opentelemetry-instrumentation-grpc/package.json rename to experimental/packages/opentelemetry-instrumentation-grpc/package.json index 77ec2844ec..f415b0db58 100644 --- a/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -13,10 +13,10 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "opentelemetry", diff --git a/packages/opentelemetry-instrumentation-grpc/src/enums/AttributeNames.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/enums/AttributeNames.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/enums/AttributeNames.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/enums/AttributeNames.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/serverUtils.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/types.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/clientUtils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc/clientUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/clientUtils.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc/serverUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/serverUtils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc/serverUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/serverUtils.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/grpc/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/grpc/types.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/types.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/index.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/index.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/types.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts diff --git a/packages/opentelemetry-instrumentation-grpc/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/src/utils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts diff --git a/packages/opentelemetry-instrumentation-grpc/test/fixtures/grpc-test.proto b/experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/grpc-test.proto similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/test/fixtures/grpc-test.proto rename to experimental/packages/opentelemetry-instrumentation-grpc/test/fixtures/grpc-test.proto diff --git a/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/test/grpc-js.test.ts diff --git a/packages/opentelemetry-instrumentation-grpc/test/grpc.test.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/grpc.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/test/grpc.test.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/test/grpc.test.ts diff --git a/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts similarity index 99% rename from packages/opentelemetry-instrumentation-grpc/test/helper.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index 5a39f3fd68..559b9acf06 100644 --- a/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -19,7 +19,7 @@ import { SpanKind, propagation, trace, } from '@opentelemetry/api'; -import { W3CTraceContextPropagator } from '@opentelemetry/core'; +import { HttpTraceContextPropagator } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { ContextManager } from '@opentelemetry/api'; @@ -386,7 +386,7 @@ export const runTests = ( let contextManager: ContextManager; before(() => { - propagation.setGlobalPropagator(new W3CTraceContextPropagator()); + propagation.setGlobalPropagator(new HttpTraceContextPropagator()); }); beforeEach(() => { diff --git a/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts diff --git a/packages/opentelemetry-sdk-metrics-base/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json similarity index 62% rename from packages/opentelemetry-sdk-metrics-base/tsconfig.json rename to experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json index 949c710928..b0e33797f4 100644 --- a/packages/opentelemetry-sdk-metrics-base/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -13,10 +13,7 @@ "path": "../opentelemetry-api-metrics" }, { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-instrumentation" } ] } diff --git a/packages/opentelemetry-instrumentation-http/.eslintignore b/experimental/packages/opentelemetry-instrumentation-http/.eslintignore similarity index 100% rename from packages/opentelemetry-instrumentation-http/.eslintignore rename to experimental/packages/opentelemetry-instrumentation-http/.eslintignore diff --git a/packages/opentelemetry-instrumentation-http/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js similarity index 65% rename from packages/opentelemetry-instrumentation-http/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js index f726f3becb..f756f4488b 100644 --- a/packages/opentelemetry-instrumentation-http/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-http/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-instrumentation-http/.npmignore b/experimental/packages/opentelemetry-instrumentation-http/.npmignore similarity index 100% rename from packages/opentelemetry-instrumentation-http/.npmignore rename to experimental/packages/opentelemetry-instrumentation-http/.npmignore diff --git a/packages/opentelemetry-instrumentation-http/LICENSE b/experimental/packages/opentelemetry-instrumentation-http/LICENSE similarity index 100% rename from packages/opentelemetry-instrumentation-http/LICENSE rename to experimental/packages/opentelemetry-instrumentation-http/LICENSE diff --git a/packages/opentelemetry-instrumentation-http/README.md b/experimental/packages/opentelemetry-instrumentation-http/README.md similarity index 100% rename from packages/opentelemetry-instrumentation-http/README.md rename to experimental/packages/opentelemetry-instrumentation-http/README.md diff --git a/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json similarity index 95% rename from packages/opentelemetry-instrumentation-http/package.json rename to experimental/packages/opentelemetry-instrumentation-http/package.json index 1974c2ab75..4b2e428067 100644 --- a/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -13,10 +13,10 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "opentelemetry", diff --git a/packages/opentelemetry-instrumentation-http/src/enums/AttributeNames.ts b/experimental/packages/opentelemetry-instrumentation-http/src/enums/AttributeNames.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/src/enums/AttributeNames.ts rename to experimental/packages/opentelemetry-instrumentation-http/src/enums/AttributeNames.ts diff --git a/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/src/http.ts rename to experimental/packages/opentelemetry-instrumentation-http/src/http.ts diff --git a/packages/opentelemetry-instrumentation-http/src/index.ts b/experimental/packages/opentelemetry-instrumentation-http/src/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/src/index.ts rename to experimental/packages/opentelemetry-instrumentation-http/src/index.ts diff --git a/packages/opentelemetry-instrumentation-http/src/types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/src/types.ts rename to experimental/packages/opentelemetry-instrumentation-http/src/types.ts diff --git a/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/src/utils.ts rename to experimental/packages/opentelemetry-instrumentation-http/src/utils.ts diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/google-http.json b/experimental/packages/opentelemetry-instrumentation-http/test/fixtures/google-http.json similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/fixtures/google-http.json rename to experimental/packages/opentelemetry-instrumentation-http/test/fixtures/google-http.json diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/google-https.json b/experimental/packages/opentelemetry-instrumentation-http/test/fixtures/google-https.json similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/fixtures/google-https.json rename to experimental/packages/opentelemetry-instrumentation-http/test/fixtures/google-https.json diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh b/experimental/packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh rename to experimental/packages/opentelemetry-instrumentation-http/test/fixtures/regenerate.sh diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem b/experimental/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem rename to experimental/packages/opentelemetry-instrumentation-http/test/fixtures/server-cert.pem diff --git a/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem b/experimental/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem rename to experimental/packages/opentelemetry-instrumentation-http/test/fixtures/server-key.pem diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-disable.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-package.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-disable.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/https-package.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/integrations/http-enable.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/integrations/https-enable.test.ts diff --git a/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/utils/DummyPropagation.ts diff --git a/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/utils/assertSpan.ts diff --git a/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/utils/httpRequest.ts diff --git a/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/utils/httpsRequest.ts diff --git a/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/utils/rawRequest.ts diff --git a/packages/opentelemetry-instrumentation-http/test/utils/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/test/utils/utils.ts similarity index 100% rename from packages/opentelemetry-instrumentation-http/test/utils/utils.ts rename to experimental/packages/opentelemetry-instrumentation-http/test/utils/utils.ts diff --git a/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json new file mode 100644 index 0000000000..b172f492db --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation" + } + ] +} diff --git a/packages/opentelemetry-instrumentation-xml-http-request/.eslintignore b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintignore similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/.eslintignore rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintignore diff --git a/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js similarity index 75% rename from packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js index 01b8d09740..6ad6c9f216 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-instrumentation-xml-http-request/.npmignore b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.npmignore similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/.npmignore rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/.npmignore diff --git a/packages/opentelemetry-instrumentation-xml-http-request/LICENSE b/experimental/packages/opentelemetry-instrumentation-xml-http-request/LICENSE similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/LICENSE rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/LICENSE diff --git a/packages/opentelemetry-instrumentation-xml-http-request/README.md b/experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/README.md rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/README.md diff --git a/packages/opentelemetry-instrumentation-xml-http-request/images/cors.jpg b/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/cors.jpg similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/images/cors.jpg rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/images/cors.jpg diff --git a/packages/opentelemetry-instrumentation-xml-http-request/images/main.jpg b/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/main.jpg similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/images/main.jpg rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/images/main.jpg diff --git a/packages/opentelemetry-instrumentation-xml-http-request/images/request.jpg b/experimental/packages/opentelemetry-instrumentation-xml-http-request/images/request.jpg similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/images/request.jpg rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/images/request.jpg diff --git a/packages/opentelemetry-api-metrics/karma.conf.js b/experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js similarity index 86% rename from packages/opentelemetry-api-metrics/karma.conf.js rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js index 3019564a15..6174839d65 100644 --- a/packages/opentelemetry-api-metrics/karma.conf.js +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/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/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json similarity index 95% rename from packages/opentelemetry-instrumentation-xml-http-request/package.json rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 7c02542ca5..29fdfbb9f6 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -12,12 +12,12 @@ "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", + "version": "node ../../../scripts/version-update.js", "tdd": "karma start", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "opentelemetry", diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/enums/AttributeNames.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/AttributeNames.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/src/enums/AttributeNames.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/AttributeNames.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/enums/EventNames.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/EventNames.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/src/enums/EventNames.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/src/enums/EventNames.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/index.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/src/index.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/src/index.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/src/types.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/src/types.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/test/index-webpack.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/index-webpack.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/test/index-webpack.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/test/index-webpack.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/test/unmocked.test.ts diff --git a/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts b/experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/test/xhr.test.ts diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json new file mode 100644 index 0000000000..6bbf1dbea5 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.esm.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json new file mode 100644 index 0000000000..41fa3be237 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation" + } + ] +} diff --git a/packages/opentelemetry-instrumentation/.eslintignore b/experimental/packages/opentelemetry-instrumentation/.eslintignore similarity index 100% rename from packages/opentelemetry-instrumentation/.eslintignore rename to experimental/packages/opentelemetry-instrumentation/.eslintignore diff --git a/packages/opentelemetry-instrumentation-fetch/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js similarity index 75% rename from packages/opentelemetry-instrumentation-fetch/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation/.eslintrc.js index 9dfe62f9b8..e41d9a9299 100644 --- a/packages/opentelemetry-instrumentation-fetch/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-instrumentation/.gitignore b/experimental/packages/opentelemetry-instrumentation/.gitignore similarity index 100% rename from packages/opentelemetry-instrumentation/.gitignore rename to experimental/packages/opentelemetry-instrumentation/.gitignore diff --git a/packages/opentelemetry-instrumentation/.npmignore b/experimental/packages/opentelemetry-instrumentation/.npmignore similarity index 100% rename from packages/opentelemetry-instrumentation/.npmignore rename to experimental/packages/opentelemetry-instrumentation/.npmignore diff --git a/packages/opentelemetry-instrumentation/LICENSE b/experimental/packages/opentelemetry-instrumentation/LICENSE similarity index 100% rename from packages/opentelemetry-instrumentation/LICENSE rename to experimental/packages/opentelemetry-instrumentation/LICENSE diff --git a/packages/opentelemetry-instrumentation/README.md b/experimental/packages/opentelemetry-instrumentation/README.md similarity index 100% rename from packages/opentelemetry-instrumentation/README.md rename to experimental/packages/opentelemetry-instrumentation/README.md diff --git a/packages/opentelemetry-instrumentation/karma.conf.js b/experimental/packages/opentelemetry-instrumentation/karma.conf.js similarity index 87% rename from packages/opentelemetry-instrumentation/karma.conf.js rename to experimental/packages/opentelemetry-instrumentation/karma.conf.js index 455b1437c8..4c60b54edb 100644 --- a/packages/opentelemetry-instrumentation/karma.conf.js +++ b/experimental/packages/opentelemetry-instrumentation/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/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json similarity index 96% rename from packages/opentelemetry-instrumentation/package.json rename to experimental/packages/opentelemetry-instrumentation/package.json index a67e140633..a4b21cc46f 100644 --- a/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -43,10 +43,10 @@ "tdd:browser": "karma start", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "opentelemetry", diff --git a/packages/opentelemetry-instrumentation/src/autoLoader.ts b/experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/autoLoader.ts rename to experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts diff --git a/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts b/experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts rename to experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts diff --git a/packages/opentelemetry-instrumentation/src/index.ts b/experimental/packages/opentelemetry-instrumentation/src/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/index.ts rename to experimental/packages/opentelemetry-instrumentation/src/index.ts diff --git a/packages/opentelemetry-instrumentation/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/instrumentation.ts rename to experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/browser/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/browser/index.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/browser/index.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/browser/instrumentation.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/index.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/index.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/node/index.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/node/index.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/index.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleDefinition.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/node/require-in-the-middle.d.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/require-in-the-middle.d.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/node/require-in-the-middle.d.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/require-in-the-middle.d.ts diff --git a/packages/opentelemetry-instrumentation/src/platform/node/types.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/platform/node/types.ts rename to experimental/packages/opentelemetry-instrumentation/src/platform/node/types.ts diff --git a/packages/opentelemetry-instrumentation/src/types.ts b/experimental/packages/opentelemetry-instrumentation/src/types.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/types.ts rename to experimental/packages/opentelemetry-instrumentation/src/types.ts diff --git a/packages/opentelemetry-instrumentation/src/types_internal.ts b/experimental/packages/opentelemetry-instrumentation/src/types_internal.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/types_internal.ts rename to experimental/packages/opentelemetry-instrumentation/src/types_internal.ts diff --git a/packages/opentelemetry-instrumentation/src/utils.ts b/experimental/packages/opentelemetry-instrumentation/src/utils.ts similarity index 100% rename from packages/opentelemetry-instrumentation/src/utils.ts rename to experimental/packages/opentelemetry-instrumentation/src/utils.ts diff --git a/packages/opentelemetry-instrumentation/test/browser/index-webpack.ts b/experimental/packages/opentelemetry-instrumentation/test/browser/index-webpack.ts similarity index 100% rename from packages/opentelemetry-instrumentation/test/browser/index-webpack.ts rename to experimental/packages/opentelemetry-instrumentation/test/browser/index-webpack.ts diff --git a/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts rename to experimental/packages/opentelemetry-instrumentation/test/common/Instrumentation.test.ts diff --git a/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts rename to experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts diff --git a/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts rename to experimental/packages/opentelemetry-instrumentation/test/common/autoLoaderUtils.test.ts diff --git a/packages/opentelemetry-instrumentation/test/common/utils.test.ts b/experimental/packages/opentelemetry-instrumentation/test/common/utils.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation/test/common/utils.test.ts rename to experimental/packages/opentelemetry-instrumentation/test/common/utils.test.ts diff --git a/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts b/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts similarity index 100% rename from packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts rename to experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts diff --git a/packages/opentelemetry-api-metrics/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json similarity index 54% rename from packages/opentelemetry-api-metrics/tsconfig.esm.json rename to experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json index a94adff6aa..53f9deefd0 100644 --- a/packages/opentelemetry-api-metrics/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.esm.json", + "extends": "../../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-instrumentation/tsconfig.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.json similarity index 82% rename from packages/opentelemetry-instrumentation/tsconfig.json rename to experimental/packages/opentelemetry-instrumentation/tsconfig.json index 33b2f1cd61..948abef3ce 100644 --- a/packages/opentelemetry-instrumentation/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/packages/opentelemetry-sdk-metrics-base/.eslintignore b/experimental/packages/opentelemetry-sdk-metrics-base/.eslintignore similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/.eslintignore rename to experimental/packages/opentelemetry-sdk-metrics-base/.eslintignore diff --git a/packages/opentelemetry-sdk-metrics-base/.eslintrc.js b/experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js similarity index 65% rename from packages/opentelemetry-sdk-metrics-base/.eslintrc.js rename to experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js index f726f3becb..f756f4488b 100644 --- a/packages/opentelemetry-sdk-metrics-base/.eslintrc.js +++ b/experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-sdk-metrics-base/.npmignore b/experimental/packages/opentelemetry-sdk-metrics-base/.npmignore similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/.npmignore rename to experimental/packages/opentelemetry-sdk-metrics-base/.npmignore diff --git a/packages/opentelemetry-sdk-metrics-base/LICENSE b/experimental/packages/opentelemetry-sdk-metrics-base/LICENSE similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/LICENSE rename to experimental/packages/opentelemetry-sdk-metrics-base/LICENSE diff --git a/packages/opentelemetry-sdk-metrics-base/README.md b/experimental/packages/opentelemetry-sdk-metrics-base/README.md similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/README.md rename to experimental/packages/opentelemetry-sdk-metrics-base/README.md diff --git a/packages/opentelemetry-sdk-metrics-base/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/package.json similarity index 94% rename from packages/opentelemetry-sdk-metrics-base/package.json rename to experimental/packages/opentelemetry-sdk-metrics-base/package.json index 00d8068a86..773ff1e9f3 100644 --- a/packages/opentelemetry-sdk-metrics-base/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/package.json @@ -14,10 +14,10 @@ "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", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", - "prewatch": "npm run precompile" + "prewatch": "node ../../../scripts/version-update.js" }, "keywords": [ "opentelemetry", diff --git a/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/BaseObserverMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/BatchObserver.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/BatchObserver.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/BatchObserver.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/BatchObserver.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/BatchObserverResult.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/BoundInstrument.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/BoundInstrument.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/BoundInstrument.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/BoundInstrument.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/CounterMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/Meter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/Meter.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/Meter.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/Meter.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/Metric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/Metric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/Metric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/Metric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/ObserverResult.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/ObserverResult.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/ObserverResult.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/ObserverResult.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/SumObserverMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/UpDownCounterMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/UpDownSumObserverMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/UpDownSumObserverMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/UpDownSumObserverMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/UpDownSumObserverMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/Utils.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/Utils.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/Utils.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/Utils.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/ValueObserverMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/ValueObserverMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/ValueObserverMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/ValueObserverMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/ValueRecorderMetric.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/ConsoleMetricExporter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/ConsoleMetricExporter.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/ConsoleMetricExporter.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/ConsoleMetricExporter.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/Controller.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/Controller.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/Controller.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/Controller.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/NoopExporter.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/NoopExporter.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/NoopExporter.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/NoopExporter.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/Processor.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/Processor.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/Processor.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/Processor.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Histogram.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Histogram.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Histogram.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Histogram.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/LastValue.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/LastValue.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/aggregators/LastValue.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/LastValue.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Sum.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Sum.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Sum.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/Sum.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/index.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/index.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/aggregators/index.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/aggregators/index.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/export/types.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/export/types.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/export/types.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/export/types.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/index.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/index.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/index.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/index.ts diff --git a/packages/opentelemetry-sdk-metrics-base/src/types.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/types.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/src/types.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/src/types.ts diff --git a/packages/opentelemetry-sdk-metrics-base/test/Meter.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/Meter.test.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/test/Meter.test.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/test/Meter.test.ts diff --git a/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/test/MeterProvider.test.ts diff --git a/packages/opentelemetry-sdk-metrics-base/test/Processor.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/Processor.test.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/test/Processor.test.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/test/Processor.test.ts diff --git a/packages/opentelemetry-sdk-metrics-base/test/export/ConsoleMetricExporter.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/ConsoleMetricExporter.test.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/test/export/ConsoleMetricExporter.test.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/test/export/ConsoleMetricExporter.test.ts diff --git a/packages/opentelemetry-sdk-metrics-base/test/export/Controller.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/Controller.test.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/test/export/Controller.test.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/test/export/Controller.test.ts diff --git a/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts b/experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts similarity index 100% rename from packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts rename to experimental/packages/opentelemetry-sdk-metrics-base/test/export/aggregators/Histogram.test.ts diff --git a/packages/opentelemetry-instrumentation/tsconfig.esm.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json similarity index 54% rename from packages/opentelemetry-instrumentation/tsconfig.esm.json rename to experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json index a94adff6aa..53f9deefd0 100644 --- a/packages/opentelemetry-instrumentation/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.esm.json", + "extends": "../../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esm.json" + } ] } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json new file mode 100644 index 0000000000..948abef3ce --- /dev/null +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics" + } + ] +} diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json new file mode 100644 index 0000000000..f8c358faae --- /dev/null +++ b/experimental/tsconfig.esm.json @@ -0,0 +1,27 @@ +{ + "extends": "../tsconfig.base.esm.json", + "files": [], + "references": [ + { + "path": "packages/opentelemetry-api-metrics/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-instrumentation-grpc" + }, + { + "path": "packages/opentelemetry-instrumentation-http" + }, + { + "path": "packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-instrumentation/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json" + } + ] +} diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json new file mode 100644 index 0000000000..f92274f504 --- /dev/null +++ b/experimental/tsconfig.json @@ -0,0 +1,27 @@ +{ + "extends": "../tsconfig.base.json", + "files": [], + "references": [ + { + "path": "packages/opentelemetry-api-metrics" + }, + { + "path": "packages/opentelemetry-instrumentation-fetch" + }, + { + "path": "packages/opentelemetry-instrumentation-grpc" + }, + { + "path": "packages/opentelemetry-instrumentation-http" + }, + { + "path": "packages/opentelemetry-instrumentation-xml-http-request" + }, + { + "path": "packages/opentelemetry-instrumentation" + }, + { + "path": "packages/opentelemetry-sdk-metrics-base" + } + ] +} diff --git a/lerna.json b/lerna.json index 3eff7bbcea..5f3df4e8bd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,25 +1,11 @@ { "lerna": "3.13.4", + "version": "0.25.0", "npmClient": "npm", "packages": [ "benchmark/*", "backwards-compatability/*", - "metapackages/*", "packages/*", "integration-tests/*" - ], - "version": "independent", - "changelog": { - "repo": "open-telemetry/opentelemetry-js", - "labels": { - "breaking": ":boom: Breaking Change", - "enhancement": ":rocket: (Enhancement)", - "bug": ":bug: (Bug Fix)", - "core": ":wrench: Core", - "document": ":books: (Refine Doc)", - "feature-request": ":sparkles: (Feature)", - "internal": ":house: (Internal)" - }, - "cacheDir": ".changelog" - } + ] } diff --git a/package.json b/package.json index 3fbd495d42..56a145db98 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "bench": "node benchmark", - "postinstall": "update-ts-references && npm run bootstrap", + "postinstall": "npm run update-ts-references && npm run bootstrap", "postcompile": "npm run submodule && npm run protos:copy", "submodule": "git submodule sync --recursive && git submodule update --init --recursive", "protos:copy": "lerna run protos:copy", @@ -30,13 +30,14 @@ "lint:changed": "lerna run --concurrency 1 --stream lint --since HEAD --exclude-dependents", "lint:fix": "lerna run lint:fix", "lint:fix:changed": "lerna run --concurrency 1 --stream lint:fix --since HEAD --exclude-dependents", - "lint:examples": "eslint ./examples/**/*.js", - "lint:examples:fix": "eslint ./examples/**/*.js --fix", - "lint:getting-started": "eslint ./getting-started/**/*.{js,ts}", - "lint:getting-started:fix": "eslint ./getting-started/**/*.{js,ts} --fix", + "lint:examples": "eslint --no-error-on-unmatched-pattern ./examples/**/*.js", + "lint:examples:fix": "eslint --no-error-on-unmatched-pattern ./examples/**/*.js --fix", + "lint:getting-started": "eslint --no-error-on-unmatched-pattern ./getting-started/**/*.{js,ts}", + "lint:getting-started:fix": "eslint --no-error-on-unmatched-pattern ./getting-started/**/*.{js,ts} --fix", "lint:markdown": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md", "lint:markdown:fix": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md --fix", - "reset": "lerna clean -y && rm -rf node_modules && npm i && npm run compile && npm run lint:fix" + "reset": "lerna clean -y && rm -rf node_modules && npm i && npm run compile && npm run lint:fix", + "update-ts-references": "update-ts-references --configName tsconfig.esm.json && update-ts-references" }, "repository": "open-telemetry/opentelemetry-js", "keywords": [ @@ -74,5 +75,18 @@ "pre-commit": "npm run lint:changed", "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" } + }, + "changelog": { + "repo": "open-telemetry/opentelemetry-js", + "labels": { + "breaking": ":boom: Breaking Change", + "enhancement": ":rocket: (Enhancement)", + "bug": ":bug: (Bug Fix)", + "core": ":wrench: Core", + "document": ":books: (Refine Doc)", + "feature-request": ":sparkles: (Feature)", + "internal": ":house: (Internal)" + }, + "cacheDir": ".changelog" } } diff --git a/packages/opentelemetry-context-zone/tsconfig.esm.json b/packages/opentelemetry-context-zone/tsconfig.esm.json index a94adff6aa..ffc5a7aac2 100644 --- a/packages/opentelemetry-context-zone/tsconfig.esm.json +++ b/packages/opentelemetry-context-zone/tsconfig.esm.json @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-context-zone-peer-dep/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-core/tsconfig.esm.json b/packages/opentelemetry-core/tsconfig.esm.json index a94adff6aa..0b6bbbb13d 100644 --- a/packages/opentelemetry-core/tsconfig.esm.json +++ b/packages/opentelemetry-core/tsconfig.esm.json @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json index 66f3f6fc26..14cedee9b7 100644 --- a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json +++ b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json @@ -9,9 +9,6 @@ "test/**/*.ts" ], "references": [ - { - "path": "../opentelemetry-api-metrics" - }, { "path": "../opentelemetry-core" }, @@ -21,9 +18,6 @@ { "path": "../opentelemetry-resources" }, - { - "path": "../opentelemetry-sdk-metrics-base" - }, { "path": "../opentelemetry-sdk-trace-base" } diff --git a/packages/opentelemetry-exporter-collector-proto/tsconfig.json b/packages/opentelemetry-exporter-collector-proto/tsconfig.json index 66f3f6fc26..14cedee9b7 100644 --- a/packages/opentelemetry-exporter-collector-proto/tsconfig.json +++ b/packages/opentelemetry-exporter-collector-proto/tsconfig.json @@ -9,9 +9,6 @@ "test/**/*.ts" ], "references": [ - { - "path": "../opentelemetry-api-metrics" - }, { "path": "../opentelemetry-core" }, @@ -21,9 +18,6 @@ { "path": "../opentelemetry-resources" }, - { - "path": "../opentelemetry-sdk-metrics-base" - }, { "path": "../opentelemetry-sdk-trace-base" } diff --git a/packages/opentelemetry-exporter-collector/tsconfig.esm.json b/packages/opentelemetry-exporter-collector/tsconfig.esm.json index a94adff6aa..7a9bb54ea7 100644 --- a/packages/opentelemetry-exporter-collector/tsconfig.esm.json +++ b/packages/opentelemetry-exporter-collector/tsconfig.esm.json @@ -7,5 +7,16 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-exporter-collector/tsconfig.json b/packages/opentelemetry-exporter-collector/tsconfig.json index a555c90a2c..1d7ba827ac 100644 --- a/packages/opentelemetry-exporter-collector/tsconfig.json +++ b/packages/opentelemetry-exporter-collector/tsconfig.json @@ -9,18 +9,12 @@ "test/**/*.ts" ], "references": [ - { - "path": "../opentelemetry-api-metrics" - }, { "path": "../opentelemetry-core" }, { "path": "../opentelemetry-resources" }, - { - "path": "../opentelemetry-sdk-metrics-base" - }, { "path": "../opentelemetry-sdk-trace-base" } diff --git a/packages/opentelemetry-exporter-prometheus/tsconfig.json b/packages/opentelemetry-exporter-prometheus/tsconfig.json index 8c349908b1..789e61fc86 100644 --- a/packages/opentelemetry-exporter-prometheus/tsconfig.json +++ b/packages/opentelemetry-exporter-prometheus/tsconfig.json @@ -9,14 +9,8 @@ "test/**/*.ts" ], "references": [ - { - "path": "../opentelemetry-api-metrics" - }, { "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-sdk-metrics-base" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json index a94adff6aa..812ff19a36 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json @@ -7,5 +7,19 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/packages/opentelemetry-instrumentation-fetch/tsconfig.json deleted file mode 100644 index d2862ab2f9..0000000000 --- a/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-instrumentation" - }, - { - "path": "../opentelemetry-propagator-b3" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-sdk-trace-web" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/packages/opentelemetry-instrumentation-grpc/tsconfig.json deleted file mode 100644 index 798b42087c..0000000000 --- a/packages/opentelemetry-instrumentation-grpc/tsconfig.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-api-metrics" - }, - { - "path": "../opentelemetry-context-async-hooks" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-instrumentation" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-sdk-trace-node" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/packages/opentelemetry-instrumentation-http/tsconfig.json b/packages/opentelemetry-instrumentation-http/tsconfig.json deleted file mode 100644 index 57e43387e4..0000000000 --- a/packages/opentelemetry-instrumentation-http/tsconfig.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-async-hooks" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-instrumentation" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-sdk-trace-node" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json deleted file mode 100644 index d2862ab2f9..0000000000 --- a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-instrumentation" - }, - { - "path": "../opentelemetry-propagator-b3" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-sdk-trace-web" - }, - { - "path": "../opentelemetry-semantic-conventions" - } - ] -} diff --git a/packages/opentelemetry-propagator-b3/tsconfig.esm.json b/packages/opentelemetry-propagator-b3/tsconfig.esm.json index a94adff6aa..c809d9c9aa 100644 --- a/packages/opentelemetry-propagator-b3/tsconfig.esm.json +++ b/packages/opentelemetry-propagator-b3/tsconfig.esm.json @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json b/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json index a94adff6aa..c809d9c9aa 100644 --- a/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json +++ b/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json @@ -7,5 +7,10 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-resources/tsconfig.esm.json b/packages/opentelemetry-resources/tsconfig.esm.json index a94adff6aa..aa276f4b43 100644 --- a/packages/opentelemetry-resources/tsconfig.esm.json +++ b/packages/opentelemetry-resources/tsconfig.esm.json @@ -7,5 +7,13 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json b/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json deleted file mode 100644 index a94adff6aa..0000000000 --- a/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/packages/opentelemetry-sdk-node/tsconfig.json b/packages/opentelemetry-sdk-node/tsconfig.json index 8fc62b28e2..3c83ad6dc0 100644 --- a/packages/opentelemetry-sdk-node/tsconfig.json +++ b/packages/opentelemetry-sdk-node/tsconfig.json @@ -9,24 +9,15 @@ "test/**/*.ts" ], "references": [ - { - "path": "../opentelemetry-api-metrics" - }, { "path": "../opentelemetry-context-async-hooks" }, { "path": "../opentelemetry-core" }, - { - "path": "../opentelemetry-instrumentation" - }, { "path": "../opentelemetry-resources" }, - { - "path": "../opentelemetry-sdk-metrics-base" - }, { "path": "../opentelemetry-sdk-trace-base" }, diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json index a94adff6aa..5f0156d661 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json @@ -7,5 +7,16 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" + } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json index a94adff6aa..57e4813bbd 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json @@ -7,5 +7,25 @@ }, "include": [ "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-context-zone/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-core/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-propagator-b3/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" + } ] } diff --git a/release-please-config.json b/release-please-config.json deleted file mode 100644 index 9e5bd2373e..0000000000 --- a/release-please-config.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "bootstrap-sha": "0ef1fc28d366b74d98b73b5d6334ffdc75342fe2", - "plugins": ["node-workspace"], - "bump-minor-pre-major": true, - "packages": { - "packages/opentelemetry-api-metrics": {}, - "packages/opentelemetry-context-async-hooks": {}, - "packages/opentelemetry-context-zone-peer-dep": {}, - "packages/opentelemetry-context-zone": {}, - "packages/opentelemetry-core": {}, - "packages/opentelemetry-exporter-collector-grpc": {}, - "packages/opentelemetry-exporter-collector-proto": {}, - "packages/opentelemetry-exporter-collector": {}, - "packages/opentelemetry-exporter-jaeger": {}, - "packages/opentelemetry-exporter-prometheus": {}, - "packages/opentelemetry-exporter-zipkin": {}, - "packages/opentelemetry-instrumentation-fetch": {}, - "packages/opentelemetry-instrumentation-grpc": {}, - "packages/opentelemetry-instrumentation-http": {}, - "packages/opentelemetry-instrumentation-xml-http-request": {}, - "packages/opentelemetry-instrumentation": {}, - "packages/opentelemetry-propagator-b3": {}, - "packages/opentelemetry-propagator-jaeger": {}, - "packages/opentelemetry-resources": {}, - "packages/opentelemetry-sdk-metrics-base": {}, - "packages/opentelemetry-sdk-node": {}, - "packages/opentelemetry-sdk-trace-base": {}, - "packages/opentelemetry-sdk-trace-node": {}, - "packages/opentelemetry-sdk-trace-web": {}, - "packages/opentelemetry-semantic-conventions": {}, - "packages/opentelemetry-shim-opentracing": {} - } -} diff --git a/tsconfig.esm.json b/tsconfig.esm.json index f356253eaf..fe08269051 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -3,7 +3,16 @@ "files": [], "references": [ { - "path": "packages/opentelemetry-api-metrics/tsconfig.esm.json" + "path": "backwards-compatability/node10" + }, + { + "path": "backwards-compatability/node12" + }, + { + "path": "backwards-compatability/node8" + }, + { + "path": "packages/opentelemetry-context-async-hooks" }, { "path": "packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json" @@ -15,22 +24,22 @@ "path": "packages/opentelemetry-core/tsconfig.esm.json" }, { - "path": "packages/opentelemetry-exporter-collector/tsconfig.esm.json" + "path": "packages/opentelemetry-exporter-collector-grpc" }, { - "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json" + "path": "packages/opentelemetry-exporter-collector-proto" }, { - "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json" + "path": "packages/opentelemetry-exporter-collector/tsconfig.esm.json" }, { - "path": "packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json" + "path": "packages/opentelemetry-exporter-jaeger" }, { - "path": "packages/opentelemetry-instrumentation/tsconfig.esm.json" + "path": "packages/opentelemetry-exporter-prometheus" }, { - "path": "packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json" + "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json" }, { "path": "packages/opentelemetry-propagator-b3/tsconfig.esm.json" @@ -42,13 +51,28 @@ "path": "packages/opentelemetry-resources/tsconfig.esm.json" }, { - "path": "packages/opentelemetry-semantic-conventions/tsconfig.esm.json" + "path": "packages/opentelemetry-sdk-node" }, { "path": "packages/opentelemetry-sdk-trace-base/tsconfig.esm.json" }, + { + "path": "packages/opentelemetry-sdk-trace-node" + }, { "path": "packages/opentelemetry-sdk-trace-web/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-semantic-conventions/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-shim-opentracing" + }, + { + "path": "packages/template/tsconfig.esm.json" + }, + { + "path": "integration-tests/propagation-validation-server" } ] } diff --git a/tsconfig.json b/tsconfig.json index 5d981fde42..a1a6d880b5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -50,9 +50,6 @@ { "path": "backwards-compatability/node8" }, - { - "path": "packages/opentelemetry-api-metrics" - }, { "path": "packages/opentelemetry-context-async-hooks" }, @@ -83,21 +80,6 @@ { "path": "packages/opentelemetry-exporter-zipkin" }, - { - "path": "packages/opentelemetry-instrumentation-fetch" - }, - { - "path": "packages/opentelemetry-instrumentation-grpc" - }, - { - "path": "packages/opentelemetry-instrumentation-http" - }, - { - "path": "packages/opentelemetry-instrumentation-xml-http-request" - }, - { - "path": "packages/opentelemetry-instrumentation" - }, { "path": "packages/opentelemetry-propagator-b3" }, @@ -107,9 +89,6 @@ { "path": "packages/opentelemetry-resources" }, - { - "path": "packages/opentelemetry-sdk-metrics-base" - }, { "path": "packages/opentelemetry-sdk-node" },