diff --git a/README.md b/README.md index af2a9033c0..32ccfda003 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a | API Version | Core version | Contrib Version | | ----------- |--------------|-------------------------| +| v1.0.0-rc.0 | ------ | ------ | | 0.18.x | 0.18.x | 0.14.x | | | 0.17.x | ------ | | | 0.16.x | ------ | @@ -219,8 +220,8 @@ These plugins are hosted at -- [@opentelemetry/plugin-document-load][otel-contrib-plugin-document-load] -- [@opentelemetry/plugin-user-interaction][otel-contrib-plugin-user-interaction] +- [@opentelemetry/instrumentation-document-load][otel-contrib-instrumentation-document-load] +- [@opentelemetry/instrumentation-user-interaction][otel-contrib-instrumentation-user-interaction] To request automatic tracing support for a module not on this list, please [file an issue](https://github.com/open-telemetry/opentelemetry-js/issues). Alternatively, you can [write an instrumentation yourself](https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/instrumentation-guide.md). @@ -435,7 +436,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [otel-contrib-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-pg [otel-contrib-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-redis [otel-contrib-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-express -[otel-contrib-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-user-interaction -[otel-contrib-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-document-load -[otel-contrib-hapi-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-hapi-instrumentation -[otel-contrib-koa-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-koa-instrumentation +[otel-contrib-instrumentation-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-instrumentation-user-interaction +[otel-contrib-instrumentation-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-instrumentation-document-load +[otel-contrib-instrumentation-hapi]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-hapi +[otel-contrib-instrumentation-koa]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-koa diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json index 7b195eadeb..0cd01f7597 100644 --- a/backwards-compatability/node10/package.json +++ b/backwards-compatability/node10/package.json @@ -12,8 +12,8 @@ "@opentelemetry/tracing": "^0.18.0" }, "devDependencies": { - "@types/node": "10.17.50", - "typescript": "4.1.3" + "@types/node": "10.17.55", + "typescript": "4.2.3" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0" diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json index 464d06eab0..265a118491 100644 --- a/backwards-compatability/node12/package.json +++ b/backwards-compatability/node12/package.json @@ -12,8 +12,8 @@ "@opentelemetry/tracing": "^0.18.0" }, "devDependencies": { - "@types/node": "12.19.13", - "typescript": "4.1.3" + "@types/node": "12.20.6", + "typescript": "4.2.3" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0" diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json index 784f6c9995..f85d56fec7 100644 --- a/backwards-compatability/node8/package.json +++ b/backwards-compatability/node8/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@types/node": "8.10.66", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0" diff --git a/eslint.config.js b/eslint.config.js index 41a0079299..af60d20dfb 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -26,6 +26,7 @@ module.exports = { "leadingUnderscore": "require" } ], + "no-console": "error", "no-shadow": "off", "@typescript-eslint/no-shadow": ["warn"], "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_", "args": "after-used"}], diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json index c103f87a84..ea261a4161 100644 --- a/examples/basic-tracer-node/package.json +++ b/examples/basic-tracer-node/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/exporter-jaeger": "^0.18.0", "@opentelemetry/tracing": "^0.18.0" }, diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json index b95d1d0c3d..407f135d1d 100644 --- a/examples/collector-exporter-node/package.json +++ b/examples/collector-exporter-node/package.json @@ -28,7 +28,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/exporter-collector": "^0.18.0", "@opentelemetry/exporter-collector-grpc": "^0.18.0", diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json index a27bc322d5..a73eb0ed80 100644 --- a/examples/grpc-js/package.json +++ b/examples/grpc-js/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@grpc/grpc-js": "^1.0.5", - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/exporter-jaeger": "^0.18.0", "@opentelemetry/exporter-zipkin": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", diff --git a/examples/grpc/package.json b/examples/grpc/package.json index 5a444ad575..53ab194b5d 100644 --- a/examples/grpc/package.json +++ b/examples/grpc/package.json @@ -28,7 +28,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/exporter-jaeger": "^0.18.0", "@opentelemetry/exporter-zipkin": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", diff --git a/examples/http/package.json b/examples/http/package.json index 1b33c1380c..99b3ef2b60 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -28,7 +28,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/exporter-jaeger": "^0.18.0", "@opentelemetry/exporter-zipkin": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", diff --git a/examples/https/package.json b/examples/https/package.json index e3b9ceac6c..ef86b5da32 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -29,7 +29,7 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/exporter-jaeger": "^0.18.0", "@opentelemetry/exporter-zipkin": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", diff --git a/examples/tracer-web/README.md b/examples/tracer-web/README.md index bf6f4694d1..785b2d9de5 100644 --- a/examples/tracer-web/README.md +++ b/examples/tracer-web/README.md @@ -20,14 +20,6 @@ By default, the application will run on port `8090`. ## Examples -### Document Load - -To see the results, open the browser at and make sure you have the browser console open. The application is using the `ConsoleSpanExporter` and will post the created spans to the browser console. - -The screen will look as follows: - -![Screenshot of the running example](images/document-load.png) - ### XMLHttpRequest To see the results, open the browser at and make sure you have the browser console open. The application is using the `ConsoleSpanExporter` and will post the created spans to the browser console. diff --git a/examples/tracer-web/examples/document-load/index.html b/examples/tracer-web/examples/document-load/index.html deleted file mode 100644 index 8df377cc52..0000000000 --- a/examples/tracer-web/examples/document-load/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Document Load Plugin Example - - - - - - - - - - Example of using Web Tracer with document load plugin with console exporter and collector exporter - -
- - - - - diff --git a/examples/tracer-web/examples/document-load/index.js b/examples/tracer-web/examples/document-load/index.js deleted file mode 100644 index 610862f2c9..0000000000 --- a/examples/tracer-web/examples/document-load/index.js +++ /dev/null @@ -1,92 +0,0 @@ -import { context, getSpan, setSpan } from '@opentelemetry/api'; -import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/tracing'; -import { WebTracerProvider } from '@opentelemetry/web'; -import { DocumentLoad } from '@opentelemetry/plugin-document-load'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { CollectorTraceExporter } from '@opentelemetry/exporter-collector'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; - -const provider = new WebTracerProvider(); - -registerInstrumentations({ - instrumentations: [new DocumentLoad()], - tracerProvider: provider, -}); - -provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -provider.addSpanProcessor(new SimpleSpanProcessor(new CollectorTraceExporter())); - -provider.register({ - contextManager: new ZoneContextManager(), -}); - -const tracer = provider.getTracer('example-tracer-web'); - -const getData = (url) => new Promise((resolve, reject) => { - // eslint-disable-next-line no-undef - const req = new XMLHttpRequest(); - req.open('GET', url, true); - req.send(); - req.onload = () => { - let json; - try { - json = JSON.parse(req.responseText); - } catch (e) { - reject(e); - } - resolve(json); - }; -}); - -// example of keeping track of context between async operations -const prepareClickEvent = () => { - const url1 = 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/master/package.json'; - const url2 = 'https://raw.githubusercontent.com/open-telemetry/opentelemetry-js/master/packages/opentelemetry-web/package.json'; - - const element = document.getElementById('button1'); - - const onClick = () => { - let count = 0; - - function finish() { - count++; - if (count === 2) { - mainSpan.end(); - } - } - - const mainSpan = tracer.startSpan('click button'); - context.with(setSpan(context.active(), mainSpan), () => { - const span1 = tracer.startSpan('files-series-info-1'); - - const span2 = tracer.startSpan('files-series-info-2'); - - context.with(setSpan(context.active(), span1), () => { - getData(url1).then((data) => { - const curSpan = getSpan(context.active()); - console.log('current span is span1', curSpan === span1); - console.log('info from package.json', data.description, data.version); - curSpan.addEvent('fetching-span1-completed'); - span1.end(); - finish(); - }); - }); - - context.with(setSpan(context.active(), span2), () => { - getData(url2).then((data) => { - setTimeout(() => { - const curSpan = getSpan(context.active()); - console.log('current span is span2', curSpan === span2); - console.log('info from package.json', data.description, data.version); - curSpan.addEvent('fetching-span2-completed'); - span2.end(); - finish(); - }, 100); - }); - }); - }); - }; - element.addEventListener('click', onClick); -}; - -window.addEventListener('load', prepareClickEvent); diff --git a/examples/tracer-web/examples/user-interaction/index.html b/examples/tracer-web/examples/user-interaction/index.html deleted file mode 100644 index c22edf2d12..0000000000 --- a/examples/tracer-web/examples/user-interaction/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - User Interaction Example - - - - - - - - - - Example of using Web Tracer with UserInteractionPlugin and XMLHttpRequestInstrumentation with console exporter and collector exporter - -
- -
-
-
-
-
-
-
-
- - - - diff --git a/examples/tracer-web/examples/user-interaction/index.js b/examples/tracer-web/examples/user-interaction/index.js deleted file mode 100644 index ce951d2a41..0000000000 --- a/examples/tracer-web/examples/user-interaction/index.js +++ /dev/null @@ -1,87 +0,0 @@ -import { ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/tracing'; -import { WebTracerProvider } from '@opentelemetry/web'; -import { UserInteractionPlugin } from '@opentelemetry/plugin-user-interaction'; -import { ZoneContextManager } from '@opentelemetry/context-zone'; -import { CollectorTraceExporter } from '@opentelemetry/exporter-collector'; -import { B3Propagator } from '@opentelemetry/propagator-b3'; -import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; - -const providerWithZone = new WebTracerProvider(); - -registerInstrumentations({ - instrumentations: [ - new UserInteractionPlugin(), - new XMLHttpRequestInstrumentation({ - ignoreUrls: [/localhost/], - propagateTraceHeaderCorsUrls: [ - 'http://localhost:8090', - ], - }), - ], - tracerProvider: providerWithZone, -}); - -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); -providerWithZone.addSpanProcessor(new SimpleSpanProcessor(new CollectorTraceExporter())); - -providerWithZone.register({ - contextManager: new ZoneContextManager(), - propagator: new B3Propagator(), -}); - -let lastButtonId = 0; - -function btnAddClick() { - lastButtonId++; - const btn = document.createElement('button'); - // for easier testing of element xpath - let navigate = false; - if (lastButtonId % 2 === 0) { - btn.setAttribute('id', `button${lastButtonId}`); - navigate = true; - } - btn.setAttribute('class', `buttonClass${lastButtonId}`); - btn.append(document.createTextNode(`Click ${lastButtonId}`)); - btn.addEventListener('click', onClick.bind(this, navigate)); - document.querySelector('#buttons').append(btn); -} - -function prepareClickEvents() { - for (let i = 0; i < 5; i++) { - btnAddClick(); - } - const btnAdd = document.getElementById('btnAdd'); - btnAdd.addEventListener('click', btnAddClick); -} - -function onClick(navigate) { - if (navigate) { - history.pushState({ test: 'testing' }, '', `${location.pathname}`); - history.pushState({ test: 'testing' }, '', `${location.pathname}#foo=bar1`); - } - getData('https://httpbin.org/get?a=1').then(() => { - getData('https://httpbin.org/get?a=1').then(() => { - console.log('data downloaded 2'); - }); - getData('https://httpbin.org/get?a=1').then(() => { - console.log('data downloaded 3'); - }); - console.log('data downloaded 1'); - }); -} - -function getData(url, resolve) { - return new Promise(async (resolve, reject) => { - const req = new XMLHttpRequest(); - req.open('GET', url, true); - req.setRequestHeader('Content-Type', 'application/json'); - req.setRequestHeader('Accept', 'application/json'); - req.send(); - req.onload = function () { - resolve(); - }; - }); -} - -window.addEventListener('load', prepareClickEvents); diff --git a/examples/tracer-web/images/document-load.png b/examples/tracer-web/images/document-load.png deleted file mode 100644 index 5a2e23e808..0000000000 Binary files a/examples/tracer-web/images/document-load.png and /dev/null differ diff --git a/examples/tracer-web/package.json b/examples/tracer-web/package.json index cf95a7ab20..5c428587ae 100644 --- a/examples/tracer-web/package.json +++ b/examples/tracer-web/package.json @@ -34,7 +34,7 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/context-zone": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/exporter-collector": "^0.18.0", @@ -43,8 +43,6 @@ "@opentelemetry/instrumentation-fetch": "^0.18.0", "@opentelemetry/instrumentation-xml-http-request": "^0.18.0", "@opentelemetry/metrics": "^0.18.0", - "@opentelemetry/plugin-document-load": "^0.12.0", - "@opentelemetry/plugin-user-interaction": "^0.12.0", "@opentelemetry/propagator-b3": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", "@opentelemetry/web": "^0.18.0" diff --git a/examples/tracer-web/webpack.config.js b/examples/tracer-web/webpack.config.js index 00773db28b..e47148709e 100644 --- a/examples/tracer-web/webpack.config.js +++ b/examples/tracer-web/webpack.config.js @@ -7,11 +7,9 @@ const directory = path.resolve(__dirname); const common = { mode: 'development', entry: { - 'document-load': 'examples/document-load/index.js', metrics: 'examples/metrics/index.js', fetch: 'examples/fetch/index.js', 'xml-http-request': 'examples/xml-http-request/index.js', - 'user-interaction': 'examples/user-interaction/index.js', zipkin: 'examples/zipkin/index.js', }, output: { diff --git a/getting-started/traced-example/package.json b/getting-started/traced-example/package.json index 9ef1b52aed..cfb5bcd21d 100644 --- a/getting-started/traced-example/package.json +++ b/getting-started/traced-example/package.json @@ -9,14 +9,14 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^0.14.0", - "@opentelemetry/exporter-zipkin": "^0.14.0", - "@opentelemetry/node": "^0.14.0", + "@opentelemetry/core": "^0.18.0", + "@opentelemetry/exporter-zipkin": "^0.18.0", + "@opentelemetry/node": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", - "@opentelemetry/plugin-express": "^0.12.1", - "@opentelemetry/plugin-http": "^0.14.0", - "@opentelemetry/plugin-https": "^0.14.0", - "@opentelemetry/tracing": "^0.14.0", + "@opentelemetry/plugin-express": "^0.14.0", + "@opentelemetry/plugin-http": "^0.18.0", + "@opentelemetry/plugin-https": "^0.18.0", + "@opentelemetry/tracing": "^0.18.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/getting-started/ts-example/example/package.json b/getting-started/ts-example/example/package.json index 8deba467f9..3a6943f0be 100644 --- a/getting-started/ts-example/example/package.json +++ b/getting-started/ts-example/example/package.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "devDependencies": { "@types/express": "4.17.11", - "@types/node": "14.14.20", + "@types/node": "14.14.35", "ts-node": "8.10.2" }, "dependencies": { diff --git a/getting-started/ts-example/monitored-example/package.json b/getting-started/ts-example/monitored-example/package.json index de359ac878..48488a39f5 100644 --- a/getting-started/ts-example/monitored-example/package.json +++ b/getting-started/ts-example/monitored-example/package.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "devDependencies": { "@types/express": "4.17.11", - "@types/node": "14.14.20", + "@types/node": "14.14.35", "ts-node": "8.10.2" }, "dependencies": { diff --git a/getting-started/ts-example/traced-example/package.json b/getting-started/ts-example/traced-example/package.json index fa4b2cff95..38043ffa7b 100644 --- a/getting-started/ts-example/traced-example/package.json +++ b/getting-started/ts-example/traced-example/package.json @@ -10,17 +10,17 @@ "license": "Apache-2.0", "devDependencies": { "@types/express": "4.17.11", - "@types/node": "14.14.20", + "@types/node": "14.14.35", "ts-node": "9.1.1" }, "dependencies": { - "@opentelemetry/core": "^0.14.0", - "@opentelemetry/exporter-zipkin": "^0.14.0", - "@opentelemetry/node": "^0.14.0", - "@opentelemetry/plugin-express": "^0.12.1", - "@opentelemetry/plugin-http": "^0.14.0", - "@opentelemetry/plugin-https": "^0.14.0", - "@opentelemetry/tracing": "^0.14.0", + "@opentelemetry/core": "^0.18.0", + "@opentelemetry/exporter-zipkin": "^0.18.0", + "@opentelemetry/node": "^0.18.0", + "@opentelemetry/plugin-express": "^0.14.0", + "@opentelemetry/plugin-http": "^0.18.0", + "@opentelemetry/plugin-https": "^0.18.0", + "@opentelemetry/tracing": "^0.18.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 94c6c7cf65..c88c85689c 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -11,7 +11,7 @@ "compile": "tsc --build" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/context-async-hooks": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", @@ -20,6 +20,6 @@ "express": "4.17.1" }, "devDependencies": { - "typescript": "4.1.3" + "typescript": "4.2.3" } } diff --git a/metapackages/plugins-node-core/README.md b/metapackages/plugins-node-core/README.md index ef09ce075c..eb5e1bea13 100644 --- a/metapackages/plugins-node-core/README.md +++ b/metapackages/plugins-node-core/README.md @@ -26,7 +26,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=metapackages/plugins-node-core +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=metapackages/plugins-node-core [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetryplugins-node-core [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugins-node-core [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugins-node-core.svg diff --git a/metapackages/plugins-web-core/README.md b/metapackages/plugins-web-core/README.md index dda4d4e486..25768a1dda 100644 --- a/metapackages/plugins-web-core/README.md +++ b/metapackages/plugins-web-core/README.md @@ -23,7 +23,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=metapackages/plugins-web-core +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=metapackages/plugins-web-core [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetryplugins-web-core [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugins-web-core [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugins-web-core.svg diff --git a/package.json b/package.json index 44286bf3c6..c2a636a83a 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,11 @@ "devDependencies": { "@commitlint/cli": "11.0.0", "@commitlint/config-conventional": "11.0.0", - "@typescript-eslint/eslint-plugin": "4.16.1", - "@typescript-eslint/parser": "4.16.1", + "@typescript-eslint/eslint-plugin": "4.19.0", + "@typescript-eslint/parser": "4.19.0", "beautify-benchmark": "0.2.4", "benchmark": "2.1.4", - "eslint": "7.21.0", + "eslint": "7.22.0", "eslint-config-airbnb-base": "14.2.1", "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.22.1", @@ -60,8 +60,8 @@ "husky": "4.3.8", "lerna": "3.22.1", "lerna-changelog": "1.0.1", - "markdownlint-cli": "0.26.0", - "typescript": "4.1.3", + "markdownlint-cli": "0.27.1", + "typescript": "4.2.3", "update-ts-references": "2.0.0" }, "husky": { diff --git a/packages/opentelemetry-api-metrics/README.md b/packages/opentelemetry-api-metrics/README.md index 19f9c23656..a8576e98e4 100644 --- a/packages/opentelemetry-api-metrics/README.md +++ b/packages/opentelemetry-api-metrics/README.md @@ -90,12 +90,12 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-api -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-api -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-api -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-api&type=dev +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-api-metrics +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-api-metrics +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-api-metrics&type=dev +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-api-metrics&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/api-metrics -[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fapi.svg +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fapi-metrics.svg [trace-api-docs]: https://open-telemetry.github.io/opentelemetry-js/classes/traceapi.html [metrics-api-docs]: https://open-telemetry.github.io/opentelemetry-js/classes/metricsapi.html diff --git a/packages/opentelemetry-api-metrics/package.json b/packages/opentelemetry-api-metrics/package.json index 742f4cb804..2e72a122e3 100644 --- a/packages/opentelemetry-api-metrics/package.json +++ b/packages/opentelemetry-api-metrics/package.json @@ -48,11 +48,11 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.12", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/webpack-env": "1.16.0", "codecov": "3.8.1", "gts": "3.1.0", @@ -65,9 +65,9 @@ "karma-webpack": "4.0.2", "mocha": "7.2.0", "nyc": "15.1.0", - "ts-loader": "8.0.12", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", - "typescript": "4.1.3", - "webpack": "4.44.2" + "typescript": "4.2.3", + "webpack": "4.46.0" } } diff --git a/packages/opentelemetry-context-async-hooks/README.md b/packages/opentelemetry-context-async-hooks/README.md index cd06b4351b..dfdff04b56 100644 --- a/packages/opentelemetry-context-async-hooks/README.md +++ b/packages/opentelemetry-context-async-hooks/README.md @@ -44,9 +44,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-context-async-hooks + [dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-context-async-hooks [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-context-async-hooks -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-context-async-hooks +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-context-async-hooks&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-context-async-hooks&type=dev [async-hooks-doc]: http://nodejs.org/dist/latest/docs/api/async_hooks.html [def-context-manager]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-context-base/README.md diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index 03ee5ddde0..d5f231febf 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -40,8 +40,8 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/shimmer": "1.0.1", "codecov": "3.8.1", "gts": "3.1.0", @@ -50,9 +50,9 @@ "rimraf": "3.0.2", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0" } } diff --git a/packages/opentelemetry-context-zone-peer-dep/README.md b/packages/opentelemetry-context-zone-peer-dep/README.md index 4384ff6a31..e7c0294ea7 100644 --- a/packages/opentelemetry-context-zone-peer-dep/README.md +++ b/packages/opentelemetry-context-zone-peer-dep/README.md @@ -67,10 +67,10 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-context-zone-peer-dep +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-context-zone-peer-dep [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-context-zone-peer-dep -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-context-zone-peer-dep -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-web&type=dev +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-context-zone-peer-dep&type=dev +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-context-zone-peer-dep&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/context-zone-peer-dep [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fcontext-zone-peer-dep.svg [zone-js]: https://www.npmjs.com/package/zone.js diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 86799cdb32..c4f393f150 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -41,10 +41,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@babel/core": "7.13.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "@types/zone.js": "0.5.12", "babel-loader": "8.2.2", @@ -60,17 +60,17 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", - "zone.js": "0.11.3" + "webpack-cli": "4.5.0", + "zone.js": "0.11.4" }, "dependencies": { - "@opentelemetry/api": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0" }, "peerDependencies": { "zone.js": "^0.10.2 || ^0.11.0" diff --git a/packages/opentelemetry-context-zone/README.md b/packages/opentelemetry-context-zone/README.md index 7b32c34497..09f30edf68 100644 --- a/packages/opentelemetry-context-zone/README.md +++ b/packages/opentelemetry-context-zone/README.md @@ -65,10 +65,10 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-context-zone +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-context-zone [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-context-zone -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-context-zone -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-web&type=dev +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-context-zone&type=dev +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-context-zone&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/context-zone [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fcontext-zone.svg [zone-js]: https://www.npmjs.com/package/zone.js diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 9f78ba0eb2..f2e71ed54a 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -38,10 +38,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@babel/core": "7.13.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -54,13 +54,13 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" }, "dependencies": { diff --git a/packages/opentelemetry-core/README.md b/packages/opentelemetry-core/README.md index 080bb3d0ca..c2ea181750 100644 --- a/packages/opentelemetry-core/README.md +++ b/packages/opentelemetry-core/README.md @@ -16,9 +16,10 @@ This package provides default implementations of the OpenTelemetry API for trace - [Composite Propagator](#composite-propagator) - [Baggage Propagator](#baggage-propagator) - [Built-in Sampler](#built-in-sampler) - - [Always Sampler](#always-sampler) - - [Never Sampler](#never-sampler) - - [Probability Sampler](#probability-sampler) + - [AlwaysOn Sampler](#alwayson-sampler) + - [AlwaysOff Sampler](#alwaysoff-sampler) + - [TraceIdRatioBased Sampler](#traceidratiobased-sampler) + - [ParentBased Sampler](#parentbased-sampler) - [Useful links](#useful-links) - [License](#license) @@ -66,7 +67,7 @@ api.propagation.setGlobalPropagator(new HttpBaggage()); Sampler is used to make decisions on `Span` sampling. -#### AlwaysOn +#### AlwaysOn Sampler Samples every trace regardless of upstream sampling decisions. @@ -81,7 +82,7 @@ const tracerProvider = new NodeTracerProvider({ }); ``` -#### AlwaysOff +#### AlwaysOff Sampler Doesn't sample any trace, regardless of upstream sampling decisions. @@ -94,7 +95,7 @@ const tracerProvider = new NodeTracerProvider({ }); ``` -#### TraceIdRatioBased +#### TraceIdRatioBased Sampler Samples some percentage of traces, calculated deterministically using the trace ID. Any trace that would be sampled at a given percentage will also be sampled at any higher percentage. @@ -116,7 +117,7 @@ const tracerProvider = new NodeTracerProvider({ }); ``` -#### ParentBasedSampler +#### ParentBased Sampler - This is a composite sampler. `ParentBased` helps distinguished between the following cases: @@ -176,9 +177,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-core +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-core [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-core -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-core +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-core&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-core&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/core [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fcore.svg diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index e52032b10b..8b7ad54900 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -51,10 +51,10 @@ }, "devDependencies": { "@opentelemetry/propagator-b3": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "codecov": "3.8.1", "gts": "3.1.0", @@ -68,15 +68,15 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "semver": "^7.1.3" } } diff --git a/packages/opentelemetry-exporter-collector-grpc/README.md b/packages/opentelemetry-exporter-collector-grpc/README.md index 06b324ff8d..cb472ee699 100644 --- a/packages/opentelemetry-exporter-collector-grpc/README.md +++ b/packages/opentelemetry-exporter-collector-grpc/README.md @@ -130,9 +130,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-exporter-collector-grpc +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-collector-grpc [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-collector-grpc -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-exporter-collector-grpc +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-collector-grpc&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-collector-grpc&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-collector-grpc [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-collector-grpc.svg diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json index 5a4e10f327..3b14d4fda5 100644 --- a/packages/opentelemetry-exporter-collector-grpc/package.json +++ b/packages/opentelemetry-exporter-collector-grpc/package.json @@ -45,26 +45,26 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", + "@babel/core": "7.13.10", "@opentelemetry/api-metrics": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "cpx": "1.5.0", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { "@grpc/proto-loader": "^0.5.4", - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/exporter-collector": "^0.18.0", "@opentelemetry/metrics": "^0.18.0", diff --git a/packages/opentelemetry-exporter-collector-proto/README.md b/packages/opentelemetry-exporter-collector-proto/README.md index 375eb5ae43..29dcd11d35 100644 --- a/packages/opentelemetry-exporter-collector-proto/README.md +++ b/packages/opentelemetry-exporter-collector-proto/README.md @@ -77,9 +77,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-exporter-collector-proto +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-collector-proto [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-collector-proto -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-exporter-collector-proto +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-collector-proto&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-collector-proto&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-collector-proto [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-collector-proto.svg diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json index 1531cd202b..4535314792 100644 --- a/packages/opentelemetry-exporter-collector-proto/package.json +++ b/packages/opentelemetry-exporter-collector-proto/package.json @@ -45,26 +45,26 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", + "@babel/core": "7.13.10", "@opentelemetry/api-metrics": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "cpx": "1.5.0", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { "@grpc/proto-loader": "^0.5.4", - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/exporter-collector": "^0.18.0", "@opentelemetry/metrics": "^0.18.0", diff --git a/packages/opentelemetry-exporter-collector/README.md b/packages/opentelemetry-exporter-collector/README.md index 847d6fe282..c0d3ee32c5 100644 --- a/packages/opentelemetry-exporter-collector/README.md +++ b/packages/opentelemetry-exporter-collector/README.md @@ -146,9 +146,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-exporter-collector +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-collector [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-collector -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-exporter-collector +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-collector&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-collector&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-collector [npm-url-grpc]: https://www.npmjs.com/package/@opentelemetry/exporter-collector-grpc diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json index dca0b9bccc..c6ea0332d6 100644 --- a/packages/opentelemetry-exporter-collector/package.json +++ b/packages/opentelemetry-exporter-collector/package.json @@ -48,10 +48,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@babel/core": "7.13.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -67,17 +67,17 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/api-metrics": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/metrics": "^0.18.0", diff --git a/packages/opentelemetry-exporter-jaeger/README.md b/packages/opentelemetry-exporter-jaeger/README.md index e4207f2551..575689d9af 100644 --- a/packages/opentelemetry-exporter-jaeger/README.md +++ b/packages/opentelemetry-exporter-jaeger/README.md @@ -101,9 +101,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-exporter-jaeger +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-jaeger [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-jaeger -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-exporter-jaeger +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-jaeger&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-jaeger&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-jaeger [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-jaeger.svg diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index e9bd0dfef2..c9801d6273 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -41,22 +41,22 @@ }, "devDependencies": { "@opentelemetry/resources": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", "jaeger-client": "^3.15.0" diff --git a/packages/opentelemetry-exporter-prometheus/README.md b/packages/opentelemetry-exporter-prometheus/README.md index 77ad71a043..8d6c711de9 100644 --- a/packages/opentelemetry-exporter-prometheus/README.md +++ b/packages/opentelemetry-exporter-prometheus/README.md @@ -66,9 +66,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-exporter-prometheus +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-prometheus [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-prometheus -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-exporter-prometheus +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-prometheus&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-prometheus&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-prometheus [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-prometheus.svg diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json index b75b63f785..91272132f7 100644 --- a/packages/opentelemetry-exporter-prometheus/package.json +++ b/packages/opentelemetry-exporter-prometheus/package.json @@ -39,21 +39,21 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/api-metrics": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/metrics": "^0.18.0" diff --git a/packages/opentelemetry-exporter-zipkin/README.md b/packages/opentelemetry-exporter-zipkin/README.md index e785741376..1c692a30ce 100644 --- a/packages/opentelemetry-exporter-zipkin/README.md +++ b/packages/opentelemetry-exporter-zipkin/README.md @@ -64,9 +64,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-exporter-zipkin +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-zipkin [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-zipkin -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-exporter-zipkin +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-zipkin&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-zipkin&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-zipkin [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-zipkin.svg diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index a418c3faae..220972bbf6 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -46,10 +46,10 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@babel/core": "7.13.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -65,17 +65,17 @@ "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/resources": "^0.18.0", "@opentelemetry/tracing": "^0.18.0" diff --git a/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts b/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts index 940f7439b9..f0409d982d 100644 --- a/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts +++ b/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts @@ -27,7 +27,7 @@ import * as zipkinTypes from '../../types'; */ export function prepareSend(urlStr: string, headers?: Record) { let xhrHeaders: Record; - const useBeacon = navigator.sendBeacon && !headers; + const useBeacon = typeof navigator.sendBeacon === 'function' && !headers; if (headers) { xhrHeaders = { Accept: 'application/json', diff --git a/packages/opentelemetry-grpc-utils/README.md b/packages/opentelemetry-grpc-utils/README.md index 5fd293e867..5d244a9dfe 100644 --- a/packages/opentelemetry-grpc-utils/README.md +++ b/packages/opentelemetry-grpc-utils/README.md @@ -59,9 +59,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-grpc -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-grpc -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-grpc +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-grpc +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-grpc +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-grpc&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-grpc&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugin-grpc [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugin-grpc.svg diff --git a/packages/opentelemetry-grpc-utils/package.json b/packages/opentelemetry-grpc-utils/package.json index df51529892..e566398f22 100644 --- a/packages/opentelemetry-grpc-utils/package.json +++ b/packages/opentelemetry-grpc-utils/package.json @@ -40,31 +40,31 @@ "access": "public" }, "devDependencies": { - "@grpc/grpc-js": "1.2.3", - "@grpc/proto-loader": "0.5.5", + "@grpc/grpc-js": "1.2.12", + "@grpc/proto-loader": "0.5.6", "@opentelemetry/context-async-hooks": "^0.18.0", "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "codecov": "3.8.1", - "grpc": "1.24.4", + "grpc": "1.24.6", "gts": "3.1.0", "mocha": "7.2.0", "node-pre-gyp": "0.17.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "semver": "7.3.4", - "sinon": "9.2.3", + "semver": "7.3.5", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", "shimmer": "1.2.1" diff --git a/packages/opentelemetry-instrumentation-fetch/README.md b/packages/opentelemetry-instrumentation-fetch/README.md index 62703d0622..13bfec30e4 100644 --- a/packages/opentelemetry-instrumentation-fetch/README.md +++ b/packages/opentelemetry-instrumentation-fetch/README.md @@ -72,9 +72,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-instrumentation-fetch +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-fetch [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-fetch -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-instrumentation-fetch +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-fetch&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-fetch&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-fetch [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-fetch.svg diff --git a/packages/opentelemetry-instrumentation-fetch/package.json b/packages/opentelemetry-instrumentation-fetch/package.json index aade766e10..6dc48ab77a 100644 --- a/packages/opentelemetry-instrumentation-fetch/package.json +++ b/packages/opentelemetry-instrumentation-fetch/package.json @@ -42,14 +42,14 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", + "@babel/core": "7.13.10", "@opentelemetry/context-zone": "^0.18.0", "@opentelemetry/propagator-b3": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -64,17 +64,17 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", diff --git a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts index 5aa369d82b..b263c11015 100644 --- a/packages/opentelemetry-instrumentation-fetch/src/fetch.ts +++ b/packages/opentelemetry-instrumentation-fetch/src/fetch.ts @@ -32,7 +32,17 @@ import { VERSION } from './version'; // hard to say how long it should really wait, seems like 300ms is // safe enough const OBSERVER_WAIT_TIME_MS = 300; -const urlNormalizingA = document.createElement('a'); + +// Used to normalize relative URLs +let a: HTMLAnchorElement | undefined; +const getUrlNormalizingAnchor = () => { + if (!a) { + a = document.createElement('a'); + } + + return a; +}; + /** * FetchPlugin Config */ @@ -359,11 +369,12 @@ export class FetchInstrumentation extends InstrumentationBase< const observer: PerformanceObserver = new PerformanceObserver(list => { const perfObsEntries = list.getEntries() as PerformanceResourceTiming[]; - urlNormalizingA.href = spanUrl; + const urlNormalizingAnchor = getUrlNormalizingAnchor(); + urlNormalizingAnchor.href = spanUrl; perfObsEntries.forEach(entry => { if ( entry.initiatorType === 'fetch' && - entry.name === urlNormalizingA.href + entry.name === urlNormalizingAnchor.href ) { entries.push(entry); } diff --git a/packages/opentelemetry-instrumentation-grpc/README.md b/packages/opentelemetry-instrumentation-grpc/README.md index 269064a18e..a340cb692d 100644 --- a/packages/opentelemetry-instrumentation-grpc/README.md +++ b/packages/opentelemetry-instrumentation-grpc/README.md @@ -65,9 +65,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-instrumentation-grpc +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-grpc [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-grpc -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-instrumentation-grpc +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-grpc&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-grpc&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-grpc [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-grpc.svg diff --git a/packages/opentelemetry-instrumentation-grpc/package.json b/packages/opentelemetry-instrumentation-grpc/package.json index cf8a52155f..cebdd88ccc 100644 --- a/packages/opentelemetry-instrumentation-grpc/package.json +++ b/packages/opentelemetry-instrumentation-grpc/package.json @@ -41,32 +41,32 @@ "access": "public" }, "devDependencies": { - "@grpc/grpc-js": "1.2.3", - "@grpc/proto-loader": "0.5.5", + "@grpc/grpc-js": "1.2.12", + "@grpc/proto-loader": "0.5.6", "@opentelemetry/context-async-hooks": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "codecov": "3.8.1", - "grpc": "1.24.4", + "grpc": "1.24.6", "gts": "3.1.0", "mocha": "7.2.0", "node-pre-gyp": "0.17.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "semver": "7.3.4", - "sinon": "9.2.3", + "semver": "7.3.5", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/api-metrics": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0" diff --git a/packages/opentelemetry-instrumentation-grpc/src/index.ts b/packages/opentelemetry-instrumentation-grpc/src/index.ts index 24c76056a1..26ea0efdb4 100644 --- a/packages/opentelemetry-instrumentation-grpc/src/index.ts +++ b/packages/opentelemetry-instrumentation-grpc/src/index.ts @@ -15,3 +15,4 @@ */ export * from './instrumentation'; +export { GrpcInstrumentationConfig } from './types'; diff --git a/packages/opentelemetry-instrumentation-http/README.md b/packages/opentelemetry-instrumentation-http/README.md index f158ec2bf5..d0757bd476 100644 --- a/packages/opentelemetry-instrumentation-http/README.md +++ b/packages/opentelemetry-instrumentation-http/README.md @@ -75,9 +75,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-instrumentation-http +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-http [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-http -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-instrumentation-http +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-http&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-http&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-http -[npm-img]: https://badge.fury.io/js/%40opentelemetry%instrumentation-http.svg +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-http.svg diff --git a/packages/opentelemetry-instrumentation-http/package.json b/packages/opentelemetry-instrumentation-http/package.json index a7a1de0379..04f1376f73 100644 --- a/packages/opentelemetry-instrumentation-http/package.json +++ b/packages/opentelemetry-instrumentation-http/package.json @@ -46,11 +46,11 @@ "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", "@types/got": "9.6.11", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/request-promise-native": "1.0.17", "@types/semver": "7.3.4", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/superagent": "4.1.10", "axios": "0.21.1", "codecov": "3.8.1", @@ -62,14 +62,14 @@ "request": "2.88.2", "request-promise-native": "1.0.9", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "superagent": "6.1.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", "semver": "^7.1.3" diff --git a/packages/opentelemetry-instrumentation-http/src/http.ts b/packages/opentelemetry-instrumentation-http/src/http.ts index d022b38a01..69d581c78a 100644 --- a/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/packages/opentelemetry-instrumentation-http/src/http.ts @@ -226,7 +226,7 @@ export class HttpInstrumentation extends InstrumentationBase { if ( component === 'https' && typeof options === 'object' && - options?.constructor.name !== 'URL' + options?.constructor?.name !== 'URL' ) { options = Object.assign({}, options); instrumentation._setDefaultOptions(options); diff --git a/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts b/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts index 2dd34b2c44..86de0fbefa 100644 --- a/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts +++ b/packages/opentelemetry-instrumentation-http/test/functionals/https-enable.test.ts @@ -515,6 +515,32 @@ describe('HttpsInstrumentation', () => { } }); + it('should have 2 ended spans when provided "options" are an object without a constructor', async () => { + // Related issue: https://github.com/open-telemetry/opentelemetry-js/issues/2008 + const testPath = '/outgoing/test'; + const options = Object.create(null); + options.hostname = hostname; + options.port = serverPort; + options.path = pathname; + options.method = 'GET'; + + doNock(hostname, testPath, 200, 'Ok'); + + const promiseRequest = new Promise((resolve, _reject) => { + const req = https.request(options, (resp: http.IncomingMessage) => { + resp.on('data', () => {}); + resp.on('end', () => { + resolve({}); + }); + }); + return req.end(); + }); + + await promiseRequest; + const spans = memoryExporter.getFinishedSpans(); + assert.strictEqual(spans.length, 2); + }); + it('should have 1 ended span when response.end throw an exception', async () => { const testPath = '/outgoing/rootSpan/childs/1'; doNock(hostname, testPath, 400, 'Not Ok'); diff --git a/packages/opentelemetry-instrumentation-xml-http-request/README.md b/packages/opentelemetry-instrumentation-xml-http-request/README.md index d07c971fa2..1883d1fbb5 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/README.md +++ b/packages/opentelemetry-instrumentation-xml-http-request/README.md @@ -76,9 +76,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-instrumentation-xml-http-request +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-xml-http-request [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-xml-http-request -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-instrumentation-xml-http-request +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation-xml-http-request&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation-xml-http-request&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-xml-http-request [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-xml-http-request.svg diff --git a/packages/opentelemetry-instrumentation-xml-http-request/package.json b/packages/opentelemetry-instrumentation-xml-http-request/package.json index 7988fb53d6..09c7c707e5 100644 --- a/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -42,13 +42,13 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", + "@babel/core": "7.13.10", "@opentelemetry/context-zone": "^0.18.0", "@opentelemetry/propagator-b3": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -63,17 +63,17 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", diff --git a/packages/opentelemetry-instrumentation/README.md b/packages/opentelemetry-instrumentation/README.md index de74b9cc0a..802440fa79 100644 --- a/packages/opentelemetry-instrumentation/README.md +++ b/packages/opentelemetry-instrumentation/README.md @@ -273,9 +273,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-instrumentation +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-instrumentation +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-instrumentation&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-instrumentation&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation.svg diff --git a/packages/opentelemetry-instrumentation/package.json b/packages/opentelemetry-instrumentation/package.json index b6f5d7625b..45e0c9757e 100644 --- a/packages/opentelemetry-instrumentation/package.json +++ b/packages/opentelemetry-instrumentation/package.json @@ -54,19 +54,19 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/api-metrics": "^0.18.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" }, "devDependencies": { - "@babel/core": "7.12.10", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@babel/core": "7.13.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -82,13 +82,13 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" } } diff --git a/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts b/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts index 1aa9965f1a..bf5a9a71c1 100644 --- a/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts +++ b/packages/opentelemetry-instrumentation/src/platform/node/instrumentationNodeModuleFile.ts @@ -15,13 +15,17 @@ */ import { InstrumentationModuleFile } from './types'; +import { normalize } from 'path'; export class InstrumentationNodeModuleFile implements InstrumentationModuleFile { + public name: string; constructor( - public name: string, + name: string, public supportedVersions: string[], public patch: (moduleExports: T, moduleVersion?: string) => T, public unpatch: (moduleExports?: T, moduleVersion?: string) => void - ) {} + ) { + this.name = normalize(name); + } } diff --git a/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts b/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts new file mode 100644 index 0000000000..1c7db12a44 --- /dev/null +++ b/packages/opentelemetry-instrumentation/test/node/InstrumentationNodeModuleFile.test.ts @@ -0,0 +1,34 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import { normalize } from 'path'; +import { InstrumentationNodeModuleFile } from '../../src'; + +describe('InstrumentationNodeModuleFile', () => { + it('should convert path', () => { + const tests = ['c:\\\\foo\\\\bar\\aa', '///home//foo/bar///aa']; + tests.forEach(name => { + const instrumentationNodeModuleFile = new InstrumentationNodeModuleFile( + name, + [], + () => {}, + () => {} + ); + assert.strictEqual(instrumentationNodeModuleFile.name, normalize(name)); + }); + }); +}); diff --git a/packages/opentelemetry-metrics/README.md b/packages/opentelemetry-metrics/README.md index 73380f7a1f..595fbbbf6e 100644 --- a/packages/opentelemetry-metrics/README.md +++ b/packages/opentelemetry-metrics/README.md @@ -264,9 +264,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-metrics -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-metrics -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-metrics +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-metrics +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-metrsics +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-metrics&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-metrics&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/metrics [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fmetrics.svg diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json index dea713c3f1..acd48ccf05 100644 --- a/packages/opentelemetry-metrics/package.json +++ b/packages/opentelemetry-metrics/package.json @@ -41,21 +41,21 @@ }, "devDependencies": { "@types/lodash.merge": "4.6.6", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/api-metrics": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/resources": "^0.18.0", diff --git a/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts b/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts index 9ac04fd3d0..acade23dc7 100644 --- a/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts +++ b/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts @@ -21,6 +21,8 @@ import { ExportResult, ExportResultCode } from '@opentelemetry/core'; * This is implementation of {@link MetricExporter} that prints metrics data to * the console. This class can be used for diagnostic purposes. */ + +/* eslint-disable no-console */ export class ConsoleMetricExporter implements MetricExporter { export( metrics: MetricRecord[], diff --git a/packages/opentelemetry-metrics/test/Meter.test.ts b/packages/opentelemetry-metrics/test/Meter.test.ts index b1ad16d701..b1e6389b5d 100644 --- a/packages/opentelemetry-metrics/test/Meter.test.ts +++ b/packages/opentelemetry-metrics/test/Meter.test.ts @@ -804,7 +804,7 @@ describe('Meter', () => { let counter = 0; function getValue() { - console.log('getting value, counter:', counter); + diag.info('getting value, counter:', counter); if (++counter % 2 === 0) { return 3; } diff --git a/packages/opentelemetry-metrics/test/export/ConsoleMetricExporter.test.ts b/packages/opentelemetry-metrics/test/export/ConsoleMetricExporter.test.ts index cf915fbceb..0cd111cc5c 100644 --- a/packages/opentelemetry-metrics/test/export/ConsoleMetricExporter.test.ts +++ b/packages/opentelemetry-metrics/test/export/ConsoleMetricExporter.test.ts @@ -19,6 +19,7 @@ import * as sinon from 'sinon'; import { ConsoleMetricExporter, MeterProvider, MetricKind } from '../../src'; import { ValueType } from '@opentelemetry/api-metrics'; +/* eslint-disable no-console */ describe('ConsoleMetricExporter', () => { let consoleExporter: ConsoleMetricExporter; let previousConsoleLog: any; diff --git a/packages/opentelemetry-node/README.md b/packages/opentelemetry-node/README.md index cb935a7e1a..d1cc54c099 100644 --- a/packages/opentelemetry-node/README.md +++ b/packages/opentelemetry-node/README.md @@ -143,9 +143,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-node +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-node [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-node -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-node +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-node&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-node&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/node [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fnode.svg diff --git a/packages/opentelemetry-node/package.json b/packages/opentelemetry-node/package.json index b768748ff6..bf49682c57 100644 --- a/packages/opentelemetry-node/package.json +++ b/packages/opentelemetry-node/package.json @@ -42,24 +42,24 @@ }, "devDependencies": { "@opentelemetry/resources": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "shimmer": "1.2.1", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/context-async-hooks": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", diff --git a/packages/opentelemetry-plugin-grpc-js/README.md b/packages/opentelemetry-plugin-grpc-js/README.md index 76b76a63b6..553b1dc187 100644 --- a/packages/opentelemetry-plugin-grpc-js/README.md +++ b/packages/opentelemetry-plugin-grpc-js/README.md @@ -68,9 +68,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-grpc-js +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-grpc-js [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-grpc-js -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-grpc-js +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-grpc-js&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-grpc-js&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugin-grpc-js [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugin-grpc-js.svg diff --git a/packages/opentelemetry-plugin-grpc-js/package.json b/packages/opentelemetry-plugin-grpc-js/package.json index 634c6c083d..b82121ac09 100644 --- a/packages/opentelemetry-plugin-grpc-js/package.json +++ b/packages/opentelemetry-plugin-grpc-js/package.json @@ -42,29 +42,29 @@ "access": "public" }, "devDependencies": { - "@grpc/grpc-js": "1.2.3", + "@grpc/grpc-js": "1.2.12", "@opentelemetry/context-async-hooks": "^0.18.0", "@opentelemetry/grpc-utils": "^0.18.0", "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "semver": "7.3.4", - "sinon": "9.2.3", + "semver": "7.3.5", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", "shimmer": "1.2.1" diff --git a/packages/opentelemetry-plugin-grpc/README.md b/packages/opentelemetry-plugin-grpc/README.md index 77fdc5d33d..eeed5a21d3 100644 --- a/packages/opentelemetry-plugin-grpc/README.md +++ b/packages/opentelemetry-plugin-grpc/README.md @@ -68,9 +68,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-grpc +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-grpc [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-grpc -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-grpc +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-grpc&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-grpc&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugin-grpc [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugin-grpc.svg diff --git a/packages/opentelemetry-plugin-grpc/package.json b/packages/opentelemetry-plugin-grpc/package.json index 7ecbbd0477..ebbcd22e72 100644 --- a/packages/opentelemetry-plugin-grpc/package.json +++ b/packages/opentelemetry-plugin-grpc/package.json @@ -44,26 +44,26 @@ "@opentelemetry/grpc-utils": "^0.18.0", "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "codecov": "3.8.1", - "grpc": "1.24.4", + "grpc": "1.24.6", "gts": "3.1.0", "mocha": "7.2.0", "node-pre-gyp": "0.17.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "semver": "7.3.4", - "sinon": "9.2.3", + "semver": "7.3.5", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", "shimmer": "^1.2.1" diff --git a/packages/opentelemetry-plugin-http/README.md b/packages/opentelemetry-plugin-http/README.md index 00f7166117..b43ae67b7b 100644 --- a/packages/opentelemetry-plugin-http/README.md +++ b/packages/opentelemetry-plugin-http/README.md @@ -75,9 +75,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-http +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-http [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-http -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-http +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-http&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-http&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugin-http [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugin-http.svg diff --git a/packages/opentelemetry-plugin-http/package.json b/packages/opentelemetry-plugin-http/package.json index e82611e716..5183fa4be5 100644 --- a/packages/opentelemetry-plugin-http/package.json +++ b/packages/opentelemetry-plugin-http/package.json @@ -45,12 +45,12 @@ "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", "@types/got": "9.6.11", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/request-promise-native": "1.0.17", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/superagent": "4.1.10", "axios": "0.21.1", "codecov": "3.8.1", @@ -62,14 +62,14 @@ "request": "2.88.2", "request-promise-native": "1.0.9", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "superagent": "6.1.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", "semver": "^7.1.3", diff --git a/packages/opentelemetry-plugin-https/README.md b/packages/opentelemetry-plugin-https/README.md index e51381910f..d4dfd1bde8 100644 --- a/packages/opentelemetry-plugin-https/README.md +++ b/packages/opentelemetry-plugin-https/README.md @@ -70,9 +70,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-https +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-https [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-https -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-https +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-plugin-https&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-https&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/plugin-https [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugin-https.svg diff --git a/packages/opentelemetry-plugin-https/package.json b/packages/opentelemetry-plugin-https/package.json index 0b2583833e..83b96be027 100644 --- a/packages/opentelemetry-plugin-https/package.json +++ b/packages/opentelemetry-plugin-https/package.json @@ -44,12 +44,12 @@ "@opentelemetry/node": "^0.18.0", "@opentelemetry/tracing": "^0.18.0", "@types/got": "9.6.11", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/request-promise-native": "1.0.17", "@types/semver": "7.3.4", "@types/shimmer": "1.0.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/superagent": "4.1.10", "axios": "0.21.1", "codecov": "3.8.1", @@ -61,14 +61,14 @@ "request": "2.88.2", "request-promise-native": "1.0.9", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "superagent": "6.1.0", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/plugin-http": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", diff --git a/packages/opentelemetry-propagator-b3/README.md b/packages/opentelemetry-propagator-b3/README.md index 1d4c320c88..5748ebc74c 100644 --- a/packages/opentelemetry-propagator-b3/README.md +++ b/packages/opentelemetry-propagator-b3/README.md @@ -159,12 +159,12 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/master/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-propagator-jaeger -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-propagator-jaeger -[devdependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-propagator-jaeger -[devdependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-propagator-jaeger&type=dev -[npm-url]: https://www.npmjs.com/package/@opentelemetry/propagator-jaeger -[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fpropagator-jaeger.svg +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-propagator-b3 +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-propagator-b3 +[devdependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-propagator-b3&type=dev +[devdependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-propagator-b3&type=dev +[npm-url]: https://www.npmjs.com/package/@opentelemetry/propagator-b3 +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fpropagator-b3.svg [b3-spec]: https://github.com/openzipkin/b3-propagation [otel-b3-requirements]: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/context/api-propagators.md#b3-requirements [otel-spec-id-format]: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/api.md#retrieving-the-traceid-and-spanid diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 1342852746..0cd2ae04e4 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -39,19 +39,19 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api": "^0.18.0" + "@opentelemetry/api": "^1.0.0-rc.0" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "codecov": "3.8.1", "gts": "3.1.0", "istanbul-instrumenter-loader": "3.0.1", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "ts-loader": "8.0.14", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", - "typescript": "4.1.3" + "typescript": "4.2.3" } } diff --git a/packages/opentelemetry-resource-detector-aws/README.md b/packages/opentelemetry-resource-detector-aws/README.md index 712a00b7ca..ea82d3724e 100644 --- a/packages/opentelemetry-resource-detector-aws/README.md +++ b/packages/opentelemetry-resource-detector-aws/README.md @@ -17,7 +17,17 @@ npm install --save @opentelemetry/resource-detector-aws ## Usage -> TODO +```typescript +import { detectResources } from '@opentelemetry/resources'; +import { awsBeanstalkDetector } from '@opentelemetry/resource-detector-aws' +const resource = await detectResources({ + detectors: [awsEc2Detector], +}) + +const tracerProvider = new NodeTracerProvider({ resource }); +``` + +**Note**: Besides `awsEc2Detector` there are also the following detectors available: `awsBeanstalkDetector`, `awsEksDetector` and `awsEcsDetector` ## Useful links @@ -32,9 +42,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-resources +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-resources [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-resources -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-resources +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-resources&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-resources&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/resources [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fresources.svg diff --git a/packages/opentelemetry-resource-detector-aws/package.json b/packages/opentelemetry-resource-detector-aws/package.json index 29b4b71861..5e35e749cb 100644 --- a/packages/opentelemetry-resource-detector-aws/package.json +++ b/packages/opentelemetry-resource-detector-aws/package.json @@ -39,22 +39,22 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/resources": "^0.18.0" } diff --git a/packages/opentelemetry-resource-detector-gcp/README.md b/packages/opentelemetry-resource-detector-gcp/README.md index d81d80ce9f..820991afd3 100644 --- a/packages/opentelemetry-resource-detector-gcp/README.md +++ b/packages/opentelemetry-resource-detector-gcp/README.md @@ -42,9 +42,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-resources +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-resources [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-resources -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-resources +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-resources&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-resources&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/resources [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fresources.svg diff --git a/packages/opentelemetry-resource-detector-gcp/package.json b/packages/opentelemetry-resource-detector-gcp/package.json index d8d42b2720..2190979551 100644 --- a/packages/opentelemetry-resource-detector-gcp/package.json +++ b/packages/opentelemetry-resource-detector-gcp/package.json @@ -40,8 +40,8 @@ }, "devDependencies": { "@opentelemetry/core": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", "codecov": "3.8.1", "gts": "3.1.0", @@ -51,12 +51,12 @@ "rimraf": "3.0.2", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/resources": "^0.18.0", "gcp-metadata": "^4.1.4", - "semver": "7.3.4" + "semver": "7.3.5" } } diff --git a/packages/opentelemetry-resources/README.md b/packages/opentelemetry-resources/README.md index 9f39b84ae2..b6506a3583 100644 --- a/packages/opentelemetry-resources/README.md +++ b/packages/opentelemetry-resources/README.md @@ -17,7 +17,18 @@ npm install --save @opentelemetry/resources ## Usage -> TODO +```typescript +import { Resource, SERVICE_RESOURCE } from '@opentelemetry/resources'; +const resource = new Resource({ + [SERVICE_RESOURCE.NAME]: 'api-service', +}); + +const another_resource = new Resource({ + 'service.version': 2.0.0, + 'service.group': 'instrumentation-group' +}); +const merged_resource = resource.merge(another_resource); +``` ## Useful links @@ -32,9 +43,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-resources +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-resources [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-resources -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-resources +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-resources&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-resources&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/resources [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fresources.svg diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 8ac66005e4..ff11b034fe 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -43,22 +43,22 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0" } } diff --git a/packages/opentelemetry-sdk-node/README.md b/packages/opentelemetry-sdk-node/README.md index e59671ff7a..722086cec9 100644 --- a/packages/opentelemetry-sdk-node/README.md +++ b/packages/opentelemetry-sdk-node/README.md @@ -138,9 +138,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-sdk-node +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-sdk-node [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-sdk-node -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-sdk-node +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-sdk-node&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-sdk-node&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/sdk-node [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fsdk-node.svg diff --git a/packages/opentelemetry-sdk-node/package.json b/packages/opentelemetry-sdk-node/package.json index 8975094334..7bd4e5ba66 100644 --- a/packages/opentelemetry-sdk-node/package.json +++ b/packages/opentelemetry-sdk-node/package.json @@ -40,7 +40,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/api-metrics": "^0.18.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/instrumentation": "^0.18.0", @@ -54,20 +54,20 @@ }, "devDependencies": { "@opentelemetry/context-async-hooks": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "@types/semver": "7.3.4", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gcp-metadata": "^4.1.4", "gts": "3.1.0", "istanbul-instrumenter-loader": "3.0.1", "mocha": "7.2.0", "nyc": "15.1.0", - "semver": "7.3.4", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "semver": "7.3.5", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", - "typescript": "4.1.3" + "typescript": "4.2.3" } } diff --git a/packages/opentelemetry-sdk-node/src/sdk.ts b/packages/opentelemetry-sdk-node/src/sdk.ts index dd760d9e99..0137ce46bd 100644 --- a/packages/opentelemetry-sdk-node/src/sdk.ts +++ b/packages/opentelemetry-sdk-node/src/sdk.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TextMapPropagator } from '@opentelemetry/api'; +import { diag, TextMapPropagator } from '@opentelemetry/api'; import { metrics } from '@opentelemetry/api-metrics'; import { ContextManager } from '@opentelemetry/api'; import { MeterConfig, MeterProvider } from '@opentelemetry/metrics'; @@ -103,7 +103,7 @@ export class NodeSDK { if (configuration.instrumentations) { instrumentations = configuration.instrumentations; } else if (configuration.plugins) { - console.error('plugins option is deprecated'); + diag.error('plugins option is deprecated'); instrumentations = configuration.plugins; } this._instrumentations = instrumentations; diff --git a/packages/opentelemetry-semantic-conventions/README.md b/packages/opentelemetry-semantic-conventions/README.md index 62e8c35a44..ad77beb69a 100644 --- a/packages/opentelemetry-semantic-conventions/README.md +++ b/packages/opentelemetry-semantic-conventions/README.md @@ -37,11 +37,11 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-semantic-conventions +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-semantic-conventions [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-semantic-conventions -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-semantic-conventions +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-semantic-conventions&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-semantic-conventions&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/semantic-conventions -[npm-img]: https://badge.fury.io/js/%40opentelemetry%semantic-conventions.svg +[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fsemantic-conventions.svg [trace-semantic_conventions]: https://github.com/open-telemetry/opentelemetry-specification/tree/master/specification/trace/semantic_conventions diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 9ca301c116..d0500761a9 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -39,18 +39,18 @@ "access": "public" }, "devDependencies": { - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", + "sinon": "9.2.4", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3" + "typescript": "4.2.3" } } diff --git a/packages/opentelemetry-semantic-conventions/src/trace/general.ts b/packages/opentelemetry-semantic-conventions/src/trace/general.ts index 281f9045ac..6fa64be3aa 100644 --- a/packages/opentelemetry-semantic-conventions/src/trace/general.ts +++ b/packages/opentelemetry-semantic-conventions/src/trace/general.ts @@ -36,4 +36,6 @@ export const GeneralAttribute = { IP_TCP: 'IP.TCP', IP_UDP: 'IP.UDP', INPROC: 'inproc', + PIPE: 'pipe', + UNIX: 'Unix', }; diff --git a/packages/opentelemetry-shim-opentracing/README.md b/packages/opentelemetry-shim-opentracing/README.md index 732c06fc59..9e904937b9 100644 --- a/packages/opentelemetry-shim-opentracing/README.md +++ b/packages/opentelemetry-shim-opentracing/README.md @@ -48,9 +48,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-tracing -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-tracing -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-tracing -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-tracing&type=dev +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-shim-opentracing +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-shim-opentracing +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-shim-opentracing&type=dev +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-shim-opentracing&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/shim-opentracing [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fshim-opentracing.svg diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 5ed658bf50..298988bf85 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -39,8 +39,8 @@ }, "devDependencies": { "@opentelemetry/tracing": "^0.18.0", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", @@ -50,10 +50,10 @@ "ts-node": "9.1.1", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "opentracing": "^0.14.4" } diff --git a/packages/opentelemetry-tracing/README.md b/packages/opentelemetry-tracing/README.md index 1c151d2c87..46bc2557f5 100644 --- a/packages/opentelemetry-tracing/README.md +++ b/packages/opentelemetry-tracing/README.md @@ -66,9 +66,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-tracing +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-tracing [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-tracing -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-tracing +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-tracing&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-tracing&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/tracing [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Ftracing.svg diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json index 6002d61806..9f6e73596a 100644 --- a/packages/opentelemetry-tracing/package.json +++ b/packages/opentelemetry-tracing/package.json @@ -49,9 +49,9 @@ }, "devDependencies": { "@types/lodash.merge": "4.6.6", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "codecov": "3.8.1", "gts": "3.1.0", @@ -65,15 +65,15 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/resources": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", diff --git a/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts b/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts index 003bac7113..8c481f62bf 100644 --- a/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts +++ b/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts @@ -26,6 +26,8 @@ import { * This is implementation of {@link SpanExporter} that prints spans to the * console. This class can be used for diagnostic purposes. */ + +/* eslint-disable no-console */ export class ConsoleSpanExporter implements SpanExporter { /** * Export spans. diff --git a/packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts b/packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts index 27752d88ed..4f5d734713 100644 --- a/packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts +++ b/packages/opentelemetry-tracing/test/export/BatchSpanProcessor.test.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import { diag } from '@opentelemetry/api'; import { AlwaysOnSampler, ExportResultCode, @@ -237,7 +238,10 @@ describe('BatchSpanProcessor', () => { clock.tick(defaultBufferConfig.scheduledDelayMillis + 10); clock.restore(); - console.log(exporter.getFinishedSpans().length); + diag.info( + 'finished spans count', + exporter.getFinishedSpans().length + ); assert.strictEqual( exporter.getFinishedSpans().length, totalSpans + 1 diff --git a/packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts b/packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts index 4a4829ec3a..7efac48ea6 100644 --- a/packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts +++ b/packages/opentelemetry-tracing/test/export/ConsoleSpanExporter.test.ts @@ -22,6 +22,7 @@ import { SimpleSpanProcessor, } from '../../src'; +/* eslint-disable no-console */ describe('ConsoleSpanExporter', () => { let consoleExporter: ConsoleSpanExporter; let previousConsoleLog: any; diff --git a/packages/opentelemetry-web/README.md b/packages/opentelemetry-web/README.md index 733696c8b8..8cae93ecf7 100644 --- a/packages/opentelemetry-web/README.md +++ b/packages/opentelemetry-web/README.md @@ -70,9 +70,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-web +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-web [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-web -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-web +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-web&type=dev [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-web&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/web [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fweb.svg diff --git a/packages/opentelemetry-web/package.json b/packages/opentelemetry-web/package.json index 65ed6175b0..5605c3c497 100644 --- a/packages/opentelemetry-web/package.json +++ b/packages/opentelemetry-web/package.json @@ -41,14 +41,14 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.12.10", + "@babel/core": "7.13.10", "@opentelemetry/context-zone": "^0.18.0", "@opentelemetry/propagator-b3": "^0.18.0", "@opentelemetry/resources": "^0.18.0", "@types/jquery": "3.5.5", - "@types/mocha": "8.2.0", - "@types/node": "14.14.20", - "@types/sinon": "9.0.10", + "@types/mocha": "8.2.2", + "@types/node": "14.14.35", + "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2", "codecov": "3.8.1", @@ -64,17 +64,17 @@ "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", - "sinon": "9.2.3", - "ts-loader": "8.0.14", + "sinon": "9.2.4", + "ts-loader": "8.0.18", "ts-mocha": "8.0.0", "ts-node": "9.1.1", - "typescript": "4.1.3", + "typescript": "4.2.3", "webpack": "4.46.0", - "webpack-cli": "4.3.1", + "webpack-cli": "4.5.0", "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/api": "^0.18.0", + "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.18.0", "@opentelemetry/semantic-conventions": "^0.18.0", "@opentelemetry/tracing": "^0.18.0" diff --git a/packages/opentelemetry-web/src/WebTracerProvider.ts b/packages/opentelemetry-web/src/WebTracerProvider.ts index 405935e78e..c541b2b75d 100644 --- a/packages/opentelemetry-web/src/WebTracerProvider.ts +++ b/packages/opentelemetry-web/src/WebTracerProvider.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import { diag } from '@opentelemetry/api'; import { BasicTracerProvider, SDKRegistrationConfig, @@ -41,7 +42,7 @@ export class WebTracerProvider extends BasicTracerProvider { */ constructor(config: WebTracerConfig = {}) { if (typeof config.plugins !== 'undefined') { - console.warn( + diag.warn( 'plugins option was removed, please use' + ' "registerInstrumentations" to load plugins' ); diff --git a/packages/opentelemetry-web/src/utils.ts b/packages/opentelemetry-web/src/utils.ts index 3e4e45cb8c..8c6a1a0e86 100644 --- a/packages/opentelemetry-web/src/utils.ts +++ b/packages/opentelemetry-web/src/utils.ts @@ -29,7 +29,14 @@ import { import { HttpAttribute } from '@opentelemetry/semantic-conventions'; // Used to normalize relative URLs -const urlNormalizingA = document.createElement('a'); +let a: HTMLAnchorElement | undefined; +const getUrlNormalizingAnchor = () => { + if (!a) { + a = document.createElement('a'); + } + + return a; +}; /** * Helper function to be able to use enum as typed key in type and in interface when using forEach @@ -125,8 +132,9 @@ export function getResource( initiatorType?: string ): PerformanceResourceTimingInfo { // de-relativize the URL before usage (does no harm to absolute URLs) - urlNormalizingA.href = spanUrl; - spanUrl = urlNormalizingA.href; + const urlNormalizingAnchor = getUrlNormalizingAnchor(); + urlNormalizingAnchor.href = spanUrl; + spanUrl = urlNormalizingAnchor.href; const filteredResources = filterResourcesForSpan( spanUrl, diff --git a/packages/opentelemetry-web/test/WebTracerProvider.test.ts b/packages/opentelemetry-web/test/WebTracerProvider.test.ts index ea623f9a4e..5bde1bd183 100644 --- a/packages/opentelemetry-web/test/WebTracerProvider.test.ts +++ b/packages/opentelemetry-web/test/WebTracerProvider.test.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import { diag } from '@opentelemetry/api'; import { context, getSpan, setSpan, ContextManager } from '@opentelemetry/api'; import { ZoneContextManager } from '@opentelemetry/context-zone'; import { B3Propagator } from '@opentelemetry/propagator-b3'; @@ -49,7 +50,7 @@ describe('WebTracerProvider', () => { it('should show warning when plugins are defined', () => { const dummyPlugin1 = {}; - const spyWarn = sinon.spy(window.console, 'warn'); + const spyWarn = sinon.spy(diag, 'warn'); const plugins = [dummyPlugin1]; diff --git a/packages/template/package.json b/packages/template/package.json index e5e56ce82e..91c3c00ca0 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -57,8 +57,8 @@ "README.md" ], "devDependencies": { - "@types/node": "14.14.20", - "typescript": "4.1.3" + "@types/node": "14.14.35", + "typescript": "4.2.3" }, "Add these to devDependencies for testing": { "@types/mocha": "8.2.0", diff --git a/renovate.json b/renovate.json index 0e5e362967..de13f791c0 100644 --- a/renovate.json +++ b/renovate.json @@ -1,34 +1,18 @@ { - "extends": [ - "config:base" - ], + "extends": ["config:base"], "packageRules": [ { "groupName": "all non-major dependencies", - "updateTypes": ["patch", "minor"], - "groupSlug": "all-minor-patch" + "groupSlug": "all-minor-patch", + "matchUpdateTypes": ["patch", "minor"] }, { - "packageRules": [ - { - "matchPackageNames": ["@opentelemetry/api"], - "rangeStrategy": "bump" - } - ] + "matchPackageNames": ["@opentelemetry/api"], + "rangeStrategy": "bump" } ], - "ignoreDeps": [ - "gcp-metadata", - "got", - "mocha" - ], - "assignees": [ - "@dyladan", - "@mayurkale22", - "@obecny" - ], - "schedule": [ - "before 3am on Friday" - ], + "ignoreDeps": ["gcp-metadata", "got", "mocha", "husky"], + "assignees": ["@dyladan", "@obecny", "@vmarchaud"], + "schedule": ["before 3am on Friday"], "labels": ["dependencies"] }