Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
HyunnoH authored Oct 13, 2023
2 parents 93a4e2c + b6e532b commit efcad0e
Show file tree
Hide file tree
Showing 83 changed files with 653 additions and 501 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,22 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :rocket: (Enhancement)

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

### :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
4 changes: 4 additions & 0 deletions api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

## Unreleased

### :rocket: (Enhancement)

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

## 1.6.0

### :bug: (Bug Fix)
Expand Down
1 change: 1 addition & 0 deletions api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export {
ObservableUpDownCounter,
UpDownCounter,
BatchObservableCallback,
MetricAdvice,
MetricAttributes,
MetricAttributeValue,
ObservableCallback,
Expand Down
18 changes: 18 additions & 0 deletions api/src/metrics/Metric.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ import { Attributes, AttributeValue } from '../common/Attributes';
import { Context } from '../context/types';
import { BatchObservableResult, ObservableResult } from './ObservableResult';

/**
* Advisory options influencing aggregation configuration parameters.
* @experimental
*/
export interface MetricAdvice {
/**
* Hint the explicit bucket boundaries for SDK if the metric is been
* aggregated with a HistogramAggregator.
*/
explicitBucketBoundaries?: number[];
}

/**
* Options needed for metric creation
*/
Expand All @@ -39,6 +51,12 @@ export interface MetricOptions {
* @default {@link ValueType.DOUBLE}
*/
valueType?: ValueType;

/**
* The advice influencing aggregation configuration parameters.
* @experimental
*/
advice?: MetricAdvice;
}

/** The Type of value. It describes how the data is reported. */
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"
}
16 changes: 11 additions & 5 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@ All notable changes to experimental packages in this project will be documented

## Unreleased

### :boom: Breaking Change

### :rocket: (Enhancement)

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 0.44.0

### :boom: Breaking Change

* fix(exporter-logs-otlp-proto): change OTLPLogExporter to OTLPLogExporter [#4140](https://github.com/open-telemetry/opentelemetry-js/pull/4140) @Vunovati
Expand All @@ -22,10 +32,7 @@ All notable changes to experimental packages in this project will be documented
### :bug: (Bug Fix)

* fix(otlp-exporter-base): replaced usage of window with _globalThis [#4157](https://github.com/open-telemetry/opentelemetry-js/pull/4157) @cristianmadularu

### :books: (Refine Doc)

### :house: (Internal)
* fix(otlp-transformer): Avoid precision loss when converting from HrTime to unix nanoseconds. [#4062](https://github.com/open-telemetry/opentelemetry-js/pull/4062)

## 0.43.0

Expand Down Expand Up @@ -56,7 +63,6 @@ All notable changes to experimental packages in this project will be documented

### :bug: (Bug Fix)

* fix(otlp-transformer): Avoid precision loss when converting from HrTime to unix nanoseconds. [#4062](https://github.com/open-telemetry/opentelemetry-js/pull/4062)
* fix(exporter-logs-otlp-http): add @opentelemetry/api-logs as dependency

## 0.41.2
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.43.0",
"version": "0.44.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.43.0",
"@opentelemetry/sdk-trace-base": "1.17.0"
"@opentelemetry/sdk-node": "0.44.0",
"@opentelemetry/sdk-trace-base": "1.17.1"
},
"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.43.0",
"version": "0.44.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.43.0",
"@opentelemetry/sdk-trace-base": "1.17.0"
"@opentelemetry/sdk-node": "0.44.0",
"@opentelemetry/sdk-trace-base": "1.17.1"
},
"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.43.0",
"version": "0.44.0",
"private": true,
"scripts": {
"start": "ts-node index.ts"
Expand Down
16 changes: 8 additions & 8 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.43.0",
"version": "0.44.0",
"description": "Example of using @opentelemetry/shim-opencensus in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,13 +31,13 @@
"@opencensus/instrumentation-http": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/api": "1.6.0",
"@opentelemetry/exporter-prometheus": "0.43.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.43.0",
"@opentelemetry/resources": "1.17.0",
"@opentelemetry/sdk-metrics": "1.17.0",
"@opentelemetry/sdk-trace-node": "1.17.0",
"@opentelemetry/semantic-conventions": "1.17.0",
"@opentelemetry/shim-opencensus": "0.43.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"
},
"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.43.0",
"version": "0.44.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.43.0",
"@opentelemetry/sdk-metrics": "1.17.0"
"@opentelemetry/exporter-prometheus": "0.44.0",
"@opentelemetry/sdk-metrics": "1.17.1"
}
}
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.43.0",
"version": "0.44.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.43.0",
"version": "0.44.0",
"description": "Public logs API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
Loading

0 comments on commit efcad0e

Please sign in to comment.