Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
HyunnoH committed Nov 7, 2023
2 parents 755dc5d + 73b4466 commit c47439c
Show file tree
Hide file tree
Showing 58 changed files with 1,000 additions and 994 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,22 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :rocket: (Enhancement)

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 1.18.0

### :rocket: (Enhancement)

* feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas

### :bug: (Bug Fix)

* fix(core): remove re-export of `version.ts` [#4225](https://github.com/open-telemetry/opentelemetry-js/pull/4225) @david-luna

### :books: (Refine Doc)

### :house: (Internal)

* chore: track package-lock.json [#4238](https://github.com/open-telemetry/opentelemetry-js/pull/4238) @legendecas
Expand Down
3 changes: 3 additions & 0 deletions api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 1.7.0

### :rocket: (Enhancement)

* feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas
* feat(api): publish api esnext target [#4231](https://github.com/open-telemetry/opentelemetry-js/pull/4231) @legendecas

## 1.6.0

Expand Down
9 changes: 7 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"name": "@opentelemetry/api",
"version": "1.6.0",
"version": "1.7.0",
"description": "Public API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"browser": {
"./src/platform/index.ts": "./src/platform/browser/index.ts",
"./build/esm/platform/index.js": "./build/esm/platform/browser/index.js",
"./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
"./build/src/platform/index.js": "./build/src/platform/browser/index.js"
},
"repository": "open-telemetry/opentelemetry-js",
Expand Down Expand Up @@ -51,6 +53,9 @@
"build/esm/**/*.js",
"build/esm/**/*.js.map",
"build/esm/**/*.d.ts",
"build/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand All @@ -66,10 +71,10 @@
"@types/sinon": "10.0.20",
"@types/webpack": "4.41.35",
"@types/webpack-env": "1.16.3",
"babel-plugin-istanbul": "6.1.1",
"codecov": "3.8.3",
"cross-var": "1.1.0",
"dpdm": "3.13.1",
"babel-plugin-istanbul": "6.1.1",
"karma": "6.4.2",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
Expand Down
18 changes: 9 additions & 9 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.44.0",
"version": "0.45.0",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -30,13 +30,13 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.6.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.44.0",
"@opentelemetry/instrumentation": "0.44.0",
"@opentelemetry/instrumentation-http": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1"
"@opentelemetry/api": "1.7.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.45.0",
"@opentelemetry/instrumentation": "0.45.0",
"@opentelemetry/instrumentation-http": "0.45.0",
"@opentelemetry/resources": "1.18.0",
"@opentelemetry/sdk-trace-base": "1.18.0",
"@opentelemetry/sdk-trace-node": "1.18.0",
"@opentelemetry/semantic-conventions": "1.18.0"
}
}
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.44.0",
"version": "0.45.0",
"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.17.1",
"@opentelemetry/exporter-zipkin": "1.17.1",
"@opentelemetry/instrumentation": "0.44.0",
"@opentelemetry/instrumentation-http": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1"
"@opentelemetry/exporter-jaeger": "1.18.0",
"@opentelemetry/exporter-zipkin": "1.18.0",
"@opentelemetry/instrumentation": "0.45.0",
"@opentelemetry/instrumentation-http": "0.45.0",
"@opentelemetry/resources": "1.18.0",
"@opentelemetry/sdk-trace-base": "1.18.0",
"@opentelemetry/sdk-trace-node": "1.18.0",
"@opentelemetry/semantic-conventions": "1.18.0"
},
"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.44.0",
"version": "0.45.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.17.1",
"@opentelemetry/exporter-zipkin": "1.17.1",
"@opentelemetry/instrumentation": "0.44.0",
"@opentelemetry/instrumentation-http": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1"
"@opentelemetry/exporter-jaeger": "1.18.0",
"@opentelemetry/exporter-zipkin": "1.18.0",
"@opentelemetry/instrumentation": "0.45.0",
"@opentelemetry/instrumentation-http": "0.45.0",
"@opentelemetry/resources": "1.18.0",
"@opentelemetry/sdk-trace-base": "1.18.0",
"@opentelemetry/sdk-trace-node": "1.18.0",
"@opentelemetry/semantic-conventions": "1.18.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.44.0",
"version": "0.45.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.17.1",
"@opentelemetry/core": "1.17.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.44.0",
"@opentelemetry/exporter-trace-otlp-http": "0.44.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.44.0",
"@opentelemetry/exporter-zipkin": "1.17.1",
"@opentelemetry/instrumentation": "0.44.0",
"@opentelemetry/instrumentation-fetch": "0.44.0",
"@opentelemetry/instrumentation-xml-http-request": "0.44.0",
"@opentelemetry/propagator-b3": "1.17.1",
"@opentelemetry/sdk-metrics": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/sdk-trace-web": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1"
"@opentelemetry/context-zone": "1.18.0",
"@opentelemetry/core": "1.18.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.45.0",
"@opentelemetry/exporter-trace-otlp-http": "0.45.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.45.0",
"@opentelemetry/exporter-zipkin": "1.18.0",
"@opentelemetry/instrumentation": "0.45.0",
"@opentelemetry/instrumentation-fetch": "0.45.0",
"@opentelemetry/instrumentation-xml-http-request": "0.45.0",
"@opentelemetry/propagator-b3": "1.18.0",
"@opentelemetry/sdk-metrics": "1.18.0",
"@opentelemetry/sdk-trace-base": "1.18.0",
"@opentelemetry/sdk-trace-web": "1.18.0",
"@opentelemetry/semantic-conventions": "1.18.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.44.0",
"version": "0.45.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.17.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.44.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.44.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.44.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.44.0",
"@opentelemetry/exporter-trace-otlp-http": "0.44.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-metrics": "1.17.1",
"@opentelemetry/sdk-trace-base": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1"
"@opentelemetry/core": "1.18.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.45.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.45.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.45.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.45.0",
"@opentelemetry/exporter-trace-otlp-http": "0.45.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.45.0",
"@opentelemetry/resources": "1.18.0",
"@opentelemetry/sdk-metrics": "1.18.0",
"@opentelemetry/sdk-trace-base": "1.18.0",
"@opentelemetry/semantic-conventions": "1.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
17 changes: 11 additions & 6 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,23 @@ All notable changes to experimental packages in this project will be documented

### :bug: (Bug Fix)

* fix(sdk-node): remove the explicit dependency on @opentelemetry/exporter-jaeger that was kept on the previous release
* '@opentelemetry/exporter-jaeger' is no longer be a dependency of this package. To continue using '@opentelemetry/exporter-jaeger', please install it manually.
* NOTE: `@opentelemetry/exporter-jaeger` is deprecated, consider switching to one of the alternatives described [here](https://www.npmjs.com/package/@opentelemetry/exporter-jaeger)
* fix(sdk-logs): avoid map attribute set when count limit exceeded
* fix(otlp-transformer): OTLP json encoding [#4220](https://github.com/open-telemetry/opentelemetry-js/pull/4220) @seemk
* Fixes a bug in the OTLP (http/json) exporters where timestamps were not encoded as strings, causing the export to
be rejected by OTLP endpoints

### :books: (Refine Doc)

### :house: (Internal)

## 0.45.0

### :boom: Breaking Change

* fix(sdk-node)!: remove the explicit dependency on @opentelemetry/exporter-jaeger that was kept on the previous release
* '@opentelemetry/exporter-jaeger' is no longer be a dependency of this package. To continue using '@opentelemetry/exporter-jaeger', please install it manually.
* NOTE: `@opentelemetry/exporter-jaeger` is deprecated, consider switching to one of the alternatives described [here](https://www.npmjs.com/package/@opentelemetry/exporter-jaeger)
* fix(otlp-transformer)!: OTLP json encoding [#4220](https://github.com/open-telemetry/opentelemetry-js/pull/4220) @seemk
* Fixes a bug in the OTLP (http/json) exporters where timestamps were not encoded as strings, causing the export to
be rejected by OTLP endpoints

## 0.44.0

### :boom: Breaking Change
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.44.0",
"version": "0.45.0",
"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.44.0",
"@opentelemetry/sdk-trace-base": "1.17.1"
"@opentelemetry/sdk-node": "0.45.0",
"@opentelemetry/sdk-trace-base": "1.18.0"
},
"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.44.0",
"version": "0.45.0",
"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.44.0",
"@opentelemetry/sdk-trace-base": "1.17.1"
"@opentelemetry/sdk-node": "0.45.0",
"@opentelemetry/sdk-trace-base": "1.18.0"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
8 changes: 4 additions & 4 deletions experimental/examples/logs/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "logs-example",
"version": "0.44.0",
"version": "0.45.0",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/api-logs": "0.44.0",
"@opentelemetry/sdk-logs": "0.44.0"
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-logs": "0.45.0",
"@opentelemetry/sdk-logs": "0.45.0"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
18 changes: 9 additions & 9 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.44.0",
"version": "0.45.0",
"description": "Example of using @opentelemetry/shim-opencensus in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,14 +30,14 @@
"@opencensus/core": "0.1.0",
"@opencensus/instrumentation-http": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/api": "1.6.0",
"@opentelemetry/exporter-prometheus": "0.44.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.44.0",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-metrics": "1.17.1",
"@opentelemetry/sdk-trace-node": "1.17.1",
"@opentelemetry/semantic-conventions": "1.17.1",
"@opentelemetry/shim-opencensus": "0.44.0"
"@opentelemetry/api": "1.7.0",
"@opentelemetry/exporter-prometheus": "0.45.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.45.0",
"@opentelemetry/resources": "1.18.0",
"@opentelemetry/sdk-metrics": "1.18.0",
"@opentelemetry/sdk-trace-node": "1.18.0",
"@opentelemetry/semantic-conventions": "1.18.0",
"@opentelemetry/shim-opencensus": "0.45.0"
},
"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.44.0",
"version": "0.45.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.44.0",
"@opentelemetry/sdk-metrics": "1.17.1"
"@opentelemetry/exporter-prometheus": "0.45.0",
"@opentelemetry/sdk-metrics": "1.18.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.44.0",
"version": "0.45.0",
"description": "Public events API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
Loading

0 comments on commit c47439c

Please sign in to comment.