Skip to content

Commit

Permalink
Merge branch 'main' into graphql-ignore-resolvers
Browse files Browse the repository at this point in the history
  • Loading branch information
seemk authored Jan 11, 2024
2 parents df773bd + 33b31d0 commit 73e8e6e
Show file tree
Hide file tree
Showing 112 changed files with 1,645 additions and 685 deletions.
269 changes: 269 additions & 0 deletions .github/component-label-map.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
pkg:resource-detector-alibaba-cloud:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-alibaba-cloud/**
- packages/opentelemetry-test-utils/**
pkg:resource-detector-aws:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-aws/**
- packages/opentelemetry-test-utils/**
pkg:resource-detector-azure:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-azure/**
- packages/opentelemetry-test-utils/**
pkg:resource-detector-container:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-container/**
- packages/opentelemetry-test-utils/**
pkg:resource-detector-gcp:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-gcp/**
- packages/opentelemetry-test-utils/**
pkg:resource-detector-github:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-github/**
pkg:resource-detector-instana:
- changed-files:
- any-glob-to-any-file:
- detectors/node/opentelemetry-resource-detector-instana/**
- packages/opentelemetry-test-utils/**
pkg:auto-instrumentations-node:
- changed-files:
- any-glob-to-any-file:
- metapackages/auto-instrumentations-node/**
pkg:auto-instrumentations-web:
- changed-files:
- any-glob-to-any-file:
- metapackages/auto-instrumentations-web/**
pkg:test-utils:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-test-utils/**
pkg:host-metrics:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-host-metrics/**
pkg:id-generator-aws-xray:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-id-generator-aws-xray/**
pkg:instrumentation-amqplib:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-amqplib/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-aws-lambda:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-aws-lambda/**
- propagators/opentelemetry-propagator-aws-xray/**
pkg:instrumentation-aws-sdk:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-aws-sdk/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-propagation-utils/**
pkg:instrumentation-bunyan:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-bunyan/**
pkg:instrumentation-cassandra:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-cassandra/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-connect:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-connect/**
pkg:instrumentation-cucumber:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-cucumber/**
pkg:instrumentation-dataloader:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-dataloader/**
pkg:instrumentation-dns:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-dns/**
pkg:instrumentation-document-load:
- changed-files:
- any-glob-to-any-file:
- plugins/web/opentelemetry-instrumentation-document-load/**
pkg:instrumentation-express:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-express/**
pkg:instrumentation-fastify:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-fastify/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-fs:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-fs/**
pkg:instrumentation-generic-pool:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-generic-pool/**
pkg:instrumentation-graphql:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-graphql/**
pkg:instrumentation-hapi:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-hapi/**
pkg:instrumentation-ioredis:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-ioredis/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-redis-common/**
pkg:instrumentation-knex:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-knex/**
pkg:instrumentation-koa:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-koa/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-long-task:
- changed-files:
- any-glob-to-any-file:
- plugins/web/opentelemetry-instrumentation-long-task/**
pkg:instrumentation-lru-memoizer:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-lru-memoizer/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-memcached:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-memcached/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-mongodb:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-mongodb/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-mongoose:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-mongoose/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-mysql:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-mysql/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-mysql2:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-mysql2/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-sql-common/**
pkg:instrumentation-nestjs-core:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-nestjs-core/**
pkg:instrumentation-net:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-net/**
pkg:instrumentation-pg:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-pg/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-sql-common/**
pkg:instrumentation-pino:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-pino/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-redis:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-redis/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-redis-common/**
pkg:instrumentation-redis-4:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-redis-4/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-redis-common/**
pkg:instrumentation-restify:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-restify/**
pkg:instrumentation-router:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-router/**
pkg:instrumentation-socket.io:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-socket.io/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-tedious:
- changed-files:
- any-glob-to-any-file:
- plugins/node/instrumentation-tedious/**
- packages/opentelemetry-test-utils/**
pkg:instrumentation-user-interaction:
- changed-files:
- any-glob-to-any-file:
- plugins/web/opentelemetry-instrumentation-user-interaction/**
pkg:instrumentation-winston:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-winston/**
pkg:plugin-react-load:
- changed-files:
- any-glob-to-any-file:
- plugins/web/opentelemetry-plugin-react-load/**
pkg:propagation-utils:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-propagation-utils/**
- packages/opentelemetry-test-utils/**
pkg:propagator-aws-xray:
- changed-files:
- any-glob-to-any-file:
- propagators/opentelemetry-propagator-aws-xray/**
pkg:propagator-grpc-census-binary:
- changed-files:
- any-glob-to-any-file:
- propagators/opentelemetry-propagator-grpc-census-binary/**
pkg:propagator-instana:
- changed-files:
- any-glob-to-any-file:
- propagators/opentelemetry-propagator-instana/**
pkg:propagator-ot-trace:
- changed-files:
- any-glob-to-any-file:
- propagators/opentelemetry-propagator-ot-trace/**
pkg:redis-common:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-redis-common/**
pkg:sampler-aws-xray:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-sampler-aws-xray/**
- packages/opentelemetry-test-utils/**
pkg:sql-common:
- changed-files:
- any-glob-to-any-file:
- packages/opentelemetry-sql-common/**
16 changes: 16 additions & 0 deletions .github/workflows/label-prs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Label PR"
on:
- pull_request_target

jobs:
labeler:
name: 'Add component labels'
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/labeler@v5
with:
configuration-path: '.github/component-label-map.yml'
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.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.2","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.2","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.34.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.2.0","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.34.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.5","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.3","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.4","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.4","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.5","detectors/node/opentelemetry-resource-detector-aws":"1.3.5","detectors/node/opentelemetry-resource-detector-azure":"0.2.3","detectors/node/opentelemetry-resource-detector-container":"0.3.5","detectors/node/opentelemetry-resource-detector-gcp":"0.29.5","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.5","metapackages/auto-instrumentations-node":"0.40.3","metapackages/auto-instrumentations-web":"0.35.0","packages/opentelemetry-host-metrics":"0.34.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.5","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.1","plugins/node/instrumentation-amqplib":"0.33.5","plugins/node/instrumentation-cucumber":"0.2.1","plugins/node/instrumentation-dataloader":"0.5.4","plugins/node/instrumentation-fs":"0.8.4","plugins/node/instrumentation-lru-memoizer":"0.33.5","plugins/node/instrumentation-mongoose":"0.34.0","plugins/node/instrumentation-socket.io":"0.35.0","plugins/node/instrumentation-tedious":"0.6.5","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.4","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.2","plugins/node/opentelemetry-instrumentation-connect":"0.32.4","plugins/node/opentelemetry-instrumentation-dns":"0.32.5","plugins/node/opentelemetry-instrumentation-express":"0.34.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.6","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.5","plugins/node/opentelemetry-instrumentation-graphql":"0.36.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.3","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.4","plugins/node/opentelemetry-instrumentation-koa":"0.36.4","plugins/node/opentelemetry-instrumentation-memcached":"0.32.5","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.5","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.5","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.4","plugins/node/opentelemetry-instrumentation-net":"0.32.5","plugins/node/opentelemetry-instrumentation-pg":"0.37.2","plugins/node/opentelemetry-instrumentation-pino":"0.34.5","plugins/node/opentelemetry-instrumentation-redis":"0.35.5","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.6","plugins/node/opentelemetry-instrumentation-restify":"0.34.3","plugins/node/opentelemetry-instrumentation-router":"0.33.4","plugins/node/opentelemetry-instrumentation-winston":"0.33.1","plugins/web/opentelemetry-instrumentation-document-load":"0.34.1","plugins/web/opentelemetry-instrumentation-long-task":"0.34.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.1","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0

### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1

## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-alibaba-cloud",
"version": "0.28.4",
"version": "0.28.5",
"description": "OpenTelemetry resource detector for Alibaba Cloud",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -40,7 +40,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.35.0",
"@opentelemetry/contrib-test-utils": "^0.35.1",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0

### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1

## [1.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.3.0...resource-detector-aws-v1.3.1) (2023-08-14)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-aws",
"version": "1.3.4",
"version": "1.3.5",
"description": "OpenTelemetry SDK resource detector for AWS",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.35.0",
"@opentelemetry/contrib-test-utils": "^0.35.1",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/sinon": "10.0.18",
Expand Down
14 changes: 14 additions & 0 deletions detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [0.2.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.2...resource-detector-azure-v0.2.3) (2024-01-04)


### Bug Fixes

* Fix Azure Fns Detector When Running with App Service Detector ([#1884](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1884)) ([006c963](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/006c963721b2040416e312d7e469fdd9755410d7))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.35.0 to ^0.35.1

## [0.2.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.1...resource-detector-azure-v0.2.2) (2023-12-07)


Expand Down
Loading

0 comments on commit 73e8e6e

Please sign in to comment.