Skip to content

Commit

Permalink
Merge branch 'main' into metrics/cumulative-batch
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Mar 14, 2023
2 parents 41d3d1e + d82a098 commit 6ba09a2
Show file tree
Hide file tree
Showing 63 changed files with 2,068 additions and 266 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,24 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

## Unreleased

* feat: collect host id for non-cloud environments [#3575](https://github.com/open-telemetry/opentelemetry-js/pull/3575) @mwear

### :boom: Breaking Change

### :rocket: (Enhancement)

* feat(sdk-metrics): add exponential histogram accumulation / aggregator [#3505](https://github.com/open-telemetry/opentelemetry-js/pull/3505) @mwear

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 1.10.0

### :rocket: (Enhancement)

* feat(resource): create sync resource with some attributes that resolve asynchronously [#3460](https://github.com/open-telemetry/opentelemetry-js/pull/3460) @samimusallam
* feat: collect host id for non-cloud environments [#3575](https://github.com/open-telemetry/opentelemetry-js/pull/3575) @mwear
* feat (api-logs): separate Events API into its own package [3550](https://github.com/open-telemetry/opentelemetry-js/pull/3550) @martinkuba
* feat(sdk-metrics): apply binary search in histogram recording [#3539](https://github.com/open-telemetry/opentelemetry-js/pull/3539) @legendecas
* perf(propagator-jaeger): improve deserializeSpanContext performance [#3541](https://github.com/open-telemetry/opentelemetry-js/pull/3541) @doochik
Expand Down
2 changes: 2 additions & 0 deletions api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 1.4.1

### :bug: (Bug Fix)

* fix(metrics): export `MetricsAPI` type [#3535](https://github.com/open-telemetry/opentelemetry-js/pull/3535)
Expand Down
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api",
"version": "1.4.0",
"version": "1.4.1",
"description": "Public API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
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.35.1",
"version": "0.36.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.9.1",
"@opentelemetry/exporter-zipkin": "1.9.1",
"@opentelemetry/instrumentation": "0.35.1",
"@opentelemetry/instrumentation-http": "0.35.1",
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1",
"@opentelemetry/sdk-trace-node": "1.9.1",
"@opentelemetry/semantic-conventions": "1.9.1"
"@opentelemetry/exporter-jaeger": "1.10.0",
"@opentelemetry/exporter-zipkin": "1.10.0",
"@opentelemetry/instrumentation": "0.36.0",
"@opentelemetry/instrumentation-http": "0.36.0",
"@opentelemetry/resources": "1.10.0",
"@opentelemetry/sdk-trace-base": "1.10.0",
"@opentelemetry/sdk-trace-node": "1.10.0",
"@opentelemetry/semantic-conventions": "1.10.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.35.1",
"version": "0.36.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.3.0",
"@opentelemetry/context-zone": "1.9.1",
"@opentelemetry/core": "1.9.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.35.1",
"@opentelemetry/exporter-trace-otlp-http": "0.35.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.35.1",
"@opentelemetry/exporter-zipkin": "1.9.1",
"@opentelemetry/instrumentation": "0.35.1",
"@opentelemetry/instrumentation-fetch": "0.35.1",
"@opentelemetry/instrumentation-xml-http-request": "0.35.1",
"@opentelemetry/propagator-b3": "1.9.1",
"@opentelemetry/sdk-metrics": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1",
"@opentelemetry/sdk-trace-web": "1.9.1",
"@opentelemetry/semantic-conventions": "1.9.1"
"@opentelemetry/context-zone": "1.10.0",
"@opentelemetry/core": "1.10.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.36.0",
"@opentelemetry/exporter-trace-otlp-http": "0.36.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.36.0",
"@opentelemetry/exporter-zipkin": "1.10.0",
"@opentelemetry/instrumentation": "0.36.0",
"@opentelemetry/instrumentation-fetch": "0.36.0",
"@opentelemetry/instrumentation-xml-http-request": "0.36.0",
"@opentelemetry/propagator-b3": "1.10.0",
"@opentelemetry/sdk-metrics": "1.10.0",
"@opentelemetry/sdk-trace-base": "1.10.0",
"@opentelemetry/sdk-trace-web": "1.10.0",
"@opentelemetry/semantic-conventions": "1.10.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
}
24 changes: 12 additions & 12 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.35.1",
"version": "0.36.0",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,17 +29,17 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/core": "1.9.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.35.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.35.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.35.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.35.1",
"@opentelemetry/exporter-trace-otlp-http": "0.35.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.35.1",
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-metrics": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1",
"@opentelemetry/semantic-conventions": "1.9.1"
"@opentelemetry/core": "1.10.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.36.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.36.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.36.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.36.0",
"@opentelemetry/exporter-trace-otlp-http": "0.36.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.36.0",
"@opentelemetry/resources": "1.10.0",
"@opentelemetry/sdk-metrics": "1.10.0",
"@opentelemetry/sdk-trace-base": "1.10.0",
"@opentelemetry/semantic-conventions": "1.10.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
18 changes: 13 additions & 5 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.36.0

### :boom: Breaking Change

* feat: remove HTTP/HTTPS prefix from span name [#3603](https://github.com/open-telemetry/opentelemetry-js/pull/3603) @Flarna

### :rocket: (Enhancement)
Expand All @@ -21,11 +33,7 @@ All notable changes to experimental packages in this project will be documented
### :bug: (Bug Fix)

* fix(prometheus-exporter): add possibility to respond to errors returned by `server.listen()` [#3552](https://github.com/open-telemetry/opentelemetry-js/pull/3402) @pichlermarc
fix(sdk-node): update instrumentations once MeterProvider is initialized [#3624](https://github.com/open-telemetry/opentelemetry-js/pull/3624) @pichlermarc

### :books: (Refine Doc)

### :house: (Internal)
* fix(sdk-node): update instrumentations once MeterProvider is initialized [#3624](https://github.com/open-telemetry/opentelemetry-js/pull/3624) @pichlermarc

## 0.35.1

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.35.1",
"version": "0.36.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.35.1",
"@opentelemetry/sdk-trace-base": "1.9.1"
"@opentelemetry/sdk-node": "0.36.0",
"@opentelemetry/sdk-trace-base": "1.10.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.35.1",
"version": "0.36.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.35.1",
"@opentelemetry/sdk-trace-base": "1.9.1"
"@opentelemetry/sdk-node": "0.36.0",
"@opentelemetry/sdk-trace-base": "1.10.0"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
6 changes: 3 additions & 3 deletions experimental/examples/prometheus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prometheus-example",
"version": "0.35.1",
"version": "0.36.0",
"private": true,
"description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
"main": "index.js",
Expand All @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-prometheus": "0.35.1",
"@opentelemetry/sdk-metrics": "1.9.1"
"@opentelemetry/exporter-prometheus": "0.36.0",
"@opentelemetry/sdk-metrics": "1.10.0"
}
}
2 changes: 1 addition & 1 deletion experimental/packages/api-events/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-events",
"version": "0.35.1",
"version": "0.36.0",
"description": "Public events API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/api-logs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-logs",
"version": "0.35.1",
"version": "0.36.0",
"description": "Public logs API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
16 changes: 8 additions & 8 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.35.1",
"version": "0.36.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,8 +49,8 @@
"devDependencies": {
"@babel/core": "7.16.0",
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/otlp-exporter-base": "0.35.1",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/otlp-exporter-base": "0.36.0",
"@types/mocha": "10.0.0",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -69,11 +69,11 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.9.1",
"@opentelemetry/otlp-grpc-exporter-base": "0.35.1",
"@opentelemetry/otlp-transformer": "0.35.1",
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1"
"@opentelemetry/core": "1.10.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.36.0",
"@opentelemetry/otlp-transformer": "0.36.0",
"@opentelemetry/resources": "1.10.0",
"@opentelemetry/sdk-trace-base": "1.10.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc",
"sideEffects": false
Expand Down
14 changes: 7 additions & 7 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.35.1",
"version": "0.36.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 @@ -64,7 +64,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand Down Expand Up @@ -94,11 +94,11 @@
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/core": "1.9.1",
"@opentelemetry/otlp-exporter-base": "0.35.1",
"@opentelemetry/otlp-transformer": "0.35.1",
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1"
"@opentelemetry/core": "1.10.0",
"@opentelemetry/otlp-exporter-base": "0.36.0",
"@opentelemetry/otlp-transformer": "0.36.0",
"@opentelemetry/resources": "1.10.0",
"@opentelemetry/sdk-trace-base": "1.10.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http",
"sideEffects": false
Expand Down
16 changes: 8 additions & 8 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.35.1",
"version": "0.36.0",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -63,7 +63,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "10.0.0",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -81,12 +81,12 @@
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/core": "1.9.1",
"@opentelemetry/otlp-exporter-base": "0.35.1",
"@opentelemetry/otlp-proto-exporter-base": "0.35.1",
"@opentelemetry/otlp-transformer": "0.35.1",
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1"
"@opentelemetry/core": "1.10.0",
"@opentelemetry/otlp-exporter-base": "0.36.0",
"@opentelemetry/otlp-proto-exporter-base": "0.36.0",
"@opentelemetry/otlp-transformer": "0.36.0",
"@opentelemetry/resources": "1.10.0",
"@opentelemetry/sdk-trace-base": "1.10.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto",
"sideEffects": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/opentelemetry-browser-detector",
"version": "0.35.1",
"version": "0.36.0",
"description": "OpenTelemetry Resource Detector for Browser",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -54,7 +54,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/api": "1.4.1",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -70,8 +70,8 @@
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/semantic-conventions": "1.9.1"
"@opentelemetry/resources": "1.10.0",
"@opentelemetry/semantic-conventions": "1.10.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector"
}
Loading

0 comments on commit 6ba09a2

Please sign in to comment.