Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
arriIsHere authored Dec 5, 2024
2 parents e03f44e + a761a8c commit 12d20c3
Show file tree
Hide file tree
Showing 68 changed files with 992 additions and 963 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,22 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se

### :boom: Breaking Change

* feat(sdk-metrics): Add support for aggregation cardinality limit with a default limit of 2000. This limit can be customized via views [#5182](https://github.com/open-telemetry/opentelemetry-js/pull/5128)

### :rocket: (Enhancement)

### :bug: (Bug Fix)

* fix(sdk-trace-base): do not load OTEL_ env vars on module load, but when needed [#5224](https://github.com/open-telemetry/opentelemetry-js/pull/5224)

### :books: (Refine Doc)

### :house: (Internal)

## 1.29.0

### :boom: Breaking Change

* feat(sdk-metrics): Add support for aggregation cardinality limit with a default limit of 2000. This limit can be customized via views [#5182](https://github.com/open-telemetry/opentelemetry-js/pull/5128)

## 1.28.0

### :rocket: (Enhancement)
Expand Down
14 changes: 7 additions & 7 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.55.0",
"version": "0.56.0",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -32,12 +32,12 @@
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.55.0",
"@opentelemetry/instrumentation": "0.55.0",
"@opentelemetry/instrumentation-http": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"@opentelemetry/sdk-trace-node": "1.28.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
"@opentelemetry/instrumentation": "0.56.0",
"@opentelemetry/instrumentation-http": "0.56.0",
"@opentelemetry/resources": "1.29.0",
"@opentelemetry/sdk-trace-base": "1.29.0",
"@opentelemetry/sdk-trace-node": "1.29.0",
"@opentelemetry/semantic-conventions": "1.28.0"
}
}
16 changes: 8 additions & 8 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.55.0",
"version": "0.56.0",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,13 +30,13 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "1.28.0",
"@opentelemetry/exporter-zipkin": "1.28.0",
"@opentelemetry/instrumentation": "0.55.0",
"@opentelemetry/instrumentation-http": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"@opentelemetry/sdk-trace-node": "1.28.0",
"@opentelemetry/exporter-jaeger": "1.29.0",
"@opentelemetry/exporter-zipkin": "1.29.0",
"@opentelemetry/instrumentation": "0.56.0",
"@opentelemetry/instrumentation-http": "0.56.0",
"@opentelemetry/resources": "1.29.0",
"@opentelemetry/sdk-trace-base": "1.29.0",
"@opentelemetry/sdk-trace-node": "1.29.0",
"@opentelemetry/semantic-conventions": "1.28.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
Expand Down
16 changes: 8 additions & 8 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.55.0",
"version": "0.56.0",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -34,13 +34,13 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "1.28.0",
"@opentelemetry/exporter-zipkin": "1.28.0",
"@opentelemetry/instrumentation": "0.55.0",
"@opentelemetry/instrumentation-http": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"@opentelemetry/sdk-trace-node": "1.28.0",
"@opentelemetry/exporter-jaeger": "1.29.0",
"@opentelemetry/exporter-zipkin": "1.29.0",
"@opentelemetry/instrumentation": "0.56.0",
"@opentelemetry/instrumentation-http": "0.56.0",
"@opentelemetry/resources": "1.29.0",
"@opentelemetry/sdk-trace-base": "1.29.0",
"@opentelemetry/sdk-trace-node": "1.29.0",
"@opentelemetry/semantic-conventions": "1.28.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
Expand Down
28 changes: 14 additions & 14 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.55.0",
"version": "0.56.0",
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -45,19 +45,19 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-zone": "1.28.0",
"@opentelemetry/core": "1.28.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.55.0",
"@opentelemetry/exporter-trace-otlp-http": "0.55.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.55.0",
"@opentelemetry/exporter-zipkin": "1.28.0",
"@opentelemetry/instrumentation": "0.55.0",
"@opentelemetry/instrumentation-fetch": "0.55.0",
"@opentelemetry/instrumentation-xml-http-request": "0.55.0",
"@opentelemetry/propagator-b3": "1.28.0",
"@opentelemetry/sdk-metrics": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"@opentelemetry/sdk-trace-web": "1.28.0",
"@opentelemetry/context-zone": "1.29.0",
"@opentelemetry/core": "1.29.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.56.0",
"@opentelemetry/exporter-trace-otlp-http": "0.56.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
"@opentelemetry/exporter-zipkin": "1.29.0",
"@opentelemetry/instrumentation": "0.56.0",
"@opentelemetry/instrumentation-fetch": "0.56.0",
"@opentelemetry/instrumentation-xml-http-request": "0.56.0",
"@opentelemetry/propagator-b3": "1.29.0",
"@opentelemetry/sdk-metrics": "1.29.0",
"@opentelemetry/sdk-trace-base": "1.29.0",
"@opentelemetry/sdk-trace-web": "1.29.0",
"@opentelemetry/semantic-conventions": "1.28.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
Expand Down
22 changes: 11 additions & 11 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.55.0",
"version": "0.56.0",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,16 +30,16 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/core": "1.28.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.55.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.55.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.55.0",
"@opentelemetry/exporter-trace-otlp-http": "0.55.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-metrics": "1.28.0",
"@opentelemetry/sdk-trace-base": "1.28.0",
"@opentelemetry/core": "1.29.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.56.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.56.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.56.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.56.0",
"@opentelemetry/exporter-trace-otlp-http": "0.56.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
"@opentelemetry/resources": "1.29.0",
"@opentelemetry/sdk-metrics": "1.29.0",
"@opentelemetry/sdk-trace-base": "1.29.0",
"@opentelemetry/semantic-conventions": "1.28.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
Expand Down
68 changes: 66 additions & 2 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ 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.56.0

### :boom: Breaking Change

* feat(otlp-exporter-base)!: collapse base classes into one [#5031](https://github.com/open-telemetry/opentelemetry-js/pull/5031) @pichlermarc
* `OTLPExporterNodeBase` has been removed in favor of a platform-agnostic implementation (`OTLPExporterBase`)
* `OTLPExporterBrowserBase` has been removed in favor of a platform-agnostic implementation (`OTLPExporterBase`)
Expand All @@ -19,6 +31,60 @@ All notable changes to experimental packages in this project will be documented
* feat(otlp-transformer)!: accept `ResourceMetrics` in serializers instead of `ResourceMetrics[]`
* (user-facing): `ProtobufMetricsSerializer` now only accepts `ResourceMetrics` instead of `ResourceMetrics[]` to align with `PushMetricExporter` requirements
* (user-facing): `JsonMetricsSerializer` now only accepts `ResourceMetrics` instead of `ResourceMetrics[]` to align with `PushMetricExporter` requirements
* feat(otlp-transformer)!: remove internal types and functions from public API @pichlermarc
* (user-facing): the following types and functions were intended for internal use and have been removed from exports
* `OtlpEncodingOptions`
* `IKeyValueList`
* `IKeyValue`
* `IInstrumentationScope`
* `IArrayValue`
* `LongBits`
* `IAnyValue`
* `Fixed64`
* `SpanContextEncodeFunction`
* `toLongBits`
* `OptionalSpanContextEncodeFunction`
* `getOtlpEncoder`
* `Encoder`
* `HrTimeEncodeFunction`
* `encodeAsLongBits`
* `encodeAsString`
* `hrTimeToNanos`
* `IValueAtQuantile`
* `ISummaryDataPoint`
* `ISummary`
* `ISum`
* `IScopeMetrics`
* `IResourceMetrics`
* `INumberDataPoint`
* `IHistogramDataPoint`
* `IHistogram`
* `IExponentialHistogramDataPoint`
* `IExponentialHistogram`
* `IMetric`
* `IGauge`
* `IExemplar`
* `EAggregationTemporality`
* `IExportMetricsServiceRequest`
* `IBuckets`
* `IResource`
* `IStatus`
* `EStatusCode`
* `ILink`
* `IEvent`
* `IScopeSpans`
* `ISpan`
* `IResourceSpans`
* `ESpanKind`
* `IExportTraceServiceRequest`
* `IScopeLogs`
* `IExportLogsServiceRequest`
* `IResourceLogs`
* `ILogRecord`
* `ESeverityNumber`
* `createExportTraceServiceRequest`
* `createExportMetricsServiceRequest`
* `createExportLogsServiceRequest`

### :rocket: (Enhancement)

Expand All @@ -32,8 +98,6 @@ All notable changes to experimental packages in this project will be documented

* fix(otlp-exporter-\*): de-confuse Nuxt build tooling by not using 'export *' in comments [#5227](https://github.com/open-telemetry/opentelemetry-js/pull/5227) @pichlermarc

### :books: (Refine Doc)

### :house: (Internal)

* chore(otlp-exporter-\*-grpc): clean up tests [#5196](https://github.com/open-telemetry/opentelemetry-js/pull/5196) @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.55.0",
"version": "0.56.0",
"private": true,
"description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -10,8 +10,8 @@
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.55.0",
"@opentelemetry/sdk-trace-base": "1.28.0"
"@opentelemetry/sdk-node": "0.56.0",
"@opentelemetry/sdk-trace-base": "1.29.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.55.0",
"version": "0.56.0",
"private": true,
"description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -10,8 +10,8 @@
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.55.0",
"@opentelemetry/sdk-trace-base": "1.28.0"
"@opentelemetry/sdk-node": "0.56.0",
"@opentelemetry/sdk-trace-base": "1.29.0"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
12 changes: 6 additions & 6 deletions experimental/examples/events/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "events-example",
"version": "0.55.0",
"version": "0.56.0",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-events": "0.55.0",
"@opentelemetry/api-logs": "0.55.0",
"@opentelemetry/exporter-logs-otlp-http": "0.55.0",
"@opentelemetry/sdk-events": "0.55.0",
"@opentelemetry/sdk-logs": "0.55.0"
"@opentelemetry/api-events": "0.56.0",
"@opentelemetry/api-logs": "0.56.0",
"@opentelemetry/exporter-logs-otlp-http": "0.56.0",
"@opentelemetry/sdk-events": "0.56.0",
"@opentelemetry/sdk-logs": "0.56.0"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
6 changes: 3 additions & 3 deletions experimental/examples/logs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "logs-example",
"version": "0.55.0",
"version": "0.56.0",
"private": true,
"scripts": {
"start": "ts-node index.ts",
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-logs": "0.55.0",
"@opentelemetry/sdk-logs": "0.55.0"
"@opentelemetry/api-logs": "0.56.0",
"@opentelemetry/sdk-logs": "0.56.0"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
14 changes: 7 additions & 7 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.55.0",
"version": "0.56.0",
"description": "Example of using @opentelemetry/shim-opencensus in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,13 +32,13 @@
"@opencensus/instrumentation-http": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-prometheus": "0.55.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.55.0",
"@opentelemetry/resources": "1.28.0",
"@opentelemetry/sdk-metrics": "1.28.0",
"@opentelemetry/sdk-trace-node": "1.28.0",
"@opentelemetry/exporter-prometheus": "0.56.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.56.0",
"@opentelemetry/resources": "1.29.0",
"@opentelemetry/sdk-metrics": "1.29.0",
"@opentelemetry/sdk-trace-node": "1.29.0",
"@opentelemetry/semantic-conventions": "1.28.0",
"@opentelemetry/shim-opencensus": "0.55.0"
"@opentelemetry/shim-opencensus": "0.56.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
}
Loading

0 comments on commit 12d20c3

Please sign in to comment.