Skip to content

Commit

Permalink
chore: merge branch 'main' into merge
Browse files Browse the repository at this point in the history
  • Loading branch information
obecny committed Oct 12, 2021
2 parents 667f0a7 + ed0ba06 commit 9114417
Show file tree
Hide file tree
Showing 203 changed files with 753 additions and 394 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
with:
path: |
experimental/node_modules
experimental/packages/*/node_modules
experimental/*/*/node_modules
key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('experimental/**/package.json') }}

- name: Bootstrap
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
with:
path: |
experimental/node_modules
experimental/packages/*/node_modules
experimental/*/*/node_modules
key: browser-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}

- name: Bootstrap
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/w3c-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
package-lock.json
packages/*/package-lock.json
benchmark/*/package-lock.json
backwards-compatability/*/package-lock.json
metapackages/*/package-lock.json
packages/*/package-lock.json
integration-tests/*/package-lock.json
Expand Down
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "packages/opentelemetry-exporter-otlp-grpc/protos"]
path = packages/opentelemetry-exporter-otlp-grpc/protos
[submodule "experimental/packages/opentelemetry-exporter-otlp-proto/protos"]
path = experimental/packages/opentelemetry-exporter-otlp-proto/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "packages/opentelemetry-exporter-otlp-proto/protos"]
path = packages/opentelemetry-exporter-otlp-proto/protos
[submodule "experimental/packages/opentelemetry-exporter-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-otlp-grpc/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
92 changes: 92 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,96 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 1.0.0

No changes

## 0.26.0

### :boom: Breaking Change

* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-otlp-grpc`, `opentelemetry-exporter-otlp-http`, `opentelemetry-exporter-otlp-proto`
* [#2476](https://github.com/open-telemetry/opentelemetry-js/pull/2476) chore!: rename collector exporters ([@dyladan](https://github.com/dyladan))
* `opentelemetry-core`, `opentelemetry-instrumentation-grpc`, `opentelemetry-sdk-trace-base`, `opentelemetry-shim-opentracing`
* [#2429](https://github.com/open-telemetry/opentelemetry-js/pull/2429) fix!: remove 'Http' from W3C propagator names ([@aabmass](https://github.com/aabmass))

### :rocket: (Enhancement)

* `opentelemetry-core`, `opentelemetry-sdk-trace-base`
* [#2430](https://github.com/open-telemetry/opentelemetry-js/pull/2430) feat(opentelemetry-sdk-trace-base): implemented general limits of attributes ([@banothurameshnaik](https://github.com/banothurameshnaik))
* [#2418](https://github.com/open-telemetry/opentelemetry-js/pull/2418) feat(opentelemetry-sdk-trace-base): implemented option to limit length of values of attributes ([@banothurameshnaik](https://github.com/banothurameshnaik))
* `opentelemetry-instrumentation`
* [#2450](https://github.com/open-telemetry/opentelemetry-js/pull/2450) fix: handle missing package.json file when checking for version ([@nozik](https://github.com/nozik))
* `opentelemetry-semantic-conventions`
* [#2456](https://github.com/open-telemetry/opentelemetry-js/pull/2456) feat: upgrade semantic conventions to the latest 1.6.1 version ([@weyert](https://github.com/weyert))
* `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`
* [#2438](https://github.com/open-telemetry/opentelemetry-js/pull/2438) feat: OTEL_EXPORTER_OTLP_ENDPOINT append version and signal ([@longility](https://github.com/longility))

### :bug: (Bug Fix)

* Other
* [#2494](https://github.com/open-telemetry/opentelemetry-js/pull/2494) fix: remove setting http.route in http span attributes ([@mustafain117](https://github.com/mustafain117))
* `opentelemetry-instrumentation-fetch`
* [#2426](https://github.com/open-telemetry/opentelemetry-js/pull/2426) fix(opentelemetry-instrumentation-fetch): fixed override of headers ([@philipszalla](https://github.com/philipszalla))
* `opentelemetry-sdk-trace-base`
* [#2434](https://github.com/open-telemetry/opentelemetry-js/pull/2434) fix: ReferenceError when OTEL_TRACES_SAMPLER used without OTEL_TRACES_SAMPLER_ARG ([@hermanbanken](https://github.com/hermanbanken))

### :books: (Refine Doc)

* [#2478](https://github.com/open-telemetry/opentelemetry-js/pull/2478) Update links to packages moved to experimental ([@jessitron](https://github.com/jessitron))
* [#2463](https://github.com/open-telemetry/opentelemetry-js/pull/2463) docs(README): Fix links in README.md ([@JamesJHPark](https://github.com/JamesJHPark))
* [#2437](https://github.com/open-telemetry/opentelemetry-js/pull/2437) docs(examples): updated examples readme links ([@banothurameshnaik](https://github.com/banothurameshnaik))
* [#2421](https://github.com/open-telemetry/opentelemetry-js/pull/2421) docs(website): support GH page links to canonical src ([@chalin](https://github.com/chalin))
* [#2408](https://github.com/open-telemetry/opentelemetry-js/pull/2408) docs: make link to exporters filter only exporters ([@Rauno56](https://github.com/Rauno56))
* [#2297](https://github.com/open-telemetry/opentelemetry-js/pull/2297) eslint configuration for getting-started examples ([@alisabzevari](https://github.com/alisabzevari))

### :house: (Internal)

* `opentelemetry-exporter-otlp-http`
* [#2490](https://github.com/open-telemetry/opentelemetry-js/pull/2490) chore: mark otlp exporters experimental ([@dyladan](https://github.com/dyladan))
* [#2491](https://github.com/open-telemetry/opentelemetry-js/pull/2491) fix: remove usage of serviceName property in tests for otel collector ([@mustafain117](https://github.com/mustafain117))
* `opentelemetry-sdk-node`
* [#2473](https://github.com/open-telemetry/opentelemetry-js/pull/2473) chore: move sdk-node to experimental ([@dyladan](https://github.com/dyladan))
* [#2453](https://github.com/open-telemetry/opentelemetry-js/pull/2453) chore(sdk-node): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
* Other
* [#2469](https://github.com/open-telemetry/opentelemetry-js/pull/2469) Drop website_docs folder ([@chalin](https://github.com/chalin))
* [#2474](https://github.com/open-telemetry/opentelemetry-js/pull/2474) chore: move missed test file to its package ([@dyladan](https://github.com/dyladan))
* [#2435](https://github.com/open-telemetry/opentelemetry-js/pull/2435) chore: simplify unit test cache ([@dyladan](https://github.com/dyladan))
* `opentelemetry-context-zone`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resources`, `opentelemetry-sdk-metrics-base`, `opentelemetry-sdk-node`, `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-web`
* [#2462](https://github.com/open-telemetry/opentelemetry-js/pull/2462) chore: split stable and experimental packages into groups using directories ([@dyladan](https://github.com/dyladan))
* `opentelemetry-instrumentation-http`
* [#2126](https://github.com/open-telemetry/opentelemetry-js/pull/2126) feat(instrumentation-http): add diag debug on http request events ([@Asafb26](https://github.com/Asafb26))
* [#2455](https://github.com/open-telemetry/opentelemetry-js/pull/2455) chore(instrumentation-http): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
* `opentelemetry-instrumentation-fetch`
* [#2454](https://github.com/open-telemetry/opentelemetry-js/pull/2454) chore(instrumentation-fetch): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
* `opentelemetry-exporter-collector`
* [#2452](https://github.com/open-telemetry/opentelemetry-js/pull/2452) chore(exporter-collector): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
* `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-node`
* [#2446](https://github.com/open-telemetry/opentelemetry-js/pull/2446) chore(sdk-trace): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))
* `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-shim-opentracing`
* [#2447](https://github.com/open-telemetry/opentelemetry-js/pull/2447) chore(exporter): fix lint warnings ([@alisabzevari](https://github.com/alisabzevari))

### Committers: 18

* Aaron Abbott ([@aabmass](https://github.com/aabmass))
* Ali Sabzevari ([@alisabzevari](https://github.com/alisabzevari))
* Asaf Ben Aharon ([@Asafb26](https://github.com/Asafb26))
* Banothu Ramesh Naik ([@banothurameshnaik](https://github.com/banothurameshnaik))
* Daniel Dyla ([@dyladan](https://github.com/dyladan))
* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
* Herman ([@hermanbanken](https://github.com/hermanbanken))
* James ([@JamesJHPark](https://github.com/JamesJHPark))
* Jessica Kerr ([@jessitron](https://github.com/jessitron))
* Long Mai ([@longility](https://github.com/longility))
* Mustafain Ali Khan ([@mustafain117](https://github.com/mustafain117))
* Patrice Chalin ([@chalin](https://github.com/chalin))
* Philip Szalla ([@philipszalla](https://github.com/philipszalla))
* Ran Nozik ([@nozik](https://github.com/nozik))
* Rauno Viskus ([@Rauno56](https://github.com/Rauno56))
* Siim Kallas ([@seemk](https://github.com/seemk))
* Weyert de Boer ([@weyert](https://github.com/weyert))
* legendecas ([@legendecas](https://github.com/legendecas))

## 0.25.0

### :boom: Breaking Change
Expand All @@ -20,6 +110,8 @@ All notable changes to this project will be documented in this file.

### :bug: (Bug Fix)

* `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-jaeger`, `opentelemetry-exporter-zipkin`, `opentelemetry-sdk-trace-base`
* [#2499](https://github.com/open-telemetry/opentelemetry-js/pull/2499) fix: 2389- replaced logger unformatted strings with template literals ([@PaurushGarg](https://github.com/PaurushGarg))
* `opentelemetry-instrumentation-fetch`
* [#2411](https://github.com/open-telemetry/opentelemetry-js/pull/2411) fix(instrumentation-fetch): `fetch(string, Request)` silently drops request body ([@t2t2](https://github.com/t2t2))
* `opentelemetry-sdk-trace-base`
Expand Down
36 changes: 19 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,25 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a

## Compatibility Matrix

| API Version | Core version | Contrib Version |
| ----------- |--------------|-------------------------|
| 1.0.x | 0.25.x | ------ |
| 1.0.x | 0.24.x | 0.24.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 |
| 0.18.x | 0.18.x | 0.14.x |
| | 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 |
| API Version | Core version | Experimental Packages | Contrib Version |
| ----------- |--------------| --------------------- |-------------------------|
| 1.0.x | 1.x | 0.26.x | ------ |
| 1.0.x | 0.26.x | ----- | ------ |
| 1.0.x | 0.25.x | ----- | ------ |
| 1.0.x | 0.24.x | ----- | 0.24.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 |
| 0.18.x | 0.18.x | ----- | 0.14.x |
| | 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 |

## Versioning

Expand Down
2 changes: 1 addition & 1 deletion doc/exporter-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ Please refer to the [Prometheus Exporter][prometheus-exporter] for more comprehe

[zipkin-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-zipkin
[jaeger-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-jaeger
[prometheus-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-prometheus
[prometheus-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-exporter-prometheus
8 changes: 4 additions & 4 deletions doc/instrumentation-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ A detailed explained guide how to instrument a package is available at [instrume
For more comprehensive examples please refer to the [HTTP instrumentation][http-instrumentation] or [gRPC instrumentation][grpc-instrumentation] for node
and [XMLHttpRequest instrumentation][xhr-instrumentation] for web.

[base-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation
[http-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/http.ts#L59
[grpc-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts#L28
[xhr-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L71
[base-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation
[http-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-http/src/http.ts#L59
[grpc-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts#L28
[xhr-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L71
2 changes: 1 addition & 1 deletion examples/metrics/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ npm install
```

How to setup [Prometheus](https://prometheus.io/docs/prometheus/latest/getting_started/) please check
[Setup Prometheus](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-prometheus)
[Setup Prometheus](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus)

## Run the Application

Expand Down
4 changes: 2 additions & 2 deletions examples/otlp-exporter-node/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Overview

This example shows how to use [@opentelemetry/exporter-otlp-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application.
This example shows how to use [@opentelemetry/exporter-otlp-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application.

This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](https://github.com/open-telemetry/opentelemetry-proto).
This example will export spans data simultaneously using [Exporter Collector](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](https://github.com/open-telemetry/opentelemetry-proto).

## Installation

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node10",
"version": "0.25.0",
"version": "0.26.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"
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-node": "0.26.0",
"@opentelemetry/sdk-trace-base": "1.0.0"
},
"devDependencies": {
"@types/node": "10.17.60",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.es5.json",
"extends": "../../../tsconfig.es5.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -9,7 +9,7 @@
],
"references": [
{
"path": "../../packages/opentelemetry-sdk-trace-base"
"path": "../../packages/opentelemetry-sdk-node"
}
]
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node12",
"version": "0.25.0",
"version": "0.26.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"
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-node": "0.26.0",
"@opentelemetry/sdk-trace-base": "1.0.0"
},
"devDependencies": {
"@types/node": "12.20.20",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.es5.json",
"extends": "../../../tsconfig.es5.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -9,7 +9,7 @@
],
"references": [
{
"path": "../../packages/opentelemetry-sdk-trace-base"
"path": "../../packages/opentelemetry-sdk-node"
}
]
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node8",
"version": "0.25.0",
"version": "0.26.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"
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
"@opentelemetry/sdk-node": "0.26.0",
"@opentelemetry/sdk-trace-base": "1.0.0"
},
"devDependencies": {
"@types/node": "8.10.66",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.es5.json",
"extends": "../../../tsconfig.es5.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -9,7 +9,7 @@
],
"references": [
{
"path": "../../packages/opentelemetry-sdk-trace-base"
"path": "../../packages/opentelemetry-sdk-node"
}
]
}
5 changes: 3 additions & 2 deletions experimental/lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"lerna": "3.13.4",
"version": "0.25.0",
"version": "0.26.0",
"npmClient": "npm",
"packages": [
"packages/*"
"packages/*",
"backwards-compatability/*"
]
}
Loading

0 comments on commit 9114417

Please sign in to comment.