Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into experimental-relax-…
Browse files Browse the repository at this point in the history
…deps
  • Loading branch information
Flarna committed Mar 28, 2022
2 parents 63f4a0e + da22673 commit 2dec106
Show file tree
Hide file tree
Showing 166 changed files with 2,369 additions and 216 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- name: restore lerna
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
node_modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/peer-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:

- name: Check API dependency semantics (experimental)
working-directory: experimental
run: lerna exec --ignore propagation-validation-server --ignore @opentelemetry/selenium-tests --ignore @opentelemetry/api-metrics-wip "node ../../../scripts/peer-api-check.js"
run: lerna exec --ignore propagation-validation-server --ignore @opentelemetry/selenium-tests --ignore @opentelemetry/api-metrics-wip --ignore @opentelemetry/otlp-transformer "node ../../../scripts/peer-api-check.js"
12 changes: 6 additions & 6 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: restore lerna
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
node_modules
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
uses: actions/checkout@v2

- name: restore lerna
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
run: sudo chmod -R 777 /github /__w

- name: restore lerna
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:

- name: restore lerna
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
experimental/node_modules
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
uses: actions/checkout@v2

- name: restore lerna
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
run: sudo chmod -R 777 /github /__w

- name: restore lerna
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: |
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "packages/exporter-trace-otlp-proto/protos"]
path = packages/exporter-trace-otlp-proto/protos
path = experimental/packages/exporter-trace-otlp-proto/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "packages/exporter-trace-otlp-grpc/protos"]
path = packages/exporter-trace-otlp-grpc/protos
path = experimental/packages/exporter-trace-otlp-grpc/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos
Expand Down
3 changes: 2 additions & 1 deletion .nycrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"test/**/*.*",
".eslintrc.js",
"karma.conf.js",
"webpack/*.js"
"webpack/*.js",
"src/generated/**"
],
"all": true
}
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ All notable changes to this project will be documented in this file.

## Unreleased

### Metrics

* [#2588](https://github.com/open-telemetry/opentelemetry-js/pull/2588) feat: spec compliant metric creation and sync instruments ([@dyladan](https://github.com/dyladan))
* [#2569](https://github.com/open-telemetry/opentelemetry-js/pull/2569) feat(api-metrics): async instruments spec compliance ([@legendecas](https://github.com/legendecas))
* [#2707](https://github.com/open-telemetry/opentelemetry-js/pull/2707) feat(sdk-metrics-base): update metric exporter interfaces ([@srikanthccv](https://github.com/srikanthccv))
Expand All @@ -23,6 +21,16 @@ All notable changes to this project will be documented in this file.
* [#2676](https://github.com/open-telemetry/opentelemetry-js/pull/2676) fix(sdk-metrics-base): remove aggregator.toMetricData dependency on AggregationTemporality ([@legendecas](https://github.com/legendecas))
* [#2725](https://github.com/open-telemetry/opentelemetry-js/pull/2725) feat(sdk-metrics-base): document and export basic APIs ([@legendecas](https://github.com/legendecas))
* [#2712](https://github.com/open-telemetry/opentelemetry-js/pull/2712) docs(api-metrics): add notes on ObservableResult.observe ([@legendecas](https://github.com/legendecas))
* [#2820](https://github.com/open-telemetry/opentelemetry-js/pull/2820) feat(views): Update addView() to disallow named views that select more than one instrument. ([@pichlermarc](https://github.com/pichlermarc))
* [#2829](https://github.com/open-telemetry/opentelemetry-js/pull/2829) feat(sdk-metrics-base): update exporting names ([@legendecas](https://github.com/legendecas))
* [#2813](https://github.com/open-telemetry/opentelemetry-js/pull/2813) Add grpc compression to trace-otlp-grpc exporter ([@svetlanabrennan](https://github.com/svetlanabrennan))
* [#2695](https://github.com/open-telemetry/opentelemetry-js/pull/2695) refactor: unifying shutdown once with BindOnceFuture ([@legendecas](https://github.com/legendecas))

## 1.1.1

* [#2849](https://github.com/open-telemetry/opentelemetry-js/pull/2849) fix: correct changelog and compat matrix for 1.1 release ([@Flarna](https://github.com/Flarna))
* [#2823](https://github.com/open-telemetry/opentelemetry-js/pull/2823) fix: enable downlevelIteration for es5 targets ([@legendecas](https://github.com/legendecas))
* [#2844](https://github.com/open-telemetry/opentelemetry-js/pull/2844) chore: add prepublishOnly to ensure a full build ([@legendecas](https://github.com/legendecas))

## 1.1.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ If you are a library author looking to build OpenTelemetry into your library, pl

Automated tests are run using the latest release of each currently active version of Node.JS.
While Node.JS v8 and v10 are no longer supported by the Node.JS team, the latest versions of Node.JS v8 and v10 are still included in our testing suite.
Please note that versions of Node.JS v8 prior to `v8.5.0` will NOT work, because OpenTelemetry Node depends on the `perf_hooks` module introduced in `v8.5.0`
Please note that versions of Node.JS v8 prior to `v8.12.0` will NOT work, because OpenTelemetry Node depends on the `perf_hooks` module introduced in `v8.5.0` and `performance.timeOrigin` that is set correctly starting in `v8.12.0`.

### Browser Support

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
"commonjs": true,
"node": true,
},
...require('../../eslint.config.js')
...require('../../../eslint.config.js')
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "1.1.0",
"private": "true",
"version": "0.27.0",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand All @@ -17,7 +16,7 @@
"submodule": "git submodule sync --recursive && git submodule update --init --recursive",
"tdd": "npm run test -- --watch-extensions ts --watch",
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "npm run protos:copy && tsc -w",
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
"prewatch": "npm run precompile"
Expand All @@ -34,7 +33,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.0.0"
"node": ">=8.12.0"
},
"files": [
"build/src/**/*.js",
Expand All @@ -50,7 +49,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api": "^1.0.3",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -68,11 +67,11 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/exporter-trace-otlp-http": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0"
"@opentelemetry/core": "1.1.1",
"@grpc/grpc-js": "^1.5.9",
"@grpc/proto-loader": "^0.6.9",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -11,15 +11,6 @@
"references": [
{
"path": "../exporter-trace-otlp-http"
},
{
"path": "../opentelemetry-core"
},
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-trace-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ module.exports = {
"node": true,
"browser": true
},
...require('../../eslint.config.js')
...require('../../../eslint.config.js')
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-http",
"version": "1.1.0",
"private": "true",
"version": "0.27.0",
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand All @@ -25,7 +24,7 @@
"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.all.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
"prewatch": "npm run precompile"
Expand All @@ -42,7 +41,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.0.0"
"node": ">=8.12.0"
},
"files": [
"build/esm/**/*.js",
Expand All @@ -63,7 +62,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api": "^1.0.3",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand Down Expand Up @@ -93,8 +92,8 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@opentelemetry/core": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0"
"@opentelemetry/core": "1.1.1",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"files": [],
"references": [
{ "path": "./tsconfig.json" },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.esm.json",
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.esnext.json",
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
Expand Down
11 changes: 11 additions & 0 deletions experimental/packages/exporter-trace-otlp-http/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
},
"include": [
"src/**/*.ts",
"test/**/*.ts"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module.exports = {
"commonjs": true,
"node": true,
},
...require('../../eslint.config.js')
...require('../../../eslint.config.js')
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-proto",
"version": "1.1.0",
"private": "true",
"version": "0.27.0",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand All @@ -17,7 +16,7 @@
"submodule": "git submodule sync --recursive && git submodule update --init --recursive",
"tdd": "npm run test -- --watch-extensions ts --watch",
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "npm run protos:copy && tsc -w",
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
"prewatch": "npm run precompile"
Expand All @@ -34,7 +33,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.0.0"
"node": ">=8.12.0"
},
"files": [
"build/src/**/*.js",
Expand All @@ -50,7 +49,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api": "^1.0.3",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -68,11 +67,11 @@
"@opentelemetry/api": "^1.0.3"
},
"dependencies": {
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "1.1.0",
"@opentelemetry/exporter-trace-otlp-http": "1.1.0",
"@opentelemetry/resources": "1.1.0",
"@opentelemetry/sdk-trace-base": "1.1.0",
"@opentelemetry/core": "1.1.1",
"@grpc/proto-loader": "^0.6.9",
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
"@opentelemetry/resources": "1.1.1",
"@opentelemetry/sdk-trace-base": "1.1.1",
"protobufjs": "^6.9.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -11,15 +11,6 @@
"references": [
{
"path": "../exporter-trace-otlp-http"
},
{
"path": "../opentelemetry-core"
},
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-trace-base"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.0.0"
"node": ">=8.12.0"
},
"files": [
"build/esm/**/*.js",
Expand Down
Loading

0 comments on commit 2dec106

Please sign in to comment.