Skip to content

Commit

Permalink
Merge eaba432 into ffe641c
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Aug 8, 2023
2 parents ffe641c + eaba432 commit 6d1dfb6
Show file tree
Hide file tree
Showing 55 changed files with 305 additions and 298 deletions.
13 changes: 8 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :bug: (Bug Fix)

* fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup
* fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions [#4014](https://github.com/open-telemetry/opentelemetry-js/pull/4014/) @aabmass
* fix(sdk-metrics): ignore invalid metric values [#3988](https://github.com/open-telemetry/opentelemetry-js/pull/3988) @legendecas

### :books: (Refine Doc)

### :house: (Internal)

## 1.15.2

### :bug: (Bug Fix)

* fix(core): stop rounding to nearest int in hrTimeTo*seconds() functions [#4014](https://github.com/open-telemetry/opentelemetry-js/pull/4014/) @aabmass
* fix(sdk-metrics): ignore invalid metric values [#3988](https://github.com/open-telemetry/opentelemetry-js/pull/3988) @legendecas
* fix(core): add baggage support for values containing an equals sign [#3975](https://github.com/open-telemetry/opentelemetry-js/pull/3975) @krosenk729

## 1.15.1

### :bug: (Bug Fix)
Expand All @@ -36,7 +40,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
* fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001
* fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass
* fix(sdk-trace-web): add secureConnectionStart to https only [#3879](https://github.com/open-telemetry/opentelemetry-js/pull/3879) @Abinet18
* fix(core): add baggage support for values containing an equals sign [#3975](https://github.com/open-telemetry/opentelemetry-js/pull/3975) @krosenk729

### :house: (Internal)

Expand Down
16 changes: 8 additions & 8 deletions examples/esm-http-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esm-http-ts",
"private": true,
"version": "0.41.1",
"version": "0.41.2",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -31,12 +31,12 @@
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.41.1",
"@opentelemetry/instrumentation": "0.41.1",
"@opentelemetry/instrumentation-http": "0.41.1",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/sdk-trace-base": "1.15.1",
"@opentelemetry/sdk-trace-node": "1.15.1",
"@opentelemetry/semantic-conventions": "1.15.1"
"@opentelemetry/exporter-trace-otlp-proto": "0.41.2",
"@opentelemetry/instrumentation": "0.41.2",
"@opentelemetry/instrumentation-http": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@opentelemetry/sdk-trace-base": "1.15.2",
"@opentelemetry/sdk-trace-node": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2"
}
}
18 changes: 9 additions & 9 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.41.1",
"version": "0.41.2",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,14 +29,14 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "1.15.1",
"@opentelemetry/exporter-zipkin": "1.15.1",
"@opentelemetry/instrumentation": "0.41.1",
"@opentelemetry/instrumentation-http": "0.41.1",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/sdk-trace-base": "1.15.1",
"@opentelemetry/sdk-trace-node": "1.15.1",
"@opentelemetry/semantic-conventions": "1.15.1"
"@opentelemetry/exporter-jaeger": "1.15.2",
"@opentelemetry/exporter-zipkin": "1.15.2",
"@opentelemetry/instrumentation": "0.41.2",
"@opentelemetry/instrumentation-http": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@opentelemetry/sdk-trace-base": "1.15.2",
"@opentelemetry/sdk-trace-node": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
"devDependencies": {
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.41.1",
"version": "0.41.2",
"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.15.1",
"@opentelemetry/exporter-zipkin": "1.15.1",
"@opentelemetry/instrumentation": "0.41.1",
"@opentelemetry/instrumentation-http": "0.41.1",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/sdk-trace-base": "1.15.1",
"@opentelemetry/sdk-trace-node": "1.15.1",
"@opentelemetry/semantic-conventions": "1.15.1"
"@opentelemetry/exporter-jaeger": "1.15.2",
"@opentelemetry/exporter-zipkin": "1.15.2",
"@opentelemetry/instrumentation": "0.41.2",
"@opentelemetry/instrumentation-http": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@opentelemetry/sdk-trace-base": "1.15.2",
"@opentelemetry/sdk-trace-node": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2"
},
"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.41.1",
"version": "0.41.2",
"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.15.1",
"@opentelemetry/core": "1.15.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.41.1",
"@opentelemetry/exporter-trace-otlp-http": "0.41.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.41.1",
"@opentelemetry/exporter-zipkin": "1.15.1",
"@opentelemetry/instrumentation": "0.41.1",
"@opentelemetry/instrumentation-fetch": "0.41.1",
"@opentelemetry/instrumentation-xml-http-request": "0.41.1",
"@opentelemetry/propagator-b3": "1.15.1",
"@opentelemetry/sdk-metrics": "1.15.1",
"@opentelemetry/sdk-trace-base": "1.15.1",
"@opentelemetry/sdk-trace-web": "1.15.1",
"@opentelemetry/semantic-conventions": "1.15.1"
"@opentelemetry/context-zone": "1.15.2",
"@opentelemetry/core": "1.15.2",
"@opentelemetry/exporter-metrics-otlp-http": "0.41.2",
"@opentelemetry/exporter-trace-otlp-http": "0.41.2",
"@opentelemetry/exporter-trace-otlp-proto": "0.41.2",
"@opentelemetry/exporter-zipkin": "1.15.2",
"@opentelemetry/instrumentation": "0.41.2",
"@opentelemetry/instrumentation-fetch": "0.41.2",
"@opentelemetry/instrumentation-xml-http-request": "0.41.2",
"@opentelemetry/propagator-b3": "1.15.2",
"@opentelemetry/sdk-metrics": "1.15.2",
"@opentelemetry/sdk-trace-base": "1.15.2",
"@opentelemetry/sdk-trace-web": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2"
},
"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.41.1",
"version": "0.41.2",
"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.15.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.41.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.41.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.41.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.41.1",
"@opentelemetry/exporter-trace-otlp-http": "0.41.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.41.1",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/sdk-metrics": "1.15.1",
"@opentelemetry/sdk-trace-base": "1.15.1",
"@opentelemetry/semantic-conventions": "1.15.1"
"@opentelemetry/core": "1.15.2",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.41.2",
"@opentelemetry/exporter-metrics-otlp-http": "0.41.2",
"@opentelemetry/exporter-metrics-otlp-proto": "0.41.2",
"@opentelemetry/exporter-trace-otlp-grpc": "0.41.2",
"@opentelemetry/exporter-trace-otlp-http": "0.41.2",
"@opentelemetry/exporter-trace-otlp-proto": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@opentelemetry/sdk-metrics": "1.15.2",
"@opentelemetry/sdk-trace-base": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
10 changes: 7 additions & 3 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@ All notable changes to experimental packages in this project will be documented

### :bug: (Bug Fix)

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 0.42.2

### :bug: (Bug Fix)

* fix(opentelemetry-exporter-logs-otlp-http): Add otel-api as dev dep for tests as they are directly importing the api and which is breaking the web-sandbox tests which is using rollup
* fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods [#3804](https://github.com/open-telemetry/opentelemetry-js/pull/3804) @pichlermarc

## 0.41.1

### :books: (Refine Doc)
Expand Down Expand Up @@ -81,7 +86,6 @@ All notable changes to experimental packages in this project will be documented

* fix(sdk-node): use resource interface instead of concrete class [#3803](https://github.com/open-telemetry/opentelemetry-js/pull/3803) @blumamir
* fix(sdk-logs): remove includeTraceContext configuration and use LogRecord context when available [#3817](https://github.com/open-telemetry/opentelemetry-js/pull/3817) @hectorhdzg
* fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods [#3804](https://github.com/open-telemetry/opentelemetry-js/pull/3804) @pichlermarc

## 0.39.1

Expand Down
6 changes: 3 additions & 3 deletions experimental/backwards-compatibility/node14/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node14",
"version": "0.41.1",
"version": "0.41.2",
"private": true,
"description": "Backwards compatibility 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.41.1",
"@opentelemetry/sdk-trace-base": "1.15.1"
"@opentelemetry/sdk-node": "0.41.2",
"@opentelemetry/sdk-trace-base": "1.15.2"
},
"devDependencies": {
"@types/node": "14.18.25",
Expand Down
6 changes: 3 additions & 3 deletions experimental/backwards-compatibility/node16/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node16",
"version": "0.41.1",
"version": "0.41.2",
"private": true,
"description": "Backwards compatibility 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.41.1",
"@opentelemetry/sdk-trace-base": "1.15.1"
"@opentelemetry/sdk-node": "0.41.2",
"@opentelemetry/sdk-trace-base": "1.15.2"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
2 changes: 1 addition & 1 deletion experimental/examples/logs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "logs-example",
"version": "0.41.0",
"version": "0.41.1",
"private": true,
"scripts": {
"start": "ts-node index.ts"
Expand Down
12 changes: 6 additions & 6 deletions experimental/examples/opencensus-shim/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencensus-shim",
"private": true,
"version": "0.41.1",
"version": "0.41.2",
"description": "Example of using @opentelemetry/shim-opencensus in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,11 +30,11 @@
"@opencensus/core": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.41.1",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/sdk-trace-node": "1.15.1",
"@opentelemetry/semantic-conventions": "1.15.1",
"@opentelemetry/shim-opencensus": "0.41.1"
"@opentelemetry/exporter-trace-otlp-grpc": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@opentelemetry/sdk-trace-node": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2",
"@opentelemetry/shim-opencensus": "0.41.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
}
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.41.1",
"version": "0.41.2",
"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.41.1",
"@opentelemetry/sdk-metrics": "1.15.1"
"@opentelemetry/exporter-prometheus": "0.41.2",
"@opentelemetry/sdk-metrics": "1.15.2"
}
}
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.41.1",
"version": "0.41.2",
"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.41.1",
"version": "0.41.2",
"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-logs-otlp-grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-logs-otlp-grpc",
"version": "0.41.1",
"version": "0.41.2",
"description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -51,9 +51,9 @@
"@babel/core": "7.22.10",
"@grpc/proto-loader": "^0.7.3",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/api-logs": "0.41.1",
"@opentelemetry/otlp-exporter-base": "0.41.1",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/api-logs": "0.41.2",
"@opentelemetry/otlp-exporter-base": "0.41.2",
"@opentelemetry/resources": "1.15.2",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.16",
Expand All @@ -73,10 +73,10 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.15.1",
"@opentelemetry/otlp-grpc-exporter-base": "0.41.1",
"@opentelemetry/otlp-transformer": "0.41.1",
"@opentelemetry/sdk-logs": "0.41.1"
"@opentelemetry/core": "1.15.2",
"@opentelemetry/otlp-grpc-exporter-base": "0.41.2",
"@opentelemetry/otlp-transformer": "0.41.2",
"@opentelemetry/sdk-logs": "0.41.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
"sideEffects": false
Expand Down
Loading

0 comments on commit 6d1dfb6

Please sign in to comment.