Skip to content

Commit

Permalink
Merge branch 'main' into metrics/advice
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Oct 10, 2023
2 parents f4d12de + f8e187b commit 10966bb
Show file tree
Hide file tree
Showing 68 changed files with 407 additions and 601 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 1.17.1

### :bug: (Bug Fix)

* fix(sdk-trace-base): BatchSpanProcessor flushes when `maxExportBatchSize` is reached [#3958](https://github.com/open-telemetry/opentelemetry-js/pull/3958) @nordfjord
* fix(sdk-metrics): allow instrument names to contain '/' [#4155](https://github.com/open-telemetry/opentelemetry-js/pull/4155)
* fix(sdk-metrics): prevent per-reader storages from keeping unreported accumulations in memory [#4163](https://github.com/open-telemetry/opentelemetry-js/pull/4163) @pichlermarc
* fixes a memory leak which occurred when two or more `MetricReader` instances are registered to a `MeterProvider`
* fix(sdk-metrics): do not report empty scopes and metrics [#4135](https://github.com/open-telemetry/opentelemetry-js/pull/4135) @pichlermarc
* Instruments that were created, but did not have measurements will not be exported anymore
* Meters (Scopes) that were created, but did not have any instruments with measurements under them will not be exported anymore.
Expand Down
3 changes: 0 additions & 3 deletions doc/library-author.md

This file was deleted.

2 changes: 1 addition & 1 deletion doc/metrics.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Metrics

This quick start is for end users of OpenTelemetry who wish to manually measure their applications. If you are a library author, please see the [Library Authors Guide](library-author.md). If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.
This quick start is for end users of OpenTelemetry who wish to manually measure their applications. If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.

For a high-level overview of OpenTelemetry metrics in general and definitions of some common terms, you can refer to the [OpenTelemetry Specification Overview][spec-overview]

Expand Down
147 changes: 0 additions & 147 deletions doc/processor-api.md

This file was deleted.

2 changes: 1 addition & 1 deletion doc/tracing.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Tracing

This quick start is for end users of OpenTelemetry who wish to manually trace their applications. If you are a library author, please see the [Library Authors Guide](library-author.md). If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.
This quick start is for end users of OpenTelemetry who wish to manually trace their applications. If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.

For a high-level overview of OpenTelemetry tracing in general and definitions of some common terms, you can refer to the [OpenTelemetry Specification Overview][spec-overview]

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.43.0",
"version": "0.44.0",
"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.6.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.43.0",
"@opentelemetry/instrumentation": "0.43.0",
"@opentelemetry/instrumentation-http": "0.43.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-trace-base": "1.17.0",
"@opentelemetry/sdk-trace-node": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.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"
}
}
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.43.0",
"version": "0.44.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.0",
"@opentelemetry/exporter-zipkin": "1.17.0",
"@opentelemetry/instrumentation": "0.43.0",
"@opentelemetry/instrumentation-http": "0.43.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-trace-base": "1.17.0",
"@opentelemetry/sdk-trace-node": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.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"
},
"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.43.0",
"version": "0.44.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.0",
"@opentelemetry/exporter-zipkin": "1.17.0",
"@opentelemetry/instrumentation": "0.43.0",
"@opentelemetry/instrumentation-http": "0.43.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-trace-base": "1.17.0",
"@opentelemetry/sdk-trace-node": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.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"
},
"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.43.0",
"version": "0.44.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.0",
"@opentelemetry/core": "1.17.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.43.0",
"@opentelemetry/exporter-trace-otlp-http": "0.43.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.43.0",
"@opentelemetry/exporter-zipkin": "1.17.0",
"@opentelemetry/instrumentation": "0.43.0",
"@opentelemetry/instrumentation-fetch": "0.43.0",
"@opentelemetry/instrumentation-xml-http-request": "0.43.0",
"@opentelemetry/propagator-b3": "1.17.0",
"@opentelemetry/sdk-metrics": "1.17.0",
"@opentelemetry/sdk-trace-base": "1.17.0",
"@opentelemetry/sdk-trace-web": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.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"
},
"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.43.0",
"version": "0.44.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.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.43.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.43.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.43.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.43.0",
"@opentelemetry/exporter-trace-otlp-http": "0.43.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.43.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-metrics": "1.17.0",
"@opentelemetry/sdk-trace-base": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.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"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
Loading

0 comments on commit 10966bb

Please sign in to comment.