Skip to content

Commit

Permalink
Merge 2fd65c1 into 41235a9
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored Mar 2, 2021
2 parents 41235a9 + 2fd65c1 commit e37bc33
Show file tree
Hide file tree
Showing 94 changed files with 346 additions and 307 deletions.
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,44 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 0.18.0

### :bug: (Bug Fix)

* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector`
* [#1938](https://github.com/open-telemetry/opentelemetry-js/pull/1938) fix(exporter-collector): wrong data type for numbers ([@kudlatyamroth](https://github.com/kudlatyamroth))
* `opentelemetry-instrumentation-http`, `opentelemetry-plugin-http`
* [#1939](https://github.com/open-telemetry/opentelemetry-js/pull/1939) fix: use socket from the request ([@mzahor](https://github.com/mzahor))
* `opentelemetry-context-async-hooks`
* [#1937](https://github.com/open-telemetry/opentelemetry-js/pull/1937) fix: isolate binding EventEmitter ([@Flarna](https://github.com/Flarna))

### :books: (Refine Doc)

* [#1973](https://github.com/open-telemetry/opentelemetry-js/pull/1973) docs(readme): fix @opentelemetry/instrumentation-http link ([@Hongbo-Miao](https://github.com/Hongbo-Miao))
* [#1941](https://github.com/open-telemetry/opentelemetry-js/pull/1941) fix: update readme upgrade guidelines version setting ([@MSNev](https://github.com/MSNev))

### :house: (Internal)

* `opentelemetry-api-metrics`, `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-grpc-utils`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-plugin-grpc-js`, `opentelemetry-plugin-grpc`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-propagator-b3`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
* [#1977](https://github.com/open-telemetry/opentelemetry-js/pull/1977) chore: update API to 0.18.0 ([@Flarna](https://github.com/Flarna))
* Other
* [#1960](https://github.com/open-telemetry/opentelemetry-js/pull/1960) chore: updating current state of compatibility matrix ([@obecny](https://github.com/obecny))
* `opentelemetry-api-metrics`, `opentelemetry-api`, `opentelemetry-context-async-hooks`, `opentelemetry-context-base`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-grpc-utils`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-plugin-grpc-js`, `opentelemetry-plugin-grpc`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-propagator-b3`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
* [#1942](https://github.com/open-telemetry/opentelemetry-js/pull/1942) chore: remove API and context-base ([@dyladan](https://github.com/dyladan))
* `opentelemetry-core`, `opentelemetry-exporter-collector`, `opentelemetry-instrumentation-http`, `opentelemetry-metrics`, `opentelemetry-plugin-http`
* [#1922](https://github.com/open-telemetry/opentelemetry-js/pull/1922) chore: lint on shadowing in non-test sources, fix a few of them ([@johnbley](https://github.com/johnbley))

### Committers: 8

* Bartlomiej Obecny ([@obecny](https://github.com/obecny))
* Daniel Dyla ([@dyladan](https://github.com/dyladan))
* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
* Hongbo Miao ([@Hongbo-Miao](https://github.com/Hongbo-Miao))
* John Bley ([@johnbley](https://github.com/johnbley))
* Karol Fuksiewicz ([@kudlatyamroth](https://github.com/kudlatyamroth))
* Marian Zagoruiko ([@mzahor](https://github.com/mzahor))
* Nev ([@MSNev](https://github.com/MSNev))

## 0.17.0

### :boom: Breaking Change
Expand Down
27 changes: 14 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a

## Compatibility Matrix

| Core version | Contrib Version |
|--------------|-------------------------|
| 0.17.x | 0.14.x not released yet |
| 0.16.x | ------ |
| 0.15.x | 0.13.x |
| 0.14.x | 0.12.x |
| 0.13.x | ------ |
| 0.12.x | 0.11.x |
| 0.11.x | 0.10.x |
| API Version | Core version | Contrib Version |
| ----------- |--------------|-------------------------|
| 0.18.x | 0.18.x | 0.14.x not released yet |
| | 0.17.x | ------ |
| | 0.16.x | ------ |
| | 0.15.x | 0.13.x |
| | 0.14.x | 0.12.x |
| | 0.13.x | ------ |
| | 0.12.x | 0.11.x |
| | 0.11.x | 0.10.x |

## Quick start

Expand Down Expand Up @@ -247,6 +248,8 @@ To request automatic tracing support for a module not on this list, please [file

### 0.17.0 to 0.18.0

- `diag.setLogLevel` is removed and LogLevel can be set by an optional second parameter to `setLogger`

[PR-1975](https://github.com/open-telemetry/opentelemetry-js/pull/1975)

- Breaking change - The resulting resource MUST have all attributes that are on any of the two input resources. If a key exists on both the old and updating resource, the value of the updating resource MUST be picked - previously it was opposite.
Expand All @@ -266,12 +269,10 @@ The new global [```api.diag```](https://github.com/open-telemetry/opentelemetry-
All included logger references have been removed in preference to using the global ```api.diag``` directly, so you no longer need to pass around the logger instance via function parameters or included as part of the configuration for a component.

```javascript
// Setting the default Global logger to use the Console
import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
diag.setLogger(new DiagConsoleLogger())

// Setting the default Global logger to use the Console
// And optionally change the logging level (Defaults to INFO)
diag.setLogLevel(DiagLogLevel.ERROR);
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR)
```

#### Using the logger anywhere in the code
Expand Down
6 changes: 3 additions & 3 deletions backwards-compatability/node10/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node10",
"version": "0.17.0",
"version": "0.18.0",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/sdk-node": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"devDependencies": {
"@types/node": "10.17.50",
Expand Down
6 changes: 3 additions & 3 deletions backwards-compatability/node12/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node12",
"version": "0.17.0",
"version": "0.18.0",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/sdk-node": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"devDependencies": {
"@types/node": "12.19.13",
Expand Down
6 changes: 3 additions & 3 deletions backwards-compatability/node8/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node8",
"version": "0.17.0",
"version": "0.18.0",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/sdk-node": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"devDependencies": {
"@types/node": "8.10.66",
Expand Down
8 changes: 4 additions & 4 deletions examples/basic-tracer-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-basic-tracer-node",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of using @opentelemetry/tracing in Node.js",
"main": "index.js",
"scripts": {
Expand All @@ -24,9 +24,9 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
3 changes: 1 addition & 2 deletions examples/collector-exporter-node/metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector')
const { MeterProvider } = require('@opentelemetry/metrics');

// Optional and only needed to see the internal diagnostic logging (during development)
diag.setLogger(new DiagConsoleLogger());
diag.setLogLevel(DiagLogLevel.DEBUG);
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);

const metricExporter = new CollectorMetricExporter({
serviceName: 'basic-metric-service',
Expand Down
16 changes: 8 additions & 8 deletions examples/collector-exporter-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-collector-exporter-node",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand All @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/exporter-collector-grpc": "^0.17.0",
"@opentelemetry/exporter-collector-proto": "^0.17.0",
"@opentelemetry/metrics": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-collector": "^0.18.0",
"@opentelemetry/exporter-collector-grpc": "^0.18.0",
"@opentelemetry/exporter-collector-proto": "^0.18.0",
"@opentelemetry/metrics": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
6 changes: 4 additions & 2 deletions examples/collector-exporter-node/tracing.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
// const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-grpc');
// const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto');

// opentelemetry.diag.setLogger(new opentelemetry.DiagConsoleLogger());
// opentelemetry.diag.setLogLevel(opentelemetry.DiagLogLevel.DEBUG);
// opentelemetry.diag.setLogger(
// new opentelemetry.DiagConsoleLogger(),
// opentelemetry.DiagLogLevel.DEBUG,
// );

const exporter = new CollectorTraceExporter({
serviceName: 'basic-service',
Expand Down
16 changes: 8 additions & 8 deletions examples/grpc-js/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grpc-js-example",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of @grpc/grpc-js integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,13 +29,13 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.0.5",
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-grpc-js": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-grpc-js": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"google-protobuf": "^3.9.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
16 changes: 8 additions & 8 deletions examples/grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grpc-example",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of gRPC integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand All @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-grpc": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-grpc": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"google-protobuf": "^3.9.2",
"grpc": "^1.23.3",
"node-pre-gyp": "0.14.0"
Expand Down
16 changes: 8 additions & 8 deletions examples/http/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "http-example",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand All @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions examples/https/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "https-example",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -29,13 +29,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-https": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-https": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions examples/metrics/metrics/observer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ const { DiagConsoleLogger, DiagLogLevel, diag } = require('@opentelemetry/api');
const { PrometheusExporter } = require('@opentelemetry/exporter-prometheus');

// Optional and only needed to see the internal diagnostic logging (during development)
diag.setLogger(new DiagConsoleLogger());
diag.setLogLevel(DiagLogLevel.DEBUG);
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);

const exporter = new PrometheusExporter(
{
Expand Down
8 changes: 4 additions & 4 deletions examples/metrics/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-metrics",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"description": "Example of using @opentelemetry/metrics",
"main": "index.js",
"scripts": {
Expand All @@ -26,9 +26,9 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/exporter-prometheus": "^0.17.0",
"@opentelemetry/metrics": "^0.17.0"
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-prometheus": "^0.18.0",
"@opentelemetry/metrics": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
Loading

0 comments on commit e37bc33

Please sign in to comment.