Skip to content

Commit

Permalink
Merge branch 'main' into fix-default-grpc-collector-url
Browse files Browse the repository at this point in the history
  • Loading branch information
brunoluiz authored Jul 8, 2021
2 parents a1e63de + 611a30f commit a820b64
Show file tree
Hide file tree
Showing 86 changed files with 559 additions and 548 deletions.
45 changes: 45 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,51 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 0.23.0

### :rocket: (Enhancement)

* `opentelemetry-shim-opentracing`
* [#2282](https://github.com/open-telemetry/opentelemetry-js/pull/2282) feat(shim-opentracing): update logging based on new spec ([@vreynolds](https://github.com/vreynolds))
* `opentelemetry-exporter-collector-grpc`
* [#2304](https://github.com/open-telemetry/opentelemetry-js/pull/2304) feat: otlp-grpc exporter uses headers environment variables ([@vreynolds](https://github.com/vreynolds))
* `opentelemetry-propagator-b3`
* [#2285](https://github.com/open-telemetry/opentelemetry-js/pull/2285) fix(propagator-b3): update extract to check for array ([@jordanworner](https://github.com/jordanworner))
* `opentelemetry-core`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-web`
* [#2226](https://github.com/open-telemetry/opentelemetry-js/pull/2226) fix(xhr): make performance observer work with relative urls ([@mhennoch](https://github.com/mhennoch))

### :books: (Refine Doc)

* Other
* [#2306](https://github.com/open-telemetry/opentelemetry-js/pull/2306) chore: update the website getting started docs ([@dyladan](https://github.com/dyladan))
* [#2283](https://github.com/open-telemetry/opentelemetry-js/pull/2283) Module opentelemetry/instrumentation-grpc required ([@pramodsreek](https://github.com/pramodsreek))
* `opentelemetry-sdk-node`
* [#2300](https://github.com/open-telemetry/opentelemetry-js/pull/2300) chore(README): update link to BatchSpanProcessor in sdk node ([@pragmaticivan](https://github.com/pragmaticivan))
* `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-zipkin`, `opentelemetry-sdk-node`
* [#2290](https://github.com/open-telemetry/opentelemetry-js/pull/2290) fix: service.name resource attribute ([@OmkarKirpan](https://github.com/OmkarKirpan))
* `opentelemetry-resources`
* [#2289](https://github.com/open-telemetry/opentelemetry-js/pull/2289) docs(opentelemetry-resources): fix wrong sample code in readme ([@alisabzevari](https://github.com/alisabzevari))

### :house: (Internal)

* `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-web`
* [#2247](https://github.com/open-telemetry/opentelemetry-js/pull/2247) feat: unify the signatures of bind and with ([@Rauno56](https://github.com/Rauno56))
* Other
* [#2296](https://github.com/open-telemetry/opentelemetry-js/pull/2296) chore: do not upgrade backwards compatibility ([@dyladan](https://github.com/dyladan))
* [#2302](https://github.com/open-telemetry/opentelemetry-js/pull/2302) chore: use setup-node ([@dyladan](https://github.com/dyladan))

### Committers: 9

* Ali Sabzevari ([@alisabzevari](https://github.com/alisabzevari))
* Daniel Dyla ([@dyladan](https://github.com/dyladan))
* Ivan Santos ([@pragmaticivan](https://github.com/pragmaticivan))
* Jordan Worner ([@jordanworner](https://github.com/jordanworner))
* MartenH ([@mhennoch](https://github.com/mhennoch))
* Omkar Kirpan ([@OmkarKirpan](https://github.com/OmkarKirpan))
* Pramod ([@pramodsreek](https://github.com/pramodsreek))
* Rauno Viskus ([@Rauno56](https://github.com/Rauno56))
* Vera Reynolds ([@vreynolds](https://github.com/vreynolds))

## 0.22.0

### :rocket: (Enhancement)
Expand Down
25 changes: 8 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a

| API Version | Core version | Contrib Version |
| ----------- |--------------|-------------------------|
| 1.0.x | 0.22.x | ------ |
| 1.0.x | 0.23.x | 0.23.x |
| 1.0.x | 0.22.x | 0.22.x |
| 0.21.x | 0.21.x | 0.21.x |
| 0.20.x | 0.20.x | 0.20.x |
| v1.0.0-rc.3 | 0.19.x | 0.16.x |
Expand Down Expand Up @@ -79,6 +80,7 @@ If you are a library author looking to build OpenTelemetry into your library, pl

| Platform Version | Supported |
|------------------|-------------------------------------------------|
| Node.JS `v16` ||
| Node.JS `v14` ||
| Node.JS `v12` ||
| Node.JS `v10` ||
Expand All @@ -98,21 +100,11 @@ There is currently no list of officially supported browsers, but OpenTelemetry i

## Feature Status

As of [`v0.19.0`][feature-status-release]:

| Feature | Status |
|---------------------|-------------|
| B3 Propagation | Beta |
| Zipkin Export | Beta |
| Jaeger Propagation | Beta |
| Jaeger Export | Beta |
| OpenTracing Bridge | Beta |
| Resources | Beta |
| Tracing | Beta |
| W3C Baggage | Beta |
| W3C Trace Context | Beta |
| Metrics API | Development |
| Metrics SDK | Development |
| Signal | API Status | SDK Status |
|---------|-------------|-------------------|
| Tracing | Stable | Release Candidate |
| Metrics | Development | Development |
| Logs | Roadmap | Roadmap |

For a more detailed breakdown of feature support see the [specification compliance matrix][compliance-matrix].

Expand Down Expand Up @@ -414,7 +406,6 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[good-first-issues]: https://github.com/open-telemetry/OpenTelemetry-js/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22

[docs]: https://open-telemetry.github.io/opentelemetry-js
[feature-status-release]: https://github.com/open-telemetry/opentelemetry-js/releases/tag/v0.19.0
[compliance-matrix]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md

[otel-metrics]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-metrics
Expand Down
10 changes: 5 additions & 5 deletions backwards-compatability/node10/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "backcompat-node10",
"version": "0.22.0",
"version": "0.23.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.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/sdk-node": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"devDependencies": {
"@types/node": "10.17.59",
"typescript": "4.3.2"
"@types/node": "10.17.60",
"typescript": "4.3.5"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
Expand Down
10 changes: 5 additions & 5 deletions backwards-compatability/node12/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "backcompat-node12",
"version": "0.22.0",
"version": "0.23.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.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/sdk-node": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"devDependencies": {
"@types/node": "12.20.11",
"typescript": "4.3.2"
"@types/node": "12.20.15",
"typescript": "4.3.5"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
Expand Down
8 changes: 4 additions & 4 deletions backwards-compatability/node8/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "backcompat-node8",
"version": "0.22.0",
"version": "0.23.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.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/sdk-node": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"devDependencies": {
"@types/node": "8.10.66",
"typescript": "4.3.2"
"typescript": "4.3.5"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
Expand Down
6 changes: 3 additions & 3 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.22.0",
"version": "0.23.0",
"description": "Example of using @opentelemetry/tracing in Node.js",
"main": "index.js",
"scripts": {
Expand All @@ -25,8 +25,8 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "0.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/exporter-jaeger": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
14 changes: 7 additions & 7 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.22.0",
"version": "0.23.0",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,12 +29,12 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/core": "0.22.0",
"@opentelemetry/exporter-collector": "0.22.0",
"@opentelemetry/exporter-collector-grpc": "0.22.0",
"@opentelemetry/exporter-collector-proto": "0.22.0",
"@opentelemetry/metrics": "0.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/core": "0.23.0",
"@opentelemetry/exporter-collector": "0.23.0",
"@opentelemetry/exporter-collector-grpc": "0.23.0",
"@opentelemetry/exporter-collector-proto": "0.23.0",
"@opentelemetry/metrics": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
14 changes: 7 additions & 7 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.22.0",
"version": "0.23.0",
"description": "Example of @grpc/grpc-js integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,12 +30,12 @@
"dependencies": {
"@grpc/grpc-js": "^1.2.12",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "0.22.0",
"@opentelemetry/exporter-zipkin": "0.22.0",
"@opentelemetry/instrumentation": "0.22.0",
"@opentelemetry/instrumentation-grpc": "0.22.0",
"@opentelemetry/node": "0.22.0",
"@opentelemetry/tracing": "0.22.0",
"@opentelemetry/exporter-jaeger": "0.23.0",
"@opentelemetry/exporter-zipkin": "0.23.0",
"@opentelemetry/instrumentation": "0.23.0",
"@opentelemetry/instrumentation-grpc": "0.23.0",
"@opentelemetry/node": "0.23.0",
"@opentelemetry/tracing": "0.23.0",
"google-protobuf": "^3.9.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
14 changes: 7 additions & 7 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.22.0",
"version": "0.23.0",
"description": "Example of gRPC integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,12 +29,12 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "0.22.0",
"@opentelemetry/exporter-zipkin": "0.22.0",
"@opentelemetry/instrumentation": "0.22.0",
"@opentelemetry/instrumentation-grpc": "0.22.0",
"@opentelemetry/node": "0.22.0",
"@opentelemetry/tracing": "0.22.0",
"@opentelemetry/exporter-jaeger": "0.23.0",
"@opentelemetry/exporter-zipkin": "0.23.0",
"@opentelemetry/instrumentation": "0.23.0",
"@opentelemetry/instrumentation-grpc": "0.23.0",
"@opentelemetry/node": "0.23.0",
"@opentelemetry/tracing": "0.23.0",
"google-protobuf": "^3.9.2",
"grpc": "^1.23.3",
"node-pre-gyp": "0.14.0"
Expand Down
14 changes: 7 additions & 7 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.22.0",
"version": "0.23.0",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,12 +29,12 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "0.22.0",
"@opentelemetry/exporter-zipkin": "0.22.0",
"@opentelemetry/instrumentation": "0.22.0",
"@opentelemetry/instrumentation-http": "0.22.0",
"@opentelemetry/node": "0.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/exporter-jaeger": "0.23.0",
"@opentelemetry/exporter-zipkin": "0.23.0",
"@opentelemetry/instrumentation": "0.23.0",
"@opentelemetry/instrumentation-http": "0.23.0",
"@opentelemetry/node": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 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.22.0",
"version": "0.23.0",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -30,12 +30,12 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "0.22.0",
"@opentelemetry/exporter-zipkin": "0.22.0",
"@opentelemetry/instrumentation": "0.22.0",
"@opentelemetry/instrumentation-http": "0.22.0",
"@opentelemetry/node": "0.22.0",
"@opentelemetry/tracing": "0.22.0"
"@opentelemetry/exporter-jaeger": "0.23.0",
"@opentelemetry/exporter-zipkin": "0.23.0",
"@opentelemetry/instrumentation": "0.23.0",
"@opentelemetry/instrumentation-http": "0.23.0",
"@opentelemetry/node": "0.23.0",
"@opentelemetry/tracing": "0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
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.22.0",
"version": "0.23.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.22.0",
"@opentelemetry/exporter-prometheus": "0.22.0",
"@opentelemetry/metrics": "0.22.0"
"@opentelemetry/core": "0.23.0",
"@opentelemetry/exporter-prometheus": "0.23.0",
"@opentelemetry/metrics": "0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
18 changes: 9 additions & 9 deletions examples/opentracing-shim/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opentracing-shim",
"private": true,
"version": "0.22.0",
"version": "0.23.0",
"description": "Example of using @opentelemetry/shim-opentracing in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,14 +29,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/exporter-jaeger": "0.22.0",
"@opentelemetry/exporter-zipkin": "0.22.0",
"@opentelemetry/instrumentation": "0.22.0",
"@opentelemetry/node": "0.22.0",
"@opentelemetry/resources": "0.22.0",
"@opentelemetry/semantic-conventions": "0.22.0",
"@opentelemetry/shim-opentracing": "0.22.0",
"@opentelemetry/tracing": "0.22.0",
"@opentelemetry/exporter-jaeger": "0.23.0",
"@opentelemetry/exporter-zipkin": "0.23.0",
"@opentelemetry/instrumentation": "0.23.0",
"@opentelemetry/node": "0.23.0",
"@opentelemetry/resources": "0.23.0",
"@opentelemetry/semantic-conventions": "0.23.0",
"@opentelemetry/shim-opentracing": "0.23.0",
"@opentelemetry/tracing": "0.23.0",
"opentracing": "^0.14.4"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
Loading

0 comments on commit a820b64

Please sign in to comment.