Skip to content

Commit

Permalink
Merge branch 'main' into fix/grpc-lazy-load
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Mar 6, 2024
2 parents 5fcbd8f + 75bd723 commit 50515cc
Show file tree
Hide file tree
Showing 62 changed files with 1,033 additions and 987 deletions.
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :rocket: (Enhancement)

### :bug: (Bug Fix)

* fix(sdk-metrics): increase the depth of the output to the console such that objects in the metric are printed fully to the console [#4522](https://github.com/open-telemetry/opentelemetry-js/pull/4522) @JacksonWeber

### :books: (Refine Doc)

### :house: (Internal)

## 1.22.0

### :rocket: (Enhancement)

* feat(sdk-metrics): allow single bucket histograms [#4456](https://github.com/open-telemetry/opentelemetry-js/pull/4456) @pichlermarc
* feat(instrumentation): Make `init()` method public [#4418](https://github.com/open-telemetry/opentelemetry-js/pull/4418)
* feat(context-zone-peer-dep, context-zone): support zone.js 0.13.x, 0.14.x [#4469](https://github.com/open-telemetry/opentelemetry-js/pull/4469) @pichlermarc
Expand All @@ -30,8 +42,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

* docs: shorten readme sections [#4460](https://github.com/open-telemetry/opentelemetry-js/pull/4460) @legendecas

### :house: (Internal)

## 1.21.0

### :rocket: (Enhancement)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ process.on('SIGTERM', () => {
node -r ./tracing.js app.js
```

The above example will emit auto-instrumented telemetry about your Node.js application to the console. For a more in-depth example, see the [Getting Started Guide](https://opentelemetry.io/docs/js/getting-started/). For more information about automatic instrumentation see [@opentelemetry/sdk-trace-node][otel-node], which provides auto-instrumentation for Node.js applications. If the automatic instrumentation does not suit your needs, or you would like to create manual traces, see [@opentelemetry/sdk-trace-base][otel-tracing]
The above example will emit auto-instrumented telemetry about your Node.js application to the console. For a more in-depth example, see the [Getting Started Guide](https://opentelemetry.io/docs/languages/js/getting-started/). For more information about automatic instrumentation see [@opentelemetry/sdk-trace-node][otel-node], which provides auto-instrumentation for Node.js applications. If the automatic instrumentation does not suit your needs, or you would like to create manual traces, see [@opentelemetry/sdk-trace-base][otel-tracing]

## Library Author

Expand Down
17 changes: 17 additions & 0 deletions api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file.

## Unreleased

### :boom: Breaking Change

### :rocket: (Enhancement)

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 1.8.0

### :rocket: (Enhancement)

* feat(api): add SugaredTracer for functions not defined in the spec

### :bug: (Bug Fix)

* fix(api): fix unreachable @opentelemetry/api/experimental entry [#4446](https://github.com/open-telemetry/opentelemetry-js/pull/4446) @legendecas

## 1.7.0
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.7.0",
"version": "1.8.0",
"description": "Public API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use the latest and greatest features, and best practices.
| [opentelemetry-web](opentelemetry-web/) | Basic use of Tracing and Metrics in a Web application | Beginner |
| [http](http/) | HTTP Instrumentation to automatically collect trace data and export them to the backend of choice | Intermediate |
| [https](https/) | HTTPS Instrumentation to automatically collect trace data and export them to the backend of choice | Intermediate |
| [grpc](grpc/) | gRPC Instrumentation to automatically collect trace data and export them to the backend of choice | Intermediate |
| [grpc](grpc-js/) | gRPC Instrumentation to automatically collect trace data and export them to the backend of choice | Intermediate |
| [otlp-exporter-node](otlp-exporter-node/) | This example shows how to use `@opentelemetry/exporter-otlp-http` to instrument a simple Node.js application | Intermediate |
| [opentracing-shim](opentracing-shim/) | This is a simple example that demonstrates how existing OpenTracing instrumentation can be integrated with OpenTelemetry | Intermediate |
| [esm-http-ts](esm-http-ts/) | This is a simple example that demonstrates tracing HTTP request, with an app written in TypeScript and transpiled to ES Modules. | Intermediate |
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.48.0",
"version": "0.49.1",
"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.7.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.48.0",
"@opentelemetry/instrumentation": "0.48.0",
"@opentelemetry/instrumentation-http": "0.48.0",
"@opentelemetry/resources": "1.21.0",
"@opentelemetry/sdk-trace-base": "1.21.0",
"@opentelemetry/sdk-trace-node": "1.21.0",
"@opentelemetry/semantic-conventions": "1.21.0"
"@opentelemetry/api": "1.8.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.49.1",
"@opentelemetry/instrumentation": "0.49.1",
"@opentelemetry/instrumentation-http": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-trace-base": "1.22.0",
"@opentelemetry/sdk-trace-node": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.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.48.0",
"version": "0.49.1",
"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.21.0",
"@opentelemetry/exporter-zipkin": "1.21.0",
"@opentelemetry/instrumentation": "0.48.0",
"@opentelemetry/instrumentation-http": "0.48.0",
"@opentelemetry/resources": "1.21.0",
"@opentelemetry/sdk-trace-base": "1.21.0",
"@opentelemetry/sdk-trace-node": "1.21.0",
"@opentelemetry/semantic-conventions": "1.21.0"
"@opentelemetry/exporter-jaeger": "1.22.0",
"@opentelemetry/exporter-zipkin": "1.22.0",
"@opentelemetry/instrumentation": "0.49.1",
"@opentelemetry/instrumentation-http": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-trace-base": "1.22.0",
"@opentelemetry/sdk-trace-node": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.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.48.0",
"version": "0.49.1",
"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.21.0",
"@opentelemetry/exporter-zipkin": "1.21.0",
"@opentelemetry/instrumentation": "0.48.0",
"@opentelemetry/instrumentation-http": "0.48.0",
"@opentelemetry/resources": "1.21.0",
"@opentelemetry/sdk-trace-base": "1.21.0",
"@opentelemetry/sdk-trace-node": "1.21.0",
"@opentelemetry/semantic-conventions": "1.21.0"
"@opentelemetry/exporter-jaeger": "1.22.0",
"@opentelemetry/exporter-zipkin": "1.22.0",
"@opentelemetry/instrumentation": "0.49.1",
"@opentelemetry/instrumentation-http": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-trace-base": "1.22.0",
"@opentelemetry/sdk-trace-node": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.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.48.0",
"version": "0.49.1",
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -44,20 +44,20 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-zone": "1.21.0",
"@opentelemetry/core": "1.21.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.48.0",
"@opentelemetry/exporter-trace-otlp-http": "0.48.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.48.0",
"@opentelemetry/exporter-zipkin": "1.21.0",
"@opentelemetry/instrumentation": "0.48.0",
"@opentelemetry/instrumentation-fetch": "0.48.0",
"@opentelemetry/instrumentation-xml-http-request": "0.48.0",
"@opentelemetry/propagator-b3": "1.21.0",
"@opentelemetry/sdk-metrics": "1.21.0",
"@opentelemetry/sdk-trace-base": "1.21.0",
"@opentelemetry/sdk-trace-web": "1.21.0",
"@opentelemetry/semantic-conventions": "1.21.0"
"@opentelemetry/context-zone": "1.22.0",
"@opentelemetry/core": "1.22.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.49.1",
"@opentelemetry/exporter-trace-otlp-http": "0.49.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.49.1",
"@opentelemetry/exporter-zipkin": "1.22.0",
"@opentelemetry/instrumentation": "0.49.1",
"@opentelemetry/instrumentation-fetch": "0.49.1",
"@opentelemetry/instrumentation-xml-http-request": "0.49.1",
"@opentelemetry/propagator-b3": "1.22.0",
"@opentelemetry/sdk-metrics": "1.22.0",
"@opentelemetry/sdk-trace-base": "1.22.0",
"@opentelemetry/sdk-trace-web": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.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.48.0",
"version": "0.49.1",
"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.21.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.48.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.48.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.48.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.48.0",
"@opentelemetry/exporter-trace-otlp-http": "0.48.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.48.0",
"@opentelemetry/resources": "1.21.0",
"@opentelemetry/sdk-metrics": "1.21.0",
"@opentelemetry/sdk-trace-base": "1.21.0",
"@opentelemetry/semantic-conventions": "1.21.0"
"@opentelemetry/core": "1.22.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.49.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.49.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.49.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.49.1",
"@opentelemetry/exporter-trace-otlp-http": "0.49.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-metrics": "1.22.0",
"@opentelemetry/sdk-trace-base": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
20 changes: 18 additions & 2 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,24 @@ 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.49.1

### :bug: (Bug Fix)

* fix(instrumentation): don't add `@opentelemetry/api-logs` as a `peerDependency`

## 0.49.0

### :boom: Breaking Change

* fix(otlp-exporter-base)!: remove unload event from OTLPExporterBrowserBase [#4438](https://github.com/open-telemetry/opentelemetry-js/pull/4438) @eldavojohn
* Reason: The 'unload' event prevents sites from taking advantage of Google's [backward/forward cache](https://web.dev/articles/bfcache#never_use_the_unload_event) and will be [deprecated](https://developer.chrome.com/articles/deprecating-unload/). It is now up to the consuming site to implement these shutdown events.
* This breaking change affects users under this scenario:
Expand All @@ -28,8 +46,6 @@ All notable changes to experimental packages in this project will be documented
* fix(otlp-transformer): only use BigInt inside hrTimeToNanos() [#4484](https://github.com/open-telemetry/opentelemetry-js/pull/4484) @pichlermarc
* fix(instrumentation-fetch): do not enable in Node.js; clarify in docs this instr is for web fetch only [#4498](https://github.com/open-telemetry/opentelemetry-js/pull/4498) @trentm

### :books: (Refine Doc)

### :house: (Internal)

* refactor(instrumentation-grpc): clean up remnants of 'grpc' package instrumentation [#4420](https://github.com/open-telemetry/opentelemetry-js/pull/4420) @pichlermarc
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.48.0",
"version": "0.49.1",
"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.48.0",
"@opentelemetry/sdk-trace-base": "1.21.0"
"@opentelemetry/sdk-node": "0.49.1",
"@opentelemetry/sdk-trace-base": "1.22.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.48.0",
"version": "0.49.1",
"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.48.0",
"@opentelemetry/sdk-trace-base": "1.21.0"
"@opentelemetry/sdk-node": "0.49.1",
"@opentelemetry/sdk-trace-base": "1.22.0"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
6 changes: 3 additions & 3 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.48.0",
"version": "0.49.1",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-logs": "0.48.0",
"@opentelemetry/sdk-logs": "0.48.0"
"@opentelemetry/api-logs": "0.49.1",
"@opentelemetry/sdk-logs": "0.49.1"
},
"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.48.0",
"version": "0.49.1",
"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.7.0",
"@opentelemetry/exporter-prometheus": "0.48.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.48.0",
"@opentelemetry/resources": "1.21.0",
"@opentelemetry/sdk-metrics": "1.21.0",
"@opentelemetry/sdk-trace-node": "1.21.0",
"@opentelemetry/semantic-conventions": "1.21.0",
"@opentelemetry/shim-opencensus": "0.48.0"
"@opentelemetry/api": "1.8.0",
"@opentelemetry/exporter-prometheus": "0.49.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-metrics": "1.22.0",
"@opentelemetry/sdk-trace-node": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0",
"@opentelemetry/shim-opencensus": "0.49.1"
},
"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.48.0",
"version": "0.49.1",
"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.48.0",
"@opentelemetry/sdk-metrics": "1.21.0"
"@opentelemetry/exporter-prometheus": "0.49.1",
"@opentelemetry/sdk-metrics": "1.22.0"
}
}
Loading

0 comments on commit 50515cc

Please sign in to comment.