Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
nozik committed Jul 6, 2021
2 parents 38b78c6 + 52b46aa commit 15accd8
Show file tree
Hide file tree
Showing 163 changed files with 5,261 additions and 556 deletions.
44 changes: 29 additions & 15 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,28 @@ jobs:
container:
image: ${{ matrix.container }}
services:
memcached:
image: memcached:1.6.9-alpine
ports:
- 11211:11211
mongo:
image: mongo
ports:
- 27017:27017
mysql:
image: circleci/mysql:5.7
env:
MYSQL_USER: otel
MYSQL_PASSWORD: secret
MYSQL_DATABASE: circle_database
MYSQL_ROOT_PASSWORD: rootpw
ports:
- 3306:3306
options: >-
--health-cmd="mysqladmin ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
postgres:
image: circleci/postgres:9.6-alpine
env:
Expand All @@ -39,25 +57,19 @@ jobs:
--health-interval 10s
--health-timeout 5s
--health-retries 5
mysql:
image: circleci/mysql:5.7
env:
MYSQL_USER: otel
MYSQL_PASSWORD: secret
MYSQL_DATABASE: circle_database
MYSQL_ROOT_PASSWORD: rootpw
cassandra:
image: bitnami/cassandra:3
ports:
- 3306:3306
options: >-
--health-cmd="mysqladmin ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
- 9042:9042
env:
RUN_POSTGRES_TESTS: 1
RUN_MYSQL_TESTS: 1
RUN_CASSANDRA_TESTS: 1
RUN_MEMCACHED_TESTS: 1
RUN_MONGODB_TESTS: 1
RUN_MYSQL_TESTS: 1
RUN_POSTGRES_TESTS: 1
RUN_REDIS_TESTS: 1
OPENTELEMETRY_MEMCACHED_HOST: memcached
OPENTELEMETRY_MEMCACHED_PORT: 11211
POSTGRES_USER: postgres
POSTGRES_DB: circle_database
POSTGRES_HOST: postgres
Expand All @@ -73,6 +85,8 @@ jobs:
MYSQL_HOST: mysql
MYSQL_PORT: 3306
NPM_CONFIG_UNSAFE_PERM: true
CASSANDRA_HOST: cassandra
CASSANDRA_PORT: 9042
steps:
- name: Checkout
uses: actions/checkout@v1
Expand Down
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,38 @@ All notable changes to this project will be documented in this file. Do not remo

## Unreleased

## 0.23.0

#### :bug: Bug Fix
* [#557](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/557) chore: aligning target for esm build with core repo ([@obecny](https://github.com/obecny))

#### :rocket: Enhancement
* `opentelemetry-browser-extension-autoinjection`
* [#498](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/498) feat: add browser extension ([@svrnm](https://github.com/svrnm))
* `opentelemetry-host-metrics`, `opentelemetry-id-generator-aws-xray`, `opentelemetry-test-utils`
* [#556](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/556) chore: update core and API ([@dyladan](https://github.com/dyladan))
* Other
* [#533](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/533) feat(mongo instrumentation): added response hook option ([@prsnca](https://github.com/prsnca))
* [#546](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/546) feat(aws-lambda): disableAwsContextPropagation config option ([@nirsky](https://github.com/nirsky))
* [#528](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/528) feat: postgresql responseHook support ([@nata7che](https://github.com/nata7che))
* `opentelemetry-test-utils`
* [#538](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/538) feat: add cassandra-driver instrumentation ([@seemk](https://github.com/seemk))
* [#539](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/539) feat: memcached instrumentation ([@Rauno56](https://github.com/Rauno56))

#### :house: Internal
* [#554](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/554) chore: remove unneeded ts-node dev-dependency ([@Flarna](https://github.com/Flarna))

#### Committers: 9
- Bartlomiej Obecny ([@obecny](https://github.com/obecny))
- Daniel Dyla ([@dyladan](https://github.com/dyladan))
- Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
- Nir Hadassi ([@nirsky](https://github.com/nirsky))
- Rauno Viskus ([@Rauno56](https://github.com/Rauno56))
- Severin Neumann ([@svrnm](https://github.com/svrnm))
- Siim Kallas ([@seemk](https://github.com/seemk))
- Yaron ([@prsnca](https://github.com/prsnca))
- natashz ([@nata7che](https://github.com/nata7che))

## 0.22.0

#### :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.22.0",
"version": "0.23.0",
"description": "OpenTelemetry SDK resource detector for GitHub",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -43,23 +43,23 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
"@opentelemetry/api": "^1.0.1"
},
"devDependencies": {
"@opentelemetry/api": "1.0.0",
"@opentelemetry/api": "1.0.1",
"@types/mocha": "8.2.2",
"@types/node": "14.17.3",
"@types/node": "14.17.4",
"@types/sinon": "10.0.2",
"codecov": "3.8.2",
"gts": "3.1.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "10.0.0",
"sinon": "11.1.1",
"ts-mocha": "8.0.0",
"typescript": "4.3.2"
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/resources": "^0.22.0"
"@opentelemetry/resources": "^0.23.0"
}
}
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.22.0';
export const VERSION = '0.23.0';
12 changes: 6 additions & 6 deletions examples/dns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-dns": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0"
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions examples/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-express": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1",
"cross-env": "^7.0.3",
"express": "^4.17.1"
Expand Down
10 changes: 5 additions & 5 deletions examples/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-graphql": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/instrumentation-express": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"apollo-server": "^2.18.1",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc-census-prop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/core": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-grpc": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/core": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-grpc": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.15.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/tracing": "^0.23.0",
"grpc": "^1.24.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc_dynamic_codegen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.4.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/instrumentation-grpc": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/instrumentation-grpc": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"grpc": "^1.24.6"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/hapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@hapi/hapi": "^19.2.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-hapi": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/host-metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/core": "^0.22.0",
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/exporter-prometheus": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/core": "^0.23.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/exporter-prometheus": "^0.23.0",
"@opentelemetry/host-metrics": "^0.15.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/metrics": "^0.22.0"
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/metrics": "^0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
10 changes: 5 additions & 5 deletions examples/ioredis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-ioredis": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"ioredis": "^4.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
Expand Down
14 changes: 7 additions & 7 deletions examples/koa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@koa/router": "^9.3.1",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-koa": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1",
"koa": "^2.13.0"
},
Expand Down
18 changes: 18 additions & 0 deletions examples/memcached/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Overview

OpenTelemetry Memcached instrumentation allows user to automatically collect trace data from queries made by the client and export them to the backend of choice. This example does not showcase export functionality, but there are numerous other examples doing that: [`express`](../express), [`router`](../router).

## Running the Example

Created spans are printed out to stdout while running the example.

```sh
npm install # install the dependencies
npm run docker:start # start memcached server
npm run start # run the example
npm run docker:stop # spin down and clean up the docker container
```

## LICENSE

Apache License 2.0
20 changes: 20 additions & 0 deletions examples/memcached/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
'use strict';

require('./tracer')('example-resource');
const Memcached = require('memcached');
const assert = require('assert');

const KEY = '_KEY_';
const VALUE = `RAND:${Math.random().toFixed(4)}`;
const LT = 10;
const client = new Memcached();

client.set(KEY, VALUE, LT, (err) => {
assert.strictEqual(err, undefined);
client.get(KEY, (err, result) => {
assert.strictEqual(err, undefined);
assert.strictEqual(result, VALUE);
console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
setTimeout(() => { console.log('Completed.'); }, 5000);
});
});

0 comments on commit 15accd8

Please sign in to comment.