Skip to content

Commit

Permalink
Merge branch 'main' into bugfix/wrong-data-type-for-numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
kudlatyamroth authored Feb 17, 2021
2 parents 2817149 + a91ea76 commit 6931c64
Show file tree
Hide file tree
Showing 260 changed files with 1,318 additions and 2,146 deletions.
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,61 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 0.17.0

### :boom: Breaking Change

* `opentelemetry-api-metrics`, `opentelemetry-api`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-grpc-utils`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-plugin-grpc-js`, `opentelemetry-plugin-grpc`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
* [#1925](https://github.com/open-telemetry/opentelemetry-js/pull/1925) feat(diag-logger): replace logger with diag logger ([@MSNev](https://github.com/MSNev))
* `opentelemetry-api`, `opentelemetry-instrumentation-http`, `opentelemetry-node`, `opentelemetry-plugin-http`, `opentelemetry-tracing`
* [#1899](https://github.com/open-telemetry/opentelemetry-js/pull/1899) chore: create NoopSpan instead reusing NOOP_SPAN ([@Flarna](https://github.com/Flarna))
* `opentelemetry-tracing`
* [#1908](https://github.com/open-telemetry/opentelemetry-js/pull/1908) chore: remove config from BasicTracerProvider#getTracer ([@Flarna](https://github.com/Flarna))
* `opentelemetry-core`, `opentelemetry-instrumentation-http`, `opentelemetry-node`, `opentelemetry-plugin-http`, `opentelemetry-tracing`
* [#1900](https://github.com/open-telemetry/opentelemetry-js/pull/1900) chore: remove NoRecordingSpan ([@Flarna](https://github.com/Flarna))
* `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-node`, `opentelemetry-sdk-node`, `opentelemetry-web`
* [#1855](https://github.com/open-telemetry/opentelemetry-js/pull/1855) Use instrumentation loader to load plugins and instrumentations ([@obecny](https://github.com/obecny))
* `opentelemetry-api`, `opentelemetry-core`, `opentelemetry-shim-opentracing`
* [#1876](https://github.com/open-telemetry/opentelemetry-js/pull/1876) refactor!: specification compliant baggage ([@dyladan](https://github.com/dyladan))
* `opentelemetry-api-metrics`, `opentelemetry-api`, `opentelemetry-context-async-hooks`, `opentelemetry-context-base`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-context-zone`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-grpc-utils`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-plugin-grpc-js`, `opentelemetry-plugin-grpc`, `opentelemetry-plugin-http`, `opentelemetry-plugin-https`, `opentelemetry-propagator-b3`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-semantic-conventions`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
* [#1874](https://github.com/open-telemetry/opentelemetry-js/pull/1874) More specific api type names ([@dyladan](https://github.com/dyladan))

### :rocket: (Enhancement)

* `opentelemetry-exporter-prometheus`
* [#1857](https://github.com/open-telemetry/opentelemetry-js/pull/1857) feat: add prometheus exporter host and port env vars ([@naseemkullah](https://github.com/naseemkullah))
* [#1879](https://github.com/open-telemetry/opentelemetry-js/pull/1879) feat(prometheus): add `getMetricsRequestHandler`-method to Prometheus ([@weyert](https://github.com/weyert))
* `opentelemetry-core`, `opentelemetry-tracing`
* [#1918](https://github.com/open-telemetry/opentelemetry-js/pull/1918) chore: batch processor, aligning with latest spec changes for environments variables ([@obecny](https://github.com/obecny))
* `opentelemetry-instrumentation-grpc`
* [#1806](https://github.com/open-telemetry/opentelemetry-js/pull/1806) feat: merge grpc-js into grpc instrumentation #1657 ([@vmarchaud](https://github.com/vmarchaud))
* `opentelemetry-api`, `opentelemetry-core`
* [#1880](https://github.com/open-telemetry/opentelemetry-js/pull/1880) feat(diag-logger): introduce a new global level api.diag for internal diagnostic logging ([@MSNev](https://github.com/MSNev))
* Other
* [#1920](https://github.com/open-telemetry/opentelemetry-js/pull/1920) chore: adding compatibility matrix for core and contrib versions ([@obecny](https://github.com/obecny))
* `opentelemetry-api`, `opentelemetry-context-async-hooks`, `opentelemetry-context-base`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-tracing`, `opentelemetry-web`
* [#1883](https://github.com/open-telemetry/opentelemetry-js/pull/1883) feat: add support to forward args in context.with ([@Flarna](https://github.com/Flarna))
* `opentelemetry-api`, `opentelemetry-core`, `opentelemetry-shim-opentracing`
* [#1876](https://github.com/open-telemetry/opentelemetry-js/pull/1876) refactor!: specification compliant baggage ([@dyladan](https://github.com/dyladan))

### :books: (Refine Doc)

* Other
* [#1904](https://github.com/open-telemetry/opentelemetry-js/pull/1904) chore: fix upgrade guideline ([@dyladan](https://github.com/dyladan))
* `opentelemetry-api`
* [#1901](https://github.com/open-telemetry/opentelemetry-js/pull/1901) doc: correct tracer docs ([@Flarna](https://github.com/Flarna))

### Committers: 8

* Bartlomiej Obecny ([@obecny](https://github.com/obecny))
* Daniel Dyla ([@dyladan](https://github.com/dyladan))
* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
* Naseem ([@naseemkullah](https://github.com/naseemkullah))
* Nev ([@MSNev](https://github.com/MSNev))
* Srikanth Chekuri ([@lonewolf3739](https://github.com/lonewolf3739))
* Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
* Weyert de Boer ([@weyert](https://github.com/weyert))

## 0.16.0

### :boom: Breaking Change
Expand Down
47 changes: 47 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,53 @@ To request automatic tracing support for a module not on this list, please [file

## Upgrade guidelines

### 0.17.0 to ???

[PR-1880](https://github.com/open-telemetry/opentelemetry-js/pull/1880) feat(diag-logger): introduce a new global level api.diag for internal diagnostic logging

[PR-1925](https://github.com/open-telemetry/opentelemetry-js/pull/1925) feat(diag-logger): part 2 - breaking changes - remove api.Logger, api.NoopLogger, core.LogLevel, core.ConsoleLogger

- These PR's remove the previous ```Logger``` and ```LogLevel``` implementations and change the way you should use the replacement ```DiagLogger``` and ```DiagLogLevel```, below are simple examples of how to change your existing usages.

#### Setting the global diagnostic logger

The new global [```api.diag```](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-api/src/api/diag.ts#L32) provides the ability to set the global diagnostic logger ```setLogger()``` and logging level ```setLogLevel()```, it is also a ```DiagLogger``` implementation and should be directly to log diagnostic messages.

All included logger references have been removed in preference to using the global ```api.diag``` directly, so you no longer need to pass around the logger instance via function parameters or included as part of the configuration for a component.

```javascript
// Setting the default Global logger to use the Console
import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
diag.setLogger(new DiagConsoleLogger())

// And optionally change the logging level (Defaults to INFO)
diag.setLogLevel(DiagLogLevel.ERROR);
```

#### Using the logger anywhere in the code

```typescript
import { diag } from "@opentelemetry/api";

// Remove or make optional the parameter and don't use it.
export function MyFunction() {
diag.debug("...");
diag.info("...");
diag.warn("...");
diag.error("...");
diag.verbose("..");
}

```

#### Setting the logger back to a noop

```typescript
import { diag } from "@opentelemetry/api";
diag.setLogger();

```

### 0.16.0 to 0.17.0

[PR-1855](https://github.com/open-telemetry/opentelemetry-js/pull/1855) Use instrumentation loader to load plugins and instrumentations
Expand Down
6 changes: 3 additions & 3 deletions backwards-compatability/node10/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node10",
"version": "0.16.0",
"version": "0.17.0",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/sdk-node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"devDependencies": {
"@types/node": "10.17.50",
Expand Down
6 changes: 3 additions & 3 deletions backwards-compatability/node12/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node12",
"version": "0.16.0",
"version": "0.17.0",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/sdk-node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"devDependencies": {
"@types/node": "12.19.13",
Expand Down
6 changes: 3 additions & 3 deletions backwards-compatability/node8/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "backcompat-node8",
"version": "0.16.0",
"version": "0.17.0",
"private": true,
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
"scripts": {
"test:backcompat": "tsc --noEmit index.ts"
},
"dependencies": {
"@opentelemetry/sdk-node": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/sdk-node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"devDependencies": {
"@types/node": "8.10.66",
Expand Down
7 changes: 4 additions & 3 deletions benchmark/tracer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ const benchmark = require('./benchmark');
const opentelemetry = require('../packages/opentelemetry-api');
const { BasicTracerProvider, BatchSpanProcessor, InMemorySpanExporter, SimpleSpanProcessor } = require('../packages/opentelemetry-tracing');

const diagLogger = opentelemetry.createNoopDiagLogger();
// Clear any previous global logger
opentelemetry.diag.setLogger();

const setups = [
{
Expand All @@ -13,7 +14,7 @@ const setups = [
},
{
name: 'BasicTracerProvider',
provider: new BasicTracerProvider({ logger: diagLogger })
provider: new BasicTracerProvider()
},
{
name: 'BasicTracerProvider with SimpleSpanProcessor',
Expand Down Expand Up @@ -63,7 +64,7 @@ for (const setup of setups) {
suite.run({ async: false });
}
function getProvider(processor) {
const provider = new BasicTracerProvider({ logger: diagLogger });
const provider = new BasicTracerProvider();
provider.addSpanProcessor(processor);
return provider;
}
Expand Down
8 changes: 4 additions & 4 deletions examples/basic-tracer-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-basic-tracer-node",
"private": true,
"version": "0.16.0",
"version": "0.17.0",
"description": "Example of using @opentelemetry/tracing in Node.js",
"main": "index.js",
"scripts": {
Expand All @@ -24,9 +24,9 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.16.0",
"@opentelemetry/exporter-jaeger": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
2 changes: 1 addition & 1 deletion examples/collector-exporter-node/metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector')
// const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto');
const { MeterProvider } = require('@opentelemetry/metrics');

// Optional and only needed to see the internal diagnostic logging (during development)
diag.setLogger(new DiagConsoleLogger());
diag.setLogLevel(DiagLogLevel.DEBUG);

const metricExporter = new CollectorMetricExporter({
serviceName: 'basic-metric-service',
// url: 'http://localhost:55681/v1/metrics',
logger: diag,
});

const meter = new MeterProvider({
Expand Down
16 changes: 8 additions & 8 deletions examples/collector-exporter-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-collector-exporter-node",
"private": true,
"version": "0.16.0",
"version": "0.17.0",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand All @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.16.0",
"@opentelemetry/core": "^0.16.0",
"@opentelemetry/exporter-collector": "^0.16.0",
"@opentelemetry/exporter-collector-grpc": "^0.16.0",
"@opentelemetry/exporter-collector-proto": "^0.16.0",
"@opentelemetry/metrics": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/exporter-collector-grpc": "^0.17.0",
"@opentelemetry/exporter-collector-proto": "^0.17.0",
"@opentelemetry/metrics": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
16 changes: 8 additions & 8 deletions examples/grpc-js/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grpc-js-example",
"private": true,
"version": "0.16.0",
"version": "0.17.0",
"description": "Example of @grpc/grpc-js integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,13 +29,13 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.0.5",
"@opentelemetry/api": "^0.16.0",
"@opentelemetry/exporter-jaeger": "^0.16.0",
"@opentelemetry/exporter-zipkin": "^0.16.0",
"@opentelemetry/instrumentation": "^0.16.0",
"@opentelemetry/node": "^0.16.0",
"@opentelemetry/plugin-grpc-js": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0",
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-grpc-js": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"google-protobuf": "^3.9.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
16 changes: 8 additions & 8 deletions examples/grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grpc-example",
"private": true,
"version": "0.16.0",
"version": "0.17.0",
"description": "Example of gRPC integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand All @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.16.0",
"@opentelemetry/exporter-jaeger": "^0.16.0",
"@opentelemetry/exporter-zipkin": "^0.16.0",
"@opentelemetry/instrumentation": "^0.16.0",
"@opentelemetry/node": "^0.16.0",
"@opentelemetry/plugin-grpc": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0",
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-grpc": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"google-protobuf": "^3.9.2",
"grpc": "^1.23.3",
"node-pre-gyp": "0.14.0"
Expand Down
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.16.0",
"version": "0.17.0",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand All @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.16.0",
"@opentelemetry/exporter-jaeger": "^0.16.0",
"@opentelemetry/exporter-zipkin": "^0.16.0",
"@opentelemetry/instrumentation": "^0.16.0",
"@opentelemetry/node": "^0.16.0",
"@opentelemetry/plugin-http": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
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.16.0",
"version": "0.17.0",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -29,13 +29,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.16.0",
"@opentelemetry/exporter-jaeger": "^0.16.0",
"@opentelemetry/exporter-zipkin": "^0.16.0",
"@opentelemetry/instrumentation": "^0.16.0",
"@opentelemetry/node": "^0.16.0",
"@opentelemetry/plugin-https": "^0.16.0",
"@opentelemetry/tracing": "^0.16.0"
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-https": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
Expand Down
Loading

0 comments on commit 6931c64

Please sign in to comment.