Skip to content

Commit

Permalink
Merge branch 'main' into fix-gzip
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored Jun 24, 2022
2 parents d87fb24 + d2de661 commit 5cf2a10
Show file tree
Hide file tree
Showing 84 changed files with 574 additions and 300 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
close-pr-message: 'This PR was closed because it has been stale for 14 days with no activity.'
stale-issue-label: stale
stale-pr-label: stale
exempt-issue-labels: never-stale
exempt-pr-labels: never-stale
exempt-issue-labels: never-stale,bug
exempt-pr-labels: never-stale,bug
5 changes: 4 additions & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ jobs:
strategy:
fail-fast: false
matrix:
node_version: ["8", "10", "12", "14", "16"]
node_version:
- "14"
- "16"
- "18"
runs-on: ubuntu-latest
env:
NPM_CONFIG_UNSAFE_PERM: true
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ All notable changes to this project will be documented in this file.

### :house: (Internal)

* test: add node 18 and remove EoL node versions [#3048](https://github.com/open-telemetry/opentelemetry-js/pull/3048) @dyladan

## 1.3.1

### :bug: (Bug Fix)
Expand Down
39 changes: 19 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
## Compatibility Matrix

| API Version | Core version | Experimental Packages |
| ----------- |--------------| --------------------- |
| ----------- | ------------ | --------------------- |
| 1.1.x | 1.1.x | 0.28.x |
| 1.0.x | 1.0.x | 0.26.x, 0.27.x |
| 1.0.x | 0.26.x | ----- |
Expand Down Expand Up @@ -138,19 +138,18 @@ If you are a library author looking to build OpenTelemetry into your library, pl

## Supported Runtimes

| Platform Version | Supported |
|------------------|-------------------------------------------------|
| Node.JS `v16` ||
| Node.JS `v14` ||
| Node.JS `v12` ||
| Node.JS `v10` ||
| Node.JS `v8` | See [Node Support](#node-support) below |
| Web Browsers | ✅ See [Browser Support](#browser-support) below |
| Platform Version | Supported |
| ------------------- | ----------------------------------------------- |
| Node.JS `v18` ||
| Node.JS `v16` ||
| Node.JS `v14` ||
| Older Node Versions | See [Node Support](#node-support) |
| Web Browsers | ✅ See [Browser Support](#browser-support) below |

### Node Support

Automated tests are run using the latest release of each currently active version of Node.JS.
While Node.JS v8 and v10 are no longer supported by the Node.JS team, the latest versions of Node.JS v8 and v10 are still included in our testing suite.
Only Node.js Active or Maintenance LTS versions are supported.
Previous versions of node _may_ work, but they are not tested by OpenTelemetry and they are not guaranteed to work.
Please note that versions of Node.JS v8 prior to `v8.12.0` will NOT work, because OpenTelemetry Node depends on the `perf_hooks` module introduced in `v8.5.0` and `performance.timeOrigin` that is set correctly starting in `v8.12.0`.

### Browser Support
Expand All @@ -161,7 +160,7 @@ There is currently no list of officially supported browsers, but OpenTelemetry i
## Feature Status

| Signal | API Status | SDK Status |
|---------|-------------|-------------------|
| ------- | ----------- | ----------------- |
| Tracing | Stable | Release Candidate |
| Metrics | Development | Development |
| Logs | Roadmap | Roadmap |
Expand Down Expand Up @@ -220,18 +219,18 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem
### API

| Package | Description |
|----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [@opentelemetry/api][otel-api] | This package provides TypeScript interfaces, enums and no-op implementations for the OpenTelemetry core trace and metrics model. It is intended for use both on the server and in the browser. |
| [@opentelemetry/core][otel-core] | This package provides default and no-op implementations of the OpenTelemetry api for trace and metrics. It's intended for use both on the server and in the browser. |

### Implementation / SDKs

| Package | Description |
|----------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [@opentelemetry/sdk-trace-base][otel-tracing] | This module provides a full control over instrumentation and span creation. It doesn't load [`async_hooks`](https://nodejs.org/api/async_hooks.html) or any instrumentation by default. It is intended for use both on the server and in the browser. |
| [@opentelemetry/sdk-metrics-base][otel-metrics] | This module provides instruments and meters for reporting of time series data. |
| [@opentelemetry/sdk-trace-node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. |
| [@opentelemetry/sdk-trace-web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. |
| Package | Description |
| ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [@opentelemetry/sdk-trace-base][otel-tracing] | This module provides a full control over instrumentation and span creation. It doesn't load [`async_hooks`](https://nodejs.org/api/async_hooks.html) or any instrumentation by default. It is intended for use both on the server and in the browser. |
| [@opentelemetry/sdk-metrics-base][otel-metrics] | This module provides instruments and meters for reporting of time series data. |
| [@opentelemetry/sdk-trace-node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. |
| [@opentelemetry/sdk-trace-web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. |

### Compatible Exporters

Expand Down Expand Up @@ -272,7 +271,7 @@ These instrumentations are hosted at <https://github.com/open-telemetry/opentele
### Shims

| Package | Description |
|----------------------------------------------------------|-----------------------------------------------------------------------------------------|
| -------------------------------------------------------- | --------------------------------------------------------------------------------------- |
| [@opentelemetry/shim-opentracing][otel-shim-opentracing] | OpenTracing shim allows existing OpenTracing instrumentation to report to OpenTelemetry |

## Upgrade guidelines
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-tracer-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/https/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/opentracing-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"opentracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/otlp-exporter-node/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3"
services:
# Collector
collector:
image: otel/opentelemetry-collector-contrib:0.50.0
image: otel/opentelemetry-collector-contrib:0.53.0
# image: otel/opentelemetry-collector-contrib:latest
command: ["--config=/conf/collector-config.yaml"]
volumes:
Expand Down
2 changes: 1 addition & 1 deletion examples/otlp-exporter-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/tracer-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"web"
],
"engines": {
"node": ">=8"
"node": ">=14"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
9 changes: 9 additions & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@ All notable changes to experimental packages in this project will be documented
### :boom: Breaking Change

* fix: remove aws and gcp detector from SDK #3024 @flarna
* feat(sdk-metrics-base): implement min/max recording for Histograms #3032 @pichlermarc
* adds `min`/`max` recording to Histograms
* updates [opentelemetry-proto](https://github.com/open-telemetry/opentelemetry-proto) to `0.18` so that `min` and
`max` can be exported. This change breaks the OTLP/JSON Metric Exporter for all collector versions `<0.52` due to
[open-telemetry/opentelemetry-collector#5312](https://github.com/open-telemetry/opentelemetry-collector/issues/5312).

### :rocket: (Enhancement)

* feat(opentelemetry-instrumentation-fetch): optionally ignore network events #3028 @gregolsen
* feat(http-instrumentation): record exceptions in http instrumentation #3008 @luismiramirez
* feat(node-sdk): add serviceName config option #2867 @naseemkullah
* feat(opentelemetry-exporter-prometheus): export PrometheusSerializer #3034 @matschaffer

### :bug: (Bug Fix)
Expand All @@ -24,6 +30,8 @@ All notable changes to experimental packages in this project will be documented

### :house: (Internal)

* test: add node 18 and remove EoL node versions [#3048](https://github.com/open-telemetry/opentelemetry-js/pull/3048) @dyladan

## 0.29.2

* Support for 1.3.1 of stable packages
Expand Down Expand Up @@ -63,6 +71,7 @@ All notable changes to experimental packages in this project will be documented
* fix(instrumentation): only patch core modules if enabled #2993 @santigimeno
* fix(otlp-transformer): include esm and esnext in package files and update README #2992 @pichlermarc
* fix(metrics): specification compliant default metric unit #2983 @andyfleming
* fix(opentelemetry-instrumentation): use all provided patches for the same file [#2963](https://github.com/open-telemetry/opentelemetry-js/pull/2963) @Ugzuzg

### :books: (Refine Doc)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "backcompat-node10",
"name": "backcompat-node14",
"version": "0.29.2",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts",
Expand All @@ -13,9 +13,12 @@
"@opentelemetry/sdk-trace-base": "1.3.1"
},
"devDependencies": {
"@types/node": "10.17.60",
"@types/node": "^14.0.0",
"typescript": "4.4.4"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
"license": "Apache-2.0",
"engines": {
"node": ">=14"
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "backcompat-node12",
"name": "backcompat-node16",
"version": "0.29.2",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts",
Expand All @@ -13,9 +13,12 @@
"@opentelemetry/sdk-trace-base": "1.3.1"
},
"devDependencies": {
"@types/node": "12.20.37",
"@types/node": "^16.0.0",
"typescript": "4.4.4"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
"license": "Apache-2.0",
"engines": {
"node": ">=14"
}
}
10 changes: 0 additions & 10 deletions experimental/backwards-compatability/node8/index.ts

This file was deleted.

21 changes: 0 additions & 21 deletions experimental/backwards-compatability/node8/package.json

This file was deleted.

18 changes: 0 additions & 18 deletions experimental/backwards-compatability/node8/tsconfig.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.12.0"
"node": ">=14"
},
"files": [
"build/src/**/*.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.12.0"
"node": ">=14"
},
"files": [
"build/esm/**/*.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.12.0"
"node": ">=14"
},
"files": [
"build/src/**/*.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.12.0"
"node": ">=14"
},
"files": [
"build/esm/**/*.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Apache License][license-image]][license-image]

This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url].
Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.16 <=0.50`.
Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.16 <=0.53`.

## Installation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"engines": {
"node": ">=8.12.0"
"node": ">=14"
},
"files": [
"build/src/**/*.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,12 @@ export function ensureExportedHistogramIsCorrect(
exemplars: [],
flags: 0,
_sum: 'sum',
_min: 'min',
_max: 'max',
sum: 21,
count: '2',
min: 7,
max: 14,
startTimeUnixNano: String(startTime),
timeUnixNano: String(time),
bucketCounts,
Expand Down
Loading

0 comments on commit 5cf2a10

Please sign in to comment.