diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index f5b35a208a1..ac939318f25 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -21,9 +21,6 @@ jobs: - uses: actions/setup-node@v2 with: node-version: ${{ matrix.node_version }} - - - name: Use lerna-stable.json - run: cp lerna-stable.json lerna.json - name: restore lerna id: cache @@ -62,9 +59,6 @@ jobs: - name: Permission Setup run: sudo chmod -R 777 /github /__w - - name: Use lerna-stable.json - run: cp lerna-stable.json lerna.json - - name: restore lerna uses: actions/cache@v2 id: cache @@ -104,33 +98,33 @@ jobs: - uses: actions/setup-node@v2 with: node-version: ${{ matrix.node_version }} - - - name: Use lerna-experimental.json - run: cp lerna-experimental.json lerna.json - name: restore lerna id: cache uses: actions/cache@v2 with: path: | - node_modules - */*/node_modules - key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} + 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 update-ts-references 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: @@ -145,30 +139,31 @@ jobs: - name: Permission Setup run: sudo chmod -R 777 /github /__w - - name: Use lerna-experimental.json - run: cp lerna-experimental.json lerna.json - - name: restore lerna uses: actions/cache@v2 id: cache with: path: | - node_modules - */*/node_modules + 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 🔧 + working-directory: experimental run: | npm run update-ts-references 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/.gitignore b/.gitignore index 4c7b490e1e9..65c8373b084 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,3 @@ package.json.lerna_backup #IDEA .idea *.iml - -# Symlink lerna-experimental.json or lerna-stable.json -lerna.json diff --git a/experimental/lerna.json b/experimental/lerna.json new file mode 100644 index 00000000000..99276cc155d --- /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 00000000000..4e26811d416 --- /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 100% rename from packages/opentelemetry-api-metrics/.eslintrc.js rename to experimental/packages/opentelemetry-api-metrics/.eslintrc.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-api-metrics/karma.conf.js b/experimental/packages/opentelemetry-api-metrics/karma.conf.js similarity index 100% rename from packages/opentelemetry-api-metrics/karma.conf.js rename to experimental/packages/opentelemetry-api-metrics/karma.conf.js 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 1a9f36ee753..83950b2687b 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-api-metrics/tsconfig.esm.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.esm.json similarity index 78% rename from packages/opentelemetry-api-metrics/tsconfig.esm.json rename to experimental/packages/opentelemetry-api-metrics/tsconfig.esm.json index a94adff6aa8..379f547a469 100644 --- a/packages/opentelemetry-api-metrics/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 b8d88215e40..ff9d6942fb6 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-fetch/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js similarity index 100% rename from packages/opentelemetry-instrumentation-fetch/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.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 100% rename from packages/opentelemetry-instrumentation-fetch/karma.conf.js rename to experimental/packages/opentelemetry-instrumentation-fetch/karma.conf.js 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 a18712648f2..97a2f00eade 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 85% rename from packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json rename to experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json index 7364807168a..6bbf1dbea54 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", diff --git a/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json similarity index 84% rename from packages/opentelemetry-instrumentation-fetch/tsconfig.json rename to experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json index 1b584dde66f..41fa3be2377 100644 --- a/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build", 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 100% rename from packages/opentelemetry-instrumentation-grpc/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-grpc/.eslintrc.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 77ec2844ec7..f415b0db58b 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 100% rename from packages/opentelemetry-instrumentation-grpc/test/helper.ts rename to experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts 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-instrumentation-grpc/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json similarity index 86% rename from packages/opentelemetry-instrumentation-grpc/tsconfig.json rename to experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json index 02bd7a8f5bd..b0e33797f42 100644 --- a/packages/opentelemetry-instrumentation-grpc/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" 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 100% rename from packages/opentelemetry-instrumentation-http/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-http/.eslintrc.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 1974c2ab750..4b2e4280671 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/packages/opentelemetry-instrumentation-http/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json similarity index 83% rename from packages/opentelemetry-instrumentation-http/tsconfig.json rename to experimental/packages/opentelemetry-instrumentation-http/tsconfig.json index 74f7a568399..b172f492dba 100644 --- a/packages/opentelemetry-instrumentation-http/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" 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 100% rename from packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.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-instrumentation-xml-http-request/karma.conf.js b/experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js similarity index 100% rename from packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/karma.conf.js 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 7c02542ca5a..29fdfbb9f63 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/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json similarity index 85% rename from packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json index 7364807168a..6bbf1dbea54 100644 --- a/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/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-instrumentation-xml-http-request/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json similarity index 84% rename from packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json rename to experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json index 1b584dde66f..41fa3be2377 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build", 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/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js similarity index 100% rename from packages/opentelemetry-instrumentation/.eslintrc.js rename to experimental/packages/opentelemetry-instrumentation/.eslintrc.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 100% rename from packages/opentelemetry-instrumentation/karma.conf.js rename to experimental/packages/opentelemetry-instrumentation/karma.conf.js 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 a67e140633d..a4b21cc46f1 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-instrumentation/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json similarity index 85% rename from packages/opentelemetry-instrumentation/tsconfig.esm.json rename to experimental/packages/opentelemetry-instrumentation/tsconfig.esm.json index ff311f2ff2e..53f9deefd02 100644 --- a/packages/opentelemetry-instrumentation/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", 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 33b2f1cd61a..948abef3ceb 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 100% rename from packages/opentelemetry-sdk-metrics-base/.eslintrc.js rename to experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.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 00d8068a864..773ff1e9f3c 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/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json new file mode 100644 index 00000000000..53f9deefd02 --- /dev/null +++ b/experimental/packages/opentelemetry-sdk-metrics-base/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-api-metrics/tsconfig.esm.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-metrics-base/tsconfig.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json similarity index 55% rename from packages/opentelemetry-sdk-metrics-base/tsconfig.json rename to experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json index 6549996003e..948abef3ceb 100644 --- a/packages/opentelemetry-sdk-metrics-base/tsconfig.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -10,10 +10,7 @@ ], "references": [ { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-api-metrics" } ] } diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json new file mode 100644 index 00000000000..f8c358faae7 --- /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 00000000000..f92274f5049 --- /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-experimental.json b/lerna-experimental.json deleted file mode 100644 index f078beb6aee..00000000000 --- a/lerna-experimental.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "lerna": "3.13.4", - "version": "0.25.0", - "npmClient": "npm", - "packages": [ - "packages/opentelemetry-api-metrics", - "packages/opentelemetry-sdk-metrics-base", - "packages/opentelemetry-instrumentation", - "packages/opentelemetry-instrumentation-fetch", - "packages/opentelemetry-instrumentation-grpc", - "packages/opentelemetry-instrumentation-http", - "packages/opentelemetry-instrumentation-xml-http-request" - ] -} diff --git a/lerna-stable.json b/lerna-stable.json deleted file mode 100644 index 51ba2fbc14c..00000000000 --- a/lerna-stable.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "lerna": "3.13.4", - "version": "0.25.0", - "npmClient": "npm", - "packages": [ - "backwards-compatability/*", - "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-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/lerna.json b/lerna.json new file mode 100644 index 00000000000..5f3df4e8bd0 --- /dev/null +++ b/lerna.json @@ -0,0 +1,11 @@ +{ + "lerna": "3.13.4", + "version": "0.25.0", + "npmClient": "npm", + "packages": [ + "benchmark/*", + "backwards-compatability/*", + "packages/*", + "integration-tests/*" + ] +} diff --git a/package.json b/package.json index 45f8d5a3b19..d43ae946de3 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,7 @@ "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", - "update-ts-references": "update-ts-references --configName tsconfig.esm.json && update-ts-references", - "use:stable": "shx rm lerna.json && shx cp lerna-stable.json lerna.json", - "use:experimental": "shx rm lerna.json && shx cp lerna-experimental.json lerna.json" + "update-ts-references": "update-ts-references --configName tsconfig.esm.json && update-ts-references" }, "repository": "open-telemetry/opentelemetry-js", "keywords": [ @@ -68,7 +66,6 @@ "lerna": "3.22.1", "lerna-changelog": "1.0.1", "markdownlint-cli": "0.28.1", - "shx": "0.3.3", "typedoc": "0.21.6", "typescript": "4.3.5", "update-ts-references": "2.4.0" diff --git a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json index f18383e417a..14cedee9b7d 100644 --- a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json +++ b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json @@ -18,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 f18383e417a..14cedee9b7d 100644 --- a/packages/opentelemetry-exporter-collector-proto/tsconfig.json +++ b/packages/opentelemetry-exporter-collector-proto/tsconfig.json @@ -18,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 e3fa2f80751..7a9bb54ea7d 100644 --- a/packages/opentelemetry-exporter-collector/tsconfig.esm.json +++ b/packages/opentelemetry-exporter-collector/tsconfig.esm.json @@ -15,9 +15,6 @@ { "path": "../opentelemetry-resources/tsconfig.esm.json" }, - { - "path": "../opentelemetry-sdk-metrics-base/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 68516dfbf25..1d7ba827ac5 100644 --- a/packages/opentelemetry-exporter-collector/tsconfig.json +++ b/packages/opentelemetry-exporter-collector/tsconfig.json @@ -15,9 +15,6 @@ { "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 08d6565ef99..789e61fc86b 100644 --- a/packages/opentelemetry-exporter-prometheus/tsconfig.json +++ b/packages/opentelemetry-exporter-prometheus/tsconfig.json @@ -11,9 +11,6 @@ "references": [ { "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-sdk-metrics-base" } ] } 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 115b3251264..00000000000 --- a/packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm.json" - } - ] -} diff --git a/packages/opentelemetry-sdk-node/tsconfig.json b/packages/opentelemetry-sdk-node/tsconfig.json index 37e3b4921db..3c83ad6dc07 100644 --- a/packages/opentelemetry-sdk-node/tsconfig.json +++ b/packages/opentelemetry-sdk-node/tsconfig.json @@ -18,9 +18,6 @@ { "path": "../opentelemetry-resources" }, - { - "path": "../opentelemetry-sdk-metrics-base" - }, { "path": "../opentelemetry-sdk-trace-base" }, diff --git a/tsconfig.esm.json b/tsconfig.esm.json index c1a5798e4b7..fe082690510 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -50,9 +50,6 @@ { "path": "packages/opentelemetry-resources/tsconfig.esm.json" }, - { - "path": "packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json" - }, { "path": "packages/opentelemetry-sdk-node" }, @@ -70,6 +67,12 @@ }, { "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 d9ebc2b9b19..a1a6d880b57 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -89,9 +89,6 @@ { "path": "packages/opentelemetry-resources" }, - { - "path": "packages/opentelemetry-sdk-metrics-base" - }, { "path": "packages/opentelemetry-sdk-node" }, @@ -109,6 +106,12 @@ }, { "path": "packages/opentelemetry-shim-opentracing" + }, + { + "path": "packages/template" + }, + { + "path": "integration-tests/propagation-validation-server" } ] }