Skip to content

Commit

Permalink
Merge branch 'main' into add-docker-cgroup-containerid
Browse files Browse the repository at this point in the history
  • Loading branch information
abhee11 authored Mar 4, 2022
2 parents 607d0fd + da792fe commit ec7d744
Show file tree
Hide file tree
Showing 158 changed files with 2,075 additions and 563 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v2
- uses: google-github-actions/release-please-action@v3
id: release
with:
command: manifest
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
RUN_REDIS_TESTS: 1
CASSANDRA_HOST: localhost
MONGODB_DB: opentelemetry-tests
MONGODB_HOST: localhost
MONGODB_HOST: 127.0.0.1
MONGODB_PORT: 27017
MSSQL_PASSWORD: mssql_passw0rd
MYSQL_DATABASE: circle_database
Expand Down Expand Up @@ -146,7 +146,9 @@ jobs:
run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
- name: Report Coverage
if: matrix.node == '14'
run: npm run codecov:ci:changed
uses: codecov/codecov-action@v2
with:
verbose: true

browser-test:
strategy:
Expand Down Expand Up @@ -190,4 +192,6 @@ jobs:
- name: Unit tests
run: npm run test:browser
- name: Report Coverage
run: npm run codecov:browser
uses: codecov/codecov-action@v2
with:
verbose: true
4 changes: 4 additions & 0 deletions .nycrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"extension": [
".ts"
],
"include": [
"src/**"
],
"reporter": ["text", "json"],
"exclude": [
"**/*.d.ts",
"build/**/**/*.js",
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.2","detectors/node/opentelemetry-resource-detector-aws":"1.0.3","detectors/node/opentelemetry-resource-detector-gcp":"0.26.2","detectors/node/opentelemetry-resource-detector-github":"0.26.1","metapackages/auto-instrumentations-node":"0.27.2","metapackages/auto-instrumentations-web":"0.27.2","packages/opentelemetry-browser-extension-autoinjection":"0.27.2","packages/opentelemetry-host-metrics":"0.27.1","packages/opentelemetry-id-generator-aws-xray":"1.0.1","packages/opentelemetry-test-utils":"0.29.0","plugins/node/instrumentation-tedious":"0.1.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.28.1","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.5.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.27.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.27.1","plugins/node/opentelemetry-instrumentation-connect":"0.27.1","plugins/node/opentelemetry-instrumentation-dns":"0.27.1","plugins/node/opentelemetry-instrumentation-express":"0.27.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.27.1","plugins/node/opentelemetry-instrumentation-graphql":"0.27.2","plugins/node/opentelemetry-instrumentation-hapi":"0.27.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.27.1","plugins/node/opentelemetry-instrumentation-knex":"0.27.1","plugins/node/opentelemetry-instrumentation-koa":"0.28.1","plugins/node/opentelemetry-instrumentation-memcached":"0.27.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.28.0","plugins/node/opentelemetry-instrumentation-mysql":"0.27.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.28.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.28.2","plugins/node/opentelemetry-instrumentation-net":"0.27.1","plugins/node/opentelemetry-instrumentation-pg":"0.28.0","plugins/node/opentelemetry-instrumentation-pino":"0.28.1","plugins/node/opentelemetry-instrumentation-redis":"0.28.0","plugins/node/opentelemetry-instrumentation-restify":"0.27.1","plugins/node/opentelemetry-instrumentation-router":"0.27.1","plugins/node/opentelemetry-instrumentation-winston":"0.27.1","plugins/web/opentelemetry-instrumentation-document-load":"0.27.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.28.1","plugins/web/opentelemetry-plugin-react-load":"0.26.1","propagators/opentelemetry-propagator-aws-xray":"1.0.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.1","propagators/opentelemetry-propagator-ot-trace":"0.25.1"}
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.2","detectors/node/opentelemetry-resource-detector-aws":"1.0.3","detectors/node/opentelemetry-resource-detector-gcp":"0.26.2","detectors/node/opentelemetry-resource-detector-github":"0.26.1","metapackages/auto-instrumentations-node":"0.27.3","metapackages/auto-instrumentations-web":"0.27.2","packages/opentelemetry-browser-extension-autoinjection":"0.27.4","packages/opentelemetry-host-metrics":"0.27.1","packages/opentelemetry-id-generator-aws-xray":"1.0.1","packages/opentelemetry-test-utils":"0.29.0","plugins/node/instrumentation-tedious":"0.1.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.29.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.5.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.27.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.27.1","plugins/node/opentelemetry-instrumentation-connect":"0.27.1","plugins/node/opentelemetry-instrumentation-dns":"0.27.1","plugins/node/opentelemetry-instrumentation-express":"0.28.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.27.2","plugins/node/opentelemetry-instrumentation-graphql":"0.27.4","plugins/node/opentelemetry-instrumentation-hapi":"0.27.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.28.0","plugins/node/opentelemetry-instrumentation-knex":"0.27.1","plugins/node/opentelemetry-instrumentation-koa":"0.28.1","plugins/node/opentelemetry-instrumentation-memcached":"0.27.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.29.0","plugins/node/opentelemetry-instrumentation-mysql":"0.28.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.29.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.28.3","plugins/node/opentelemetry-instrumentation-net":"0.27.1","plugins/node/opentelemetry-instrumentation-pg":"0.28.0","plugins/node/opentelemetry-instrumentation-pino":"0.28.1","plugins/node/opentelemetry-instrumentation-redis":"0.29.0","plugins/node/opentelemetry-instrumentation-restify":"0.27.2","plugins/node/opentelemetry-instrumentation-router":"0.27.1","plugins/node/opentelemetry-instrumentation-winston":"0.27.2","plugins/web/opentelemetry-instrumentation-document-load":"0.27.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.28.1","plugins/web/opentelemetry-plugin-react-load":"0.26.1","propagators/opentelemetry-propagator-aws-xray":"1.0.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.1","propagators/opentelemetry-propagator-ot-trace":"0.25.1","plugins/node/opentelemetry-instrumentation-fastify":"0.26.0","packages/opentelemetry-propagation-utils":"0.27.0","plugins/web/opentelemetry-instrumentation-long-task":"0.28.0"}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright [2022] OpenTelemetry Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "rimraf build/*",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"compile": "npm run version:update && tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
Expand Down Expand Up @@ -49,13 +48,12 @@
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
"nock": "12.0.3",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "12.0.1",
"sinon": "13.0.1",
"ts-mocha": "8.0.0",
"typescript": "4.3.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "rimraf build/*",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"compile": "npm run version:update && tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
Expand Down Expand Up @@ -48,13 +47,12 @@
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
"nock": "12.0.3",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "12.0.1",
"sinon": "13.0.1",
"ts-mocha": "8.0.0",
"typescript": "4.3.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "rimraf build/*",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"compile": "npm run version:update && tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
Expand Down Expand Up @@ -49,7 +48,6 @@
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
"nock": "12.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright [2022] OpenTelemetry Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "rimraf build/*",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
"compile": "npm run version:update && tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
Expand Down Expand Up @@ -51,12 +50,11 @@
"@types/mocha": "8.2.3",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "12.0.1",
"sinon": "13.0.1",
"ts-mocha": "8.0.0",
"typescript": "4.3.5"
},
Expand Down
35 changes: 34 additions & 1 deletion metapackages/auto-instrumentations-node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,38 @@
# Changelog

### Dependencies

* The following workspace dependencies were updated
* dependencies
* @opentelemetry/instrumentation-aws-sdk bumped from ^0.5.0 to ^0.5.1
* @opentelemetry/instrumentation-fastify bumped from ^0.25.0 to ^0.26.0
* @opentelemetry/instrumentation-graphql bumped from ^0.27.3 to ^0.27.4
* @opentelemetry/instrumentation-ioredis bumped from ^0.27.1 to ^0.28.0
* @opentelemetry/instrumentation-mongodb bumped from ^0.28.0 to ^0.29.0
* @opentelemetry/instrumentation-mysql bumped from ^0.27.1 to ^0.28.0
* @opentelemetry/instrumentation-mysql2 bumped from ^0.28.0 to ^0.29.0
* @opentelemetry/instrumentation-redis bumped from ^0.28.0 to ^0.29.0
* @opentelemetry/instrumentation-winston bumped from ^0.27.0 to ^0.27.2

### [0.27.3](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.27.2...auto-instrumentations-node-v0.27.3) (2022-02-06)


### Bug Fixes

* **auto-instrumentations-node:** add more instrumentations ([#865](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/865)) ([6ba387a](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/6ba387ab45d0f67fdfac85c43bb0f0f67f2a119b))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @opentelemetry/instrumentation-aws-lambda bumped from ^0.28.0 to ^0.29.0
* @opentelemetry/instrumentation-express bumped from ^0.27.1 to ^0.28.0
* @opentelemetry/instrumentation-generic-pool bumped from ^0.27.0 to ^0.27.2
* @opentelemetry/instrumentation-graphql bumped from ^0.27.2 to ^0.27.3
* @opentelemetry/instrumentation-nestjs-core bumped from ^0.28.1 to ^0.28.3
* @opentelemetry/instrumentation-restify bumped from ^0.27.0 to ^0.27.2

### [0.27.2](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.27.1...auto-instrumentations-node-v0.27.2) (2022-01-24)


Expand Down Expand Up @@ -92,4 +125,4 @@
* @opentelemetry/instrumentation-mongodb bumped from ^0.25.0 to ^0.26.0
* @opentelemetry/instrumentation-mysql bumped from ^0.25.0 to ^0.26.0
* @opentelemetry/instrumentation-pg bumped from ^0.25.0 to ^0.26.0
* @opentelemetry/instrumentation-redis bumped from ^0.25.0 to ^0.26.0
* @opentelemetry/instrumentation-redis bumped from ^0.25.0 to ^0.26.0
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-node/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright [2022] OpenTelemetry Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
21 changes: 21 additions & 0 deletions metapackages/auto-instrumentations-node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,38 @@ registerInstrumentations({

## Supported instrumentations

- [@opentelemetry/instrumentation-aws-lambda](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda)
- [@opentelemetry/instrumentation-aws-sdk](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-sdk)
- [@opentelemetry/instrumentation-bunyan](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan)
- [@opentelemetry/instrumentation-cassandra-driver](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra)
- [@opentelemetry/instrumentation-connect](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect)
- [@opentelemetry/instrumentation-dns](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns)
- [@opentelemetry/instrumentation-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-http)
- [@opentelemetry/instrumentation-grpc](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-grpc)
- [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express)
- [@opentelemetry/instrumentation-koa](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa)
- [@opentelemetry/instrumentation-fastify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify)
- [@opentelemetry/instrumentation-generic-pool](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool)
- [@opentelemetry/instrumentation-graphql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql)
- [@opentelemetry/instrumentation-grpc](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-grpc)
- [@opentelemetry/instrumentation-hapi](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi)
- [@opentelemetry/instrumentation-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-http)
- [@opentelemetry/instrumentation-ioredis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-ioredis)
- [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)
- [@opentelemetry/instrumentation-pg](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg)
- [@opentelemetry/instrumentation-knex](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex)
- [@opentelemetry/instrumentation-koa](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa)
- [@opentelemetry/instrumentation-memcached](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-memcached)
- [@opentelemetry/instrumentation-mongodb](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb)
- [@opentelemetry/instrumentation-mysql2](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2)
- [@opentelemetry/instrumentation-mysql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql)
- [@opentelemetry/instrumentation-nestjs-core](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core)
- [@opentelemetry/instrumentation-net](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net)
- [@opentelemetry/instrumentation-pg](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg)
- [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino)
- [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)
- [@opentelemetry/instrumentation-restify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify)
- [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston)

## Useful links

Expand Down
Loading

0 comments on commit ec7d744

Please sign in to comment.