Skip to content

Commit

Permalink
Merge af8c437 into 506f40b
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored Aug 24, 2022
2 parents 506f40b + af8c437 commit 1bea328
Show file tree
Hide file tree
Showing 44 changed files with 253 additions and 233 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ All notable changes to this project will be documented in this file.

### :rocket: (Enhancement)

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 1.6.0

### :rocket: (Enhancement)

* perf(opentelemetry-core): improve hexToBase64 performance [#3178](https://github.com/open-telemetry/opentelemetry-js/pull/3178)
* feat(sdk-trace-base): move Sampler declaration into sdk-trace-base [#3088](https://github.com/open-telemetry/opentelemetry-js/pull/3088) @legendecas
* fix(grpc-instrumentation): added grpc attributes in instrumentation [#3127](https://github.com/open-telemetry/opentelemetry-js/pull/3127) @andrewzenkov
Expand Down
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a

| API Version | Core version | Experimental Packages |
| ----------- | ------------ | --------------------- |
| 1.1.x | 1.3.x | 0.30.x |
| 1.1.x | 1.2.x | 0.29.x |
| 1.2.x | 1.6.x | 0.32.x |
| 1.1.x | 1.5.x | 0.31.x |
| 1.1.x | 1.4.x | 0.30.x |
| 1.1.x | 1.2.x, 1.3.x | 0.29.x |
| 1.1.x | 1.1.x | 0.28.x |
| 1.0.x | 1.0.x | 0.26.x, 0.27.x |
| 1.0.x | 0.26.x | ----- |
Expand Down Expand Up @@ -225,12 +227,12 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem

### Implementation / SDKs

| Package | Description |
| ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [@opentelemetry/sdk-trace-base][otel-tracing] | This module provides a full control over instrumentation and span creation. It doesn't load [`async_hooks`](https://nodejs.org/api/async_hooks.html) or any instrumentation by default. It is intended for use both on the server and in the browser. |
| [@opentelemetry/sdk-metrics][otel-metrics] | This module provides instruments and meters for reporting of time series data. |
| [@opentelemetry/sdk-trace-node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. |
| [@opentelemetry/sdk-trace-web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. |
| Package | Description |
| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [@opentelemetry/sdk-trace-base][otel-tracing] | This module provides a full control over instrumentation and span creation. It doesn't load [`async_hooks`](https://nodejs.org/api/async_hooks.html) or any instrumentation by default. It is intended for use both on the server and in the browser. |
| [@opentelemetry/sdk-metrics][otel-metrics] | This module provides instruments and meters for reporting of time series data. |
| [@opentelemetry/sdk-trace-node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. |
| [@opentelemetry/sdk-trace-web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. |

### Compatible Exporters

Expand Down
18 changes: 9 additions & 9 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.31.0",
"version": "0.32.0",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -33,14 +33,14 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "1.5.0",
"@opentelemetry/exporter-zipkin": "1.5.0",
"@opentelemetry/instrumentation": "0.31.0",
"@opentelemetry/instrumentation-http": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-trace-base": "1.5.0",
"@opentelemetry/sdk-trace-node": "1.5.0",
"@opentelemetry/semantic-conventions": "1.5.0"
"@opentelemetry/exporter-jaeger": "1.6.0",
"@opentelemetry/exporter-zipkin": "1.6.0",
"@opentelemetry/instrumentation": "0.32.0",
"@opentelemetry/instrumentation-http": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-trace-base": "1.6.0",
"@opentelemetry/sdk-trace-node": "1.6.0",
"@opentelemetry/semantic-conventions": "1.6.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
"devDependencies": {
Expand Down
30 changes: 15 additions & 15 deletions examples/opentelemetry-web/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "web-opentelemetry-example",
"private": true,
"version": "0.31.0",
"version": "0.32.0",
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -43,20 +43,20 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/api-metrics": "0.31.0",
"@opentelemetry/context-zone": "^1.0.1",
"@opentelemetry/core": "^1.0.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.31.0",
"@opentelemetry/exporter-trace-otlp-http": "0.31.0",
"@opentelemetry/exporter-zipkin": "^1.0.1",
"@opentelemetry/instrumentation": "0.31.0",
"@opentelemetry/instrumentation-fetch": "0.31.0",
"@opentelemetry/instrumentation-xml-http-request": "0.31.0",
"@opentelemetry/propagator-b3": "^1.0.1",
"@opentelemetry/sdk-metrics": "0.31.0",
"@opentelemetry/sdk-trace-base": "^1.0.1",
"@opentelemetry/sdk-trace-web": "^1.0.1",
"@opentelemetry/semantic-conventions": "^1.0.1"
"@opentelemetry/api-metrics": "0.32.0",
"@opentelemetry/context-zone": "1.6.0",
"@opentelemetry/core": "1.6.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.32.0",
"@opentelemetry/exporter-trace-otlp-http": "0.32.0",
"@opentelemetry/exporter-zipkin": "1.6.0",
"@opentelemetry/instrumentation": "0.32.0",
"@opentelemetry/instrumentation-fetch": "0.32.0",
"@opentelemetry/instrumentation-xml-http-request": "0.32.0",
"@opentelemetry/propagator-b3": "1.6.0",
"@opentelemetry/sdk-metrics": "0.32.0",
"@opentelemetry/sdk-trace-base": "1.6.0",
"@opentelemetry/sdk-trace-web": "1.6.0",
"@opentelemetry/semantic-conventions": "1.6.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
}
26 changes: 13 additions & 13 deletions examples/otlp-exporter-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-otlp-exporter-node",
"private": true,
"version": "0.31.0",
"version": "0.32.0",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,18 +29,18 @@
},
"dependencies": {
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/api-metrics": "0.31.0",
"@opentelemetry/core": "1.5.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.31.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.31.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.31.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.31.0",
"@opentelemetry/exporter-trace-otlp-http": "0.31.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-metrics": "0.31.0",
"@opentelemetry/sdk-trace-base": "1.5.0",
"@opentelemetry/semantic-conventions": "1.5.0"
"@opentelemetry/api-metrics": "0.32.0",
"@opentelemetry/core": "1.6.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.32.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.32.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.32.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.32.0",
"@opentelemetry/exporter-trace-otlp-http": "0.32.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-metrics": "0.32.0",
"@opentelemetry/sdk-trace-base": "1.6.0",
"@opentelemetry/semantic-conventions": "1.6.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
16 changes: 12 additions & 4 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ All notable changes to experimental packages in this project will be documented

### :boom: Breaking Change

### :rocket: (Enhancement)

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 0.32.0

### :boom: Breaking Change

* Rename @opentelemetry/sdk-metrics-base package to @opentelemetry/sdk-metrics [#3162](https://github.com/open-telemetry/opentelemetry-js/pull/3162) @hectorhdzg

### :rocket: (Enhancement)
Expand All @@ -19,10 +31,6 @@ All notable changes to experimental packages in this project will be documented

* fix(instrumentation-http): add `http.host` attribute before sending the request #3054 @cuichenli

### :books: (Refine Doc)

### :house: (Internal)

## 0.31.0

### :boom: Breaking Change
Expand Down
6 changes: 3 additions & 3 deletions experimental/backwards-compatability/node14/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node14",
"version": "0.31.0",
"version": "0.32.0",
"private": true,
"description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -9,8 +9,8 @@
"peer-api-check": "node ../../../scripts/peer-api-check.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.31.0",
"@opentelemetry/sdk-trace-base": "1.5.0"
"@opentelemetry/sdk-node": "0.32.0",
"@opentelemetry/sdk-trace-base": "1.6.0"
},
"devDependencies": {
"@types/node": "14.18.25",
Expand Down
6 changes: 3 additions & 3 deletions experimental/backwards-compatability/node16/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node16",
"version": "0.31.0",
"version": "0.32.0",
"private": true,
"description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -9,8 +9,8 @@
"peer-api-check": "node ../../../scripts/peer-api-check.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.31.0",
"@opentelemetry/sdk-trace-base": "1.5.0"
"@opentelemetry/sdk-node": "0.32.0",
"@opentelemetry/sdk-trace-base": "1.6.0"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
14 changes: 7 additions & 7 deletions experimental/packages/exporter-trace-otlp-grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "0.31.0",
"version": "0.32.0",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/otlp-exporter-base": "0.31.0",
"@opentelemetry/otlp-exporter-base": "0.32.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -69,11 +69,11 @@
"dependencies": {
"@grpc/grpc-js": "^1.5.9",
"@grpc/proto-loader": "^0.6.9",
"@opentelemetry/core": "1.5.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.31.0",
"@opentelemetry/otlp-transformer": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-trace-base": "1.5.0"
"@opentelemetry/core": "1.6.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.32.0",
"@opentelemetry/otlp-transformer": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-trace-base": "1.6.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc"
}
12 changes: 6 additions & 6 deletions experimental/packages/exporter-trace-otlp-http/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-http",
"version": "0.31.0",
"version": "0.32.0",
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -94,11 +94,11 @@
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/core": "1.5.0",
"@opentelemetry/otlp-exporter-base": "0.31.0",
"@opentelemetry/otlp-transformer": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-trace-base": "1.5.0"
"@opentelemetry/core": "1.6.0",
"@opentelemetry/otlp-exporter-base": "0.32.0",
"@opentelemetry/otlp-transformer": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-trace-base": "1.6.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http"
}
14 changes: 7 additions & 7 deletions experimental/packages/exporter-trace-otlp-proto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-proto",
"version": "0.31.0",
"version": "0.32.0",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -67,12 +67,12 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.6.9",
"@opentelemetry/core": "1.5.0",
"@opentelemetry/otlp-exporter-base": "0.31.0",
"@opentelemetry/otlp-proto-exporter-base": "0.31.0",
"@opentelemetry/otlp-transformer": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-trace-base": "1.5.0",
"@opentelemetry/core": "1.6.0",
"@opentelemetry/otlp-exporter-base": "0.32.0",
"@opentelemetry/otlp-proto-exporter-base": "0.32.0",
"@opentelemetry/otlp-transformer": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-trace-base": "1.6.0",
"protobufjs": "^6.9.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-metrics",
"version": "0.31.0",
"version": "0.32.0",
"description": "Public metrics API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-metrics-otlp-grpc",
"version": "0.31.0",
"version": "0.32.0",
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/api-metrics": "0.31.0",
"@opentelemetry/api-metrics": "0.32.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -69,12 +69,12 @@
"dependencies": {
"@grpc/grpc-js": "^1.5.9",
"@grpc/proto-loader": "^0.6.9",
"@opentelemetry/core": "1.5.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.31.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.31.0",
"@opentelemetry/otlp-transformer": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-metrics": "0.31.0"
"@opentelemetry/core": "1.6.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.32.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.32.0",
"@opentelemetry/otlp-transformer": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-metrics": "0.32.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-metrics-otlp-http",
"version": "0.31.0",
"version": "0.32.0",
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -94,12 +94,12 @@
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/api-metrics": "0.31.0",
"@opentelemetry/core": "1.5.0",
"@opentelemetry/otlp-exporter-base": "0.31.0",
"@opentelemetry/otlp-transformer": "0.31.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/sdk-metrics": "0.31.0"
"@opentelemetry/api-metrics": "0.32.0",
"@opentelemetry/core": "1.6.0",
"@opentelemetry/otlp-exporter-base": "0.32.0",
"@opentelemetry/otlp-transformer": "0.32.0",
"@opentelemetry/resources": "1.6.0",
"@opentelemetry/sdk-metrics": "0.32.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http"
}
Loading

0 comments on commit 1bea328

Please sign in to comment.