Skip to content

Commit

Permalink
Merge pull request #316 from dynatrace-oss-contrib/0.13.0-proposal
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored Feb 1, 2021
2 parents eb7ebd1 + 2e802a3 commit 9d7446d
Show file tree
Hide file tree
Showing 69 changed files with 202 additions and 175 deletions.
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 0.13.0

#### :bug: Bug Fix
* `opentelemetry-test-utils`
* [#239](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/239) fix(plugin-ioredis): end span on response from the server and set span status according to response ([@blumamir](https://github.com/blumamir))
* Other
* [#322](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/322) Fix link ([@jonaskello](https://github.com/jonaskello))
* [#310](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/310) fix: move semantic-conventions to regular dependencies ([@dobesv](https://github.com/dobesv))
* [#281](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/281) fix(koa): End span and record exception on a middleware exception ([@oguzbilgener](https://github.com/oguzbilgener))

#### :rocket: Enhancement
* Other
* [#318](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/318) feat: OpenTracing propagator ([@mwear](https://github.com/mwear))
* `opentelemetry-host-metrics`, `opentelemetry-test-utils`
* [#315](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/315) chore: update to OTel 0.15.0 ([@Flarna](https://github.com/Flarna))

#### :memo: Documentation
* `opentelemetry-host-metrics`
* [#325](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/325) chore: change links to point to main ([@dyladan](https://github.com/dyladan))

#### Committers: 7
- Amir Blum ([@blumamir](https://github.com/blumamir))
- Daniel Dyla ([@dyladan](https://github.com/dyladan))
- Dobes Vandermeer ([@dobesv](https://github.com/dobesv))
- Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
- Jonas Kello ([@jonaskello](https://github.com/jonaskello))
- Matthew Wear ([@mwear](https://github.com/mwear))
- Oğuz Bilgener ([@oguzbilgener](https://github.com/oguzbilgener))

## 0.12.1

#### :bug: Bug Fix
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-github",
"version": "0.12.1",
"version": "0.13.0",
"description": "OpenTelemetry SDK resource detector for GitHub",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
*/

// this is autogenerated file, see scripts/version-update.js
export const VERSION = '0.12.1';
export const VERSION = '0.13.0';
3 changes: 2 additions & 1 deletion examples/dns/client.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const api = require('@opentelemetry/api');
const tracer = require('./tracer')('example-dns');
// eslint-disable-next-line import/order
const dns = require('dns').promises;
Expand All @@ -10,7 +11,7 @@ function makeLookup() {
// the span, which is created to track work that happens outside of the
// dns lookup query.
const span = tracer.startSpan('dnsLookup');
tracer.withSpan(span, async () => {
api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
try {
await dns.lookup('montreal.ca');
} catch (error) {
Expand Down
14 changes: 7 additions & 7 deletions examples/dns/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dns-example",
"private": true,
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of DNS integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand All @@ -26,12 +26,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
"@opentelemetry/exporter-jaeger": "^0.14.0",
"@opentelemetry/exporter-zipkin": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-dns": "^0.12.1",
"@opentelemetry/tracing": "^0.14.0"
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/exporter-jaeger": "^0.15.0",
"@opentelemetry/exporter-zipkin": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/plugin-dns": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/dns/tracer.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ module.exports = (serviceName) => {

provider.addSpanProcessor(new SimpleSpanProcessor(exporter));

// Initialize the OpenTelemetry APIs to use the BasicTracerProvider bindings
// Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
provider.register();

return opentelemetry.trace.getTracer('dns-example');
return opentelemetry.trace.getTracer(serviceName);
};
3 changes: 1 addition & 2 deletions examples/express/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ const axios = require('axios').default;

function makeRequest() {
const span = tracer.startSpan('client.makeRequest()', {
parent: tracer.getCurrentSpan(),
kind: api.SpanKind.CLIENT,
});

tracer.withSpan(span, async () => {
api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
try {
const res = await axios.get('http://localhost:8080/run_test');
span.setStatus({ code: api.StatusCode.OK });
Expand Down
16 changes: 8 additions & 8 deletions examples/express/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "express-example",
"private": true,
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of Express 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.14.0",
"@opentelemetry/exporter-jaeger": "^0.14.0",
"@opentelemetry/exporter-zipkin": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-express": "^0.12.1",
"@opentelemetry/plugin-http": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/exporter-jaeger": "^0.15.0",
"@opentelemetry/exporter-zipkin": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/plugin-express": "file:../../plugins/node/opentelemetry-plugin-express",
"@opentelemetry/plugin-http": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"axios": "^0.19.0",
"express": "^4.17.1"
},
Expand Down
3 changes: 1 addition & 2 deletions examples/express/server.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

// eslint-disable-next-line
const tracer = require('./tracer')('example-express-server');
require('./tracer')('example-express-server');

// Require in rest of modules
const express = require('express');
Expand All @@ -11,7 +11,6 @@ const axios = require('axios').default;
const app = express();
const PORT = 8080;


const getCrudController = () => {
const router = express.Router();
const resources = [];
Expand Down
18 changes: 9 additions & 9 deletions examples/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opentelemetry-plugin-graphql-example",
"private": true,
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of using @opentelemetry/plugin-graphql with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,14 +31,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
"@opentelemetry/exporter-collector": "^0.14.0",
"@opentelemetry/instrumentation-graphql": "^0.12.1",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-express": "^0.12.1",
"@opentelemetry/plugin-http": "^0.14.0",
"@opentelemetry/plugin-https": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/exporter-collector": "^0.15.0",
"@opentelemetry/instrumentation-graphql": "^0.13.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/plugin-express": "^0.13.0",
"@opentelemetry/plugin-http": "^0.15.0",
"@opentelemetry/plugin-https": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"apollo-server": "^2.18.1",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
Expand Down
3 changes: 2 additions & 1 deletion examples/grpc-census-prop/capitalize_client.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const api = require('@opentelemetry/api');
/* eslint-disable global-require */
const binaryPropagator = process.env.BINARY_PROPAGATOR === 'true';
const censusTracer = process.env.CENSUS_TRACER === 'true';
Expand Down Expand Up @@ -65,7 +66,7 @@ function capitalizeWithCensusTracing(client, data) {
*/
function capitalizeWithOTelTracing(client, data) {
const span = tracer.startSpan('tutorialsClient.capitalize');
tracer.withSpan(span, () => {
api.context.with(api.setSpan(api.ROOT_CONTEXT, span), () => {
client.capitalize({ data: Buffer.from(data) }, (err, response) => {
if (err) {
console.log('could not get grpc response');
Expand Down
1 change: 0 additions & 1 deletion examples/grpc-census-prop/capitalize_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ function capitalizeWithOTelTracing(call) {
console.log(`traceid: ${currentSpan.context().traceId}`);

const span = tracer.startSpan('tutorials.FetchImpl.capitalize', {
parent: currentSpan,
kind: SpanKind.SERVER,
});

Expand Down
14 changes: 7 additions & 7 deletions examples/grpc-census-prop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grpc-census-prop-example",
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of using propagator-grpc-census-binary",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -34,12 +34,12 @@
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^0.14.0",
"@opentelemetry/core": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-grpc": "^0.14.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.12.1",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/core": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/plugin-grpc": "^0.15.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"grpc": "^1.24.2",
"node-pre-gyp": "0.12.0"
},
Expand Down
3 changes: 2 additions & 1 deletion examples/grpc_dynamic_codegen/capitalize_client.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const api = require("@opentelemetry/api")
// eslint-disable-next-line import/order
const tracer = require('./tracer')('example-grpc-capitalize-client');
const path = require('path');
Expand All @@ -20,7 +21,7 @@ function main() {
console.log('> ', data);

const span = tracer.startSpan('tutorialsClient.capitalize');
tracer.withSpan(span, () => {
api.context.with(api.setSpan(api.ROOT_CONTEXT, span), () => {
client.capitalize({ data: Buffer.from(data) }, (err, response) => {
if (err) {
console.log('could not get grpc response');
Expand Down
1 change: 0 additions & 1 deletion examples/grpc_dynamic_codegen/capitalize_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ function capitalize(call, callback) {
console.log(`traceid: ${currentSpan.context().traceId}`);

const span = tracer.startSpan('tutorials.FetchImpl.capitalize', {
parent: currentSpan,
kind: SpanKind.SERVER,
});

Expand Down
5 changes: 2 additions & 3 deletions examples/hapi/client.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
'use strict';

const api = require('@opentelemetry/api');
// eslint-disable-next-line import/order
const tracer = require('./tracer')('example-hapi-client');
const api = require('@opentelemetry/api');
const axios = require('axios').default;

function makeRequest() {
const span = tracer.startSpan('client.makeRequest()', {
parent: tracer.getCurrentSpan(),
kind: api.SpanKind.CLIENT,
});

tracer.withSpan(span, async () => {
api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
try {
const res = await axios.get('http://localhost:8081/run_test');
span.setStatus({ code: api.StatusCode.OK });
Expand Down
16 changes: 8 additions & 8 deletions examples/hapi/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hapi-example",
"private": true,
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of Hapi auto-instrumentation with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,13 +32,13 @@
},
"dependencies": {
"@hapi/hapi": "^19.2.0",
"@opentelemetry/api": "^0.14.0",
"@opentelemetry/exporter-jaeger": "^0.14.0",
"@opentelemetry/exporter-zipkin": "^0.14.0",
"@opentelemetry/hapi-instrumentation": "^0.12.1",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-http": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/exporter-jaeger": "^0.15.0",
"@opentelemetry/exporter-zipkin": "^0.15.0",
"@opentelemetry/hapi-instrumentation": "^0.13.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/plugin-http": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"axios": "^0.19.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/host-metrics/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "host-metrics-example",
"private": true,
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of using @opentelemetry/host-metrics",
"main": "index.js",
"scripts": {
Expand All @@ -26,12 +26,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
"@opentelemetry/core": "^0.14.0",
"@opentelemetry/exporter-collector": "^0.14.0",
"@opentelemetry/exporter-prometheus": "^0.14.0",
"@opentelemetry/host-metrics": "^0.12.1",
"@opentelemetry/metrics": "^0.14.0"
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/core": "^0.15.0",
"@opentelemetry/exporter-collector": "^0.15.0",
"@opentelemetry/exporter-prometheus": "^0.15.0",
"@opentelemetry/host-metrics": "^0.13.0",
"@opentelemetry/metrics": "^0.15.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
12 changes: 6 additions & 6 deletions examples/ioredis/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ioredis-example",
"private": true,
"version": "0.12.1",
"version": "0.13.0",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand All @@ -28,11 +28,11 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
"@opentelemetry/exporter-jaeger": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-ioredis": "^0.12.1",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/exporter-jaeger": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/plugin-ioredis": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"ioredis": "^4.14.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
Expand Down
3 changes: 1 addition & 2 deletions examples/koa/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ const axios = require('axios').default;

function makeRequest() {
const span = tracer.startSpan('client.makeRequest()', {
parent: tracer.getCurrentSpan(),
kind: api.SpanKind.CLIENT,
});

tracer.withSpan(span, async () => {
api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
try {
const res = await axios.get('http://localhost:8081/run_test');
span.setStatus({ code: api.StatusCode.OK });
Expand Down
Loading

0 comments on commit 9d7446d

Please sign in to comment.