diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml index 66e0743da3..1cf350f8ec 100644 --- a/.github/component-label-map.yml +++ b/.github/component-label-map.yml @@ -1,258 +1,258 @@ pkg:resource-detector-alibaba-cloud: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-alibaba-cloud/** - - packages/opentelemetry-test-utils/** + - packages/resource-detector-alibaba-cloud/** + - packages/contrib-test-utils/** pkg:resource-detector-aws: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-aws/** - - packages/opentelemetry-test-utils/** + - packages/resource-detector-aws/** + - packages/contrib-test-utils/** pkg:resource-detector-azure: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-azure/** - - packages/opentelemetry-test-utils/** + - packages/resource-detector-azure/** + - packages/contrib-test-utils/** pkg:resource-detector-container: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-container/** - - packages/opentelemetry-test-utils/** + - packages/resource-detector-container/** + - packages/contrib-test-utils/** pkg:resource-detector-gcp: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-gcp/** - - packages/opentelemetry-test-utils/** + - packages/resource-detector-gcp/** + - packages/contrib-test-utils/** pkg:resource-detector-github: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-github/** + - packages/resource-detector-github/** pkg:resource-detector-instana: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-instana/** - - packages/opentelemetry-test-utils/** + - packages/resource-detector-instana/** + - packages/contrib-test-utils/** pkg:auto-configuration-propagators: - changed-files: - any-glob-to-any-file: - - metapackages/auto-configuration-propagators/** + - packages/auto-configuration-propagators/** pkg:auto-instrumentations-node: - changed-files: - any-glob-to-any-file: - - metapackages/auto-instrumentations-node/** + - packages/auto-instrumentations-node/** pkg:auto-instrumentations-web: - changed-files: - any-glob-to-any-file: - - metapackages/auto-instrumentations-web/** + - packages/auto-instrumentations-web/** pkg:test-utils: - changed-files: - any-glob-to-any-file: - - packages/opentelemetry-test-utils/** + - packages/contrib-test-utils/** pkg:host-metrics: - changed-files: - any-glob-to-any-file: - - packages/opentelemetry-host-metrics/** + - packages/host-metrics/** pkg:id-generator-aws-xray: - changed-files: - any-glob-to-any-file: - - packages/opentelemetry-id-generator-aws-xray/** + - packages/id-generator-aws-xray/** pkg:instrumentation-amqplib: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-amqplib/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-amqplib/** + - packages/contrib-test-utils/** pkg:instrumentation-aws-lambda: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-aws-lambda/** + - packages/instrumentation-aws-lambda/** 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/** + - packages/instrumentation-aws-sdk/** + - packages/contrib-test-utils/** + - packages/propagation-utils/** pkg:instrumentation-bunyan: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-bunyan/** + - packages/instrumentation-bunyan/** pkg:instrumentation-cassandra-driver: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-cassandra/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-cassandra-driver/** + - packages/contrib-test-utils/** pkg:instrumentation-connect: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-connect/** + - packages/instrumentation-connect/** pkg:instrumentation-cucumber: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-cucumber/** + - packages/instrumentation-cucumber/** pkg:instrumentation-dataloader: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-dataloader/** + - packages/instrumentation-dataloader/** pkg:instrumentation-dns: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-dns/** + - packages/instrumentation-dns/** pkg:instrumentation-document-load: - changed-files: - any-glob-to-any-file: - - plugins/web/opentelemetry-instrumentation-document-load/** + - packages/instrumentation-document-load/** pkg:instrumentation-express: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-express/** + - packages/instrumentation-express/** pkg:instrumentation-fastify: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-fastify/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-fastify/** + - packages/contrib-test-utils/** pkg:instrumentation-fs: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-fs/** + - packages/instrumentation-fs/** pkg:instrumentation-generic-pool: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-generic-pool/** + - packages/instrumentation-generic-pool/** pkg:instrumentation-graphql: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-graphql/** + - packages/instrumentation-graphql/** pkg:instrumentation-hapi: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-hapi/** + - packages/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/** + - packages/instrumentation-ioredis/** + - packages/contrib-test-utils/** + - packages/redis-common/** pkg:instrumentation-kafkajs: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-kafkajs/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-kafkajs/** + - packages/contrib-test-utils/** pkg:instrumentation-knex: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-knex/** + - packages/instrumentation-knex/** pkg:instrumentation-koa: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-koa/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-koa/** + - packages/contrib-test-utils/** pkg:instrumentation-long-task: - changed-files: - any-glob-to-any-file: - - plugins/web/opentelemetry-instrumentation-long-task/** + - packages/instrumentation-long-task/** pkg:instrumentation-lru-memoizer: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-lru-memoizer/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-lru-memoizer/** + - packages/contrib-test-utils/** pkg:instrumentation-memcached: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-memcached/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-memcached/** + - packages/contrib-test-utils/** pkg:instrumentation-mongodb: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-mongodb/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-mongodb/** + - packages/contrib-test-utils/** pkg:instrumentation-mongoose: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-mongoose/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-mongoose/** + - packages/contrib-test-utils/** pkg:instrumentation-mysql: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-mysql/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-mysql/** + - packages/contrib-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/** + - packages/instrumentation-mysql2/** + - packages/contrib-test-utils/** + - packages/sql-common/** pkg:instrumentation-nestjs-core: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-nestjs-core/** + - packages/instrumentation-nestjs-core/** pkg:instrumentation-net: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-net/** + - packages/instrumentation-net/** pkg:instrumentation-oracledb: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-oracledb/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-oracledb/** + - packages/contrib-test-utils/** pkg:instrumentation-pg: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-pg/** - - packages/opentelemetry-test-utils/** - - packages/opentelemetry-sql-common/** + - packages/instrumentation-pg/** + - packages/contrib-test-utils/** + - packages/sql-common/** pkg:instrumentation-pino: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-pino/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-pino/** + - packages/contrib-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/** + - packages/instrumentation-redis/** + - packages/contrib-test-utils/** + - packages/redis-common/** pkg:instrumentation-restify: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-restify/** + - packages/instrumentation-restify/** pkg:instrumentation-router: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-router/** + - packages/instrumentation-router/** pkg:instrumentation-runtime-node: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-runtime-node/** + - packages/instrumentation-runtime-node/** pkg:instrumentation-socket.io: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-socket.io/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-socket.io/** + - packages/contrib-test-utils/** pkg:instrumentation-tedious: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-tedious/** - - packages/opentelemetry-test-utils/** + - packages/instrumentation-tedious/** + - packages/contrib-test-utils/** pkg:instrumentation-undici: - changed-files: - any-glob-to-any-file: - - plugins/node/instrumentation-undici/** + - packages/instrumentation-undici/** pkg:instrumentation-user-interaction: - changed-files: - any-glob-to-any-file: - - plugins/web/opentelemetry-instrumentation-user-interaction/** + - packages/instrumentation-user-interaction/** pkg:instrumentation-winston: - changed-files: - any-glob-to-any-file: - - plugins/node/opentelemetry-instrumentation-winston/** + - packages/instrumentation-winston/** pkg:plugin-react-load: - changed-files: - any-glob-to-any-file: - - plugins/web/opentelemetry-plugin-react-load/** + - packages/plugin-react-load/** pkg:propagation-utils: - changed-files: - any-glob-to-any-file: - - packages/opentelemetry-propagation-utils/** - - packages/opentelemetry-test-utils/** + - packages/propagation-utils/** + - packages/contrib-test-utils/** pkg:propagator-grpc-census-binary: - changed-files: - any-glob-to-any-file: @@ -260,50 +260,50 @@ pkg:propagator-grpc-census-binary: pkg:propagator-instana: - changed-files: - any-glob-to-any-file: - - propagators/opentelemetry-propagator-instana/** + - packages/propagator-instana/** pkg:propagator-ot-trace: - changed-files: - any-glob-to-any-file: - - propagators/opentelemetry-propagator-ot-trace/** + - packages/propagator-ot-trace/** pkg:redis-common: - changed-files: - any-glob-to-any-file: - - packages/opentelemetry-redis-common/** + - packages/redis-common/** pkg:sampler-aws-xray: - changed-files: - any-glob-to-any-file: - packages/opentelemetry-sampler-aws-xray/** - - packages/opentelemetry-test-utils/** + - packages/contrib-test-utils/** pkg:sql-common: - changed-files: - any-glob-to-any-file: - - packages/opentelemetry-sql-common/** + - packages/sql-common/** pkg:propagator-aws-xray: - changed-files: - any-glob-to-any-file: - - propagators/propagator-aws-xray/** + - packages/propagator-aws-xray/** pkg:propagator-aws-xray-lambda: - changed-files: - any-glob-to-any-file: - - propagators/propagator-aws-xray-lambda/** + - packages/propagator-aws-xray-lambda/** pkg-status:unmaintained: - changed-files: - any-glob-to-any-file: - - detectors/node/opentelemetry-resource-detector-github/** - - packages/opentelemetry-redis-common/** - - plugins/node/instrumentation-fs/** - - plugins/node/instrumentation-tedious/** - - plugins/node/opentelemetry-instrumentation-connect/** - - plugins/node/opentelemetry-instrumentation-dns/** - - plugins/node/opentelemetry-instrumentation-fastify/** - - plugins/node/opentelemetry-instrumentation-generic-pool/** - - plugins/node/opentelemetry-instrumentation-hapi/** - - plugins/node/opentelemetry-instrumentation-knex/** - - plugins/node/opentelemetry-instrumentation-koa/** - - plugins/node/opentelemetry-instrumentation-memcached/** - - plugins/node/opentelemetry-instrumentation-mysql/** - - plugins/node/opentelemetry-instrumentation-nestjs-core/** - - plugins/node/opentelemetry-instrumentation-restify/** - - plugins/node/opentelemetry-instrumentation-router/** - - propagators/opentelemetry-propagator-ot-trace/** - - propagators/propagator-aws-xray-lambda/** + - packages/resource-detector-github/** + - packages/redis-common/** + - packages/instrumentation-fs/** + - packages/instrumentation-tedious/** + - packages/instrumentation-connect/** + - packages/instrumentation-dns/** + - packages/instrumentation-fastify/** + - packages/instrumentation-generic-pool/** + - packages/instrumentation-hapi/** + - packages/instrumentation-knex/** + - packages/instrumentation-koa/** + - packages/instrumentation-memcached/** + - packages/instrumentation-mysql/** + - packages/instrumentation-nestjs-core/** + - packages/instrumentation-restify/** + - packages/instrumentation-router/** + - packages/propagator-ot-trace/** + - packages/propagator-aws-xray-lambda/** diff --git a/.github/component_owners.yml b/.github/component_owners.yml index 24dfd4ff9b..802de7ccb6 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -1,32 +1,32 @@ # Keep all in alphabetical order components: - detectors/node/opentelemetry-resource-detector-alibaba-cloud: + packages/resource-detector-alibaba-cloud: - legendecas - detectors/node/opentelemetry-resource-detector-aws: + packages/resource-detector-aws: - jj22ee - detectors/node/opentelemetry-resource-detector-azure: + packages/resource-detector-azure: - jacksonweber - hectorhdzg - detectors/node/opentelemetry-resource-detector-container: + packages/resource-detector-container: - abhee11 - detectors/node/opentelemetry-resource-detector-gcp: + packages/resource-detector-gcp: - aabmass - punya - detectors/node/opentelemetry-resource-detector-github: [] + packages/resource-detector-github: [] # Unmaintained - detectors/node/opentelemetry-resource-detector-instana: + packages/resource-detector-instana: - kirrg001 incubator/opentelemetry-sampler-aws-xray: - jj22ee - yiyuan-he - metapackages/auto-configuration-propagators: + packages/auto-configuration-propagators: - pichlermarc - metapackages/auto-instrumentations-node: + packages/auto-instrumentations-node: - dyladan - pichlermarc - legendecas - blumamir - metapackages/auto-instrumentations-web: + packages/auto-instrumentations-web: - dyladan - pichlermarc - legendecas @@ -36,130 +36,130 @@ components: packages/baggage-span-processor: - mikegoldsmith - jamiedanielson - packages/opentelemetry-host-metrics: + packages/host-metrics: - legendecas - packages/opentelemetry-id-generator-aws-xray: + packages/id-generator-aws-xray: - jj22ee - packages/opentelemetry-propagation-utils: + packages/propagation-utils: - dyladan - pichlermarc - legendecas - blumamir - packages/opentelemetry-redis-common: [] + packages/redis-common: [] # Unmaintained - packages/opentelemetry-test-utils: + packages/contrib-test-utils: - dyladan - pichlermarc - legendecas - blumamir packages/winston-transport: - hectorhdzg - plugins/node/instrumentation-amqplib: + packages/instrumentation-amqplib: - blumamir - plugins/node/instrumentation-cucumber: + packages/instrumentation-cucumber: - Ugzuzg - plugins/node/instrumentation-dataloader: + packages/instrumentation-dataloader: - henrinormak - plugins/node/instrumentation-fs: [] + packages/instrumentation-fs: [] # Unmaintained - plugins/node/instrumentation-kafkajs: + packages/instrumentation-kafkajs: - seemk - plugins/node/instrumentation-lru-memoizer: + packages/instrumentation-lru-memoizer: - blumamir - plugins/node/instrumentation-mongoose: + packages/instrumentation-mongoose: - blumamir - plugins/node/instrumentation-socket.io: + packages/instrumentation-socket.io: - mottibec - plugins/node/instrumentation-tedious: [] + packages/instrumentation-tedious: [] # Unmaintained - plugins/node/instrumentation-typeorm: + packages/instrumentation-typeorm: - seemk - weyert - t2t2 - mhennoch - plugins/node/opentelemetry-instrumentation-aws-lambda: + packages/instrumentation-aws-lambda: - jj22ee - plugins/node/opentelemetry-instrumentation-aws-sdk: + packages/instrumentation-aws-sdk: - blumamir - jj22ee - trivikr - plugins/node/opentelemetry-instrumentation-bunyan: + packages/instrumentation-bunyan: - seemk - trentm - plugins/node/opentelemetry-instrumentation-cassandra: + packages/instrumentation-cassandra-driver: - seemk - plugins/node/opentelemetry-instrumentation-connect: [] + packages/instrumentation-connect: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-dns: [] + packages/instrumentation-dns: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-express: + packages/instrumentation-express: - JamieDanielson - pkanal - raphael-theriault-swi - plugins/node/opentelemetry-instrumentation-fastify: [] + packages/instrumentation-fastify: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-generic-pool: [] + packages/instrumentation-generic-pool: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-graphql: + packages/instrumentation-graphql: - obecny - plugins/node/opentelemetry-instrumentation-hapi: [] + packages/instrumentation-hapi: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-ioredis: + packages/instrumentation-ioredis: - blumamir - naseemkullah - plugins/node/opentelemetry-instrumentation-knex: [] + packages/instrumentation-knex: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-koa: [] + packages/instrumentation-koa: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-memcached: [] + packages/instrumentation-memcached: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-mongodb: + packages/instrumentation-mongodb: - onurtemizkan - plugins/node/opentelemetry-instrumentation-mysql: [] + packages/instrumentation-mysql: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-mysql2: + packages/instrumentation-mysql2: - raphael-theriault-swi - plugins/node/opentelemetry-instrumentation-nestjs-core: [] + packages/instrumentation-nestjs-core: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-net: + packages/instrumentation-net: - seemk - plugins/node/opentelemetry-instrumentation-oracledb: + packages/instrumentation-oracledb: - sudarshan12s - sharadraju - plugins/node/instrumentation-runtime-node: + packages/instrumentation-runtime-node: - d4nyll - plugins/node/opentelemetry-instrumentation-pg: + packages/instrumentation-pg: - maryliag - plugins/node/opentelemetry-instrumentation-pino: + packages/instrumentation-pino: - seemk - plugins/node/opentelemetry-instrumentation-redis: + packages/instrumentation-redis: - blumamir - plugins/node/opentelemetry-instrumentation-restify: [] + packages/instrumentation-restify: [] # Unmaintained - plugins/node/opentelemetry-instrumentation-router: [] + packages/instrumentation-router: [] # Unmaintained - plugins/node/instrumentation-undici: + packages/instrumentation-undici: - david-luna - trentm - plugins/node/opentelemetry-instrumentation-winston: + packages/instrumentation-winston: - seemk - plugins/web/opentelemetry-instrumentation-document-load: + packages/instrumentation-document-load: - pkanal - martinkuba - plugins/web/opentelemetry-instrumentation-long-task: + packages/instrumentation-long-task: - mhennoch - t2t2 - plugins/web/opentelemetry-instrumentation-user-interaction: + packages/instrumentation-user-interaction: - obecny - plugins/web/opentelemetry-plugin-react-load: + packages/plugin-react-load: - martinkuba - propagators/opentelemetry-propagator-instana: + packages/propagator-instana: - kirrg001 - propagators/opentelemetry-propagator-ot-trace: [] + packages/propagator-ot-trace: [] # Unmaintained - propagators/propagator-aws-xray: + packages/propagator-aws-xray: - jj22ee - propagators/propagator-aws-xray-lambda: [ ] + packages/propagator-aws-xray-lambda: [ ] # Unmaintained ignored-authors: diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 4410544f47..98f41c1418 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,68 +1,68 @@ { - "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.2", - "detectors/node/opentelemetry-resource-detector-aws": "2.2.0", - "detectors/node/opentelemetry-resource-detector-azure": "0.9.0", - "detectors/node/opentelemetry-resource-detector-container": "0.7.2", - "detectors/node/opentelemetry-resource-detector-gcp": "0.36.0", - "detectors/node/opentelemetry-resource-detector-github": "0.31.0", - "detectors/node/opentelemetry-resource-detector-instana": "0.21.0", - "metapackages/auto-configuration-propagators": "0.4.1", - "metapackages/auto-instrumentations-node": "0.61.0", - "metapackages/auto-instrumentations-web": "0.48.1", + "packages/resource-detector-alibaba-cloud": "0.31.2", + "packages/resource-detector-aws": "2.2.0", + "packages/resource-detector-azure": "0.9.0", + "packages/resource-detector-container": "0.7.2", + "packages/resource-detector-gcp": "0.36.0", + "packages/resource-detector-github": "0.31.0", + "packages/resource-detector-instana": "0.21.0", + "packages/auto-configuration-propagators": "0.4.1", + "packages/auto-instrumentations-node": "0.61.0", + "packages/auto-instrumentations-web": "0.48.1", "packages/baggage-span-processor": "0.4.0", "packages/baggage-log-record-processor": "0.3.0", - "packages/opentelemetry-host-metrics": "0.36.0", - "packages/opentelemetry-id-generator-aws-xray": "2.0.0", - "packages/opentelemetry-propagation-utils": "0.31.2", - "packages/opentelemetry-redis-common": "0.38.0", - "packages/opentelemetry-sql-common": "0.41.0", - "packages/opentelemetry-test-utils": "0.48.0", + "packages/host-metrics": "0.36.0", + "packages/id-generator-aws-xray": "2.0.0", + "packages/propagation-utils": "0.31.2", + "packages/redis-common": "0.38.0", + "packages/sql-common": "0.41.0", + "packages/contrib-test-utils": "0.48.0", "packages/winston-transport": "0.13.0", - "plugins/node/instrumentation-amqplib": "0.49.0", - "plugins/node/instrumentation-cucumber": "0.17.1", - "plugins/node/instrumentation-dataloader": "0.20.0", - "plugins/node/instrumentation-fs": "0.22.0", - "plugins/node/instrumentation-kafkajs": "0.11.0", - "plugins/node/instrumentation-lru-memoizer": "0.47.0", - "plugins/node/instrumentation-mongoose": "0.49.0", - "plugins/node/instrumentation-runtime-node": "0.16.0", - "plugins/node/instrumentation-socket.io": "0.49.0", - "plugins/node/instrumentation-tedious": "0.21.1", - "plugins/node/instrumentation-typeorm": "0.3.0", - "plugins/node/instrumentation-undici": "0.13.2", - "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.53.1", - "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.55.0", - "plugins/node/opentelemetry-instrumentation-bunyan": "0.48.0", - "plugins/node/opentelemetry-instrumentation-cassandra": "0.48.0", - "plugins/node/opentelemetry-instrumentation-connect": "0.46.0", - "plugins/node/opentelemetry-instrumentation-dns": "0.46.0", - "plugins/node/opentelemetry-instrumentation-express": "0.51.1", - "plugins/node/opentelemetry-instrumentation-fastify": "0.47.1", - "plugins/node/opentelemetry-instrumentation-generic-pool": "0.46.1", - "plugins/node/opentelemetry-instrumentation-graphql": "0.50.0", - "plugins/node/opentelemetry-instrumentation-hapi": "0.49.0", - "plugins/node/opentelemetry-instrumentation-ioredis": "0.50.1", - "plugins/node/opentelemetry-instrumentation-knex": "0.47.0", - "plugins/node/opentelemetry-instrumentation-koa": "0.50.2", - "plugins/node/opentelemetry-instrumentation-memcached": "0.46.0", - "plugins/node/opentelemetry-instrumentation-mongodb": "0.55.1", - "plugins/node/opentelemetry-instrumentation-mysql": "0.48.1", - "plugins/node/opentelemetry-instrumentation-mysql2": "0.48.1", - "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.48.1", - "plugins/node/opentelemetry-instrumentation-net": "0.46.1", - "plugins/node/opentelemetry-instrumentation-oracledb": "0.28.0", - "plugins/node/opentelemetry-instrumentation-pg": "0.54.1", - "plugins/node/opentelemetry-instrumentation-pino": "0.49.1", - "plugins/node/opentelemetry-instrumentation-redis": "0.50.0", - "plugins/node/opentelemetry-instrumentation-restify": "0.48.2", - "plugins/node/opentelemetry-instrumentation-router": "0.47.0", - "plugins/node/opentelemetry-instrumentation-winston": "0.47.0", - "plugins/web/opentelemetry-instrumentation-document-load": "0.47.1", - "plugins/web/opentelemetry-instrumentation-long-task": "0.47.0", - "plugins/web/opentelemetry-instrumentation-user-interaction": "0.47.0", - "plugins/web/opentelemetry-plugin-react-load": "0.34.1", - "propagators/opentelemetry-propagator-instana": "0.4.0", - "propagators/opentelemetry-propagator-ot-trace": "0.28.0", - "propagators/propagator-aws-xray": "2.1.0", - "propagators/propagator-aws-xray-lambda": "0.55.0" + "packages/instrumentation-amqplib": "0.49.0", + "packages/instrumentation-cucumber": "0.17.1", + "packages/instrumentation-dataloader": "0.20.0", + "packages/instrumentation-fs": "0.22.0", + "packages/instrumentation-kafkajs": "0.11.0", + "packages/instrumentation-lru-memoizer": "0.47.0", + "packages/instrumentation-mongoose": "0.49.0", + "packages/instrumentation-runtime-node": "0.16.0", + "packages/instrumentation-socket.io": "0.49.0", + "packages/instrumentation-tedious": "0.21.1", + "packages/instrumentation-typeorm": "0.3.0", + "packages/instrumentation-undici": "0.13.2", + "packages/instrumentation-aws-lambda": "0.53.1", + "packages/instrumentation-aws-sdk": "0.55.0", + "packages/instrumentation-bunyan": "0.48.0", + "packages/instrumentation-cassandra-driver": "0.48.0", + "packages/instrumentation-connect": "0.46.0", + "packages/instrumentation-dns": "0.46.0", + "packages/instrumentation-express": "0.51.1", + "packages/instrumentation-fastify": "0.47.1", + "packages/instrumentation-generic-pool": "0.46.1", + "packages/instrumentation-graphql": "0.50.0", + "packages/instrumentation-hapi": "0.49.0", + "packages/instrumentation-ioredis": "0.50.1", + "packages/instrumentation-knex": "0.47.0", + "packages/instrumentation-koa": "0.50.2", + "packages/instrumentation-memcached": "0.46.0", + "packages/instrumentation-mongodb": "0.55.1", + "packages/instrumentation-mysql": "0.48.1", + "packages/instrumentation-mysql2": "0.48.1", + "packages/instrumentation-nestjs-core": "0.48.1", + "packages/instrumentation-net": "0.46.1", + "packages/instrumentation-oracledb": "0.28.0", + "packages/instrumentation-pg": "0.54.1", + "packages/instrumentation-pino": "0.49.1", + "packages/instrumentation-redis": "0.50.0", + "packages/instrumentation-restify": "0.48.2", + "packages/instrumentation-router": "0.47.0", + "packages/instrumentation-winston": "0.47.0", + "packages/instrumentation-document-load": "0.47.1", + "packages/instrumentation-long-task": "0.47.0", + "packages/instrumentation-user-interaction": "0.47.0", + "packages/plugin-react-load": "0.34.1", + "packages/propagator-instana": "0.4.0", + "packages/propagator-ot-trace": "0.28.0", + "packages/propagator-aws-xray": "2.1.0", + "packages/propagator-aws-xray-lambda": "0.55.0" } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95e527646e..34e7a82b9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -154,11 +154,11 @@ npm run test-services:stop # stops services in Docker If you only want to test a single package (e.g. the `instrumentation-mongodb`) you can `cd` into it and run the tests after you started the services. ```sh -npm run test-services:start # starts services in Docker -cd plugins/node/opentelemetry-instrumentation-mongodb # get into the instrumenation folder -RUN_MONGODB_TESTS=1 npm test # run the test with the proper config (check each package) -cd ../../.. # go back to root folder -npm run test-services:stop # stops services in Docker +npm run test-services:start # starts services in Docker +cd packages/instrumentation-mongodb # get into the instrumenation folder +RUN_MONGODB_TESTS=1 npm test # run the test with the proper config (check each package) +cd ../../.. # go back to root folder +npm run test-services:stop # stops services in Docker ``` NOTE: scripts for each package will be added to avoid extra consumption of resources and improve the development experience. diff --git a/README.md b/README.md index affe277864..2c6ea8c672 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Getting Started   •   API Documentation +   •   + Contributing

@@ -22,18 +24,6 @@ Beta

-

- - Contributing -   •   - Instrumentations -   •   - Propagators -   •   - Examples - -

- --- # OpenTelemetry JavaScript Contrib @@ -42,10 +32,11 @@ A repository for community-maintained OpenTelemetry JavaScript contributions tha This project includes: -- [Instrumentations & other plugins](./plugins), -- [Metapackages](./metapackages), -- [Context Propagators](./propagators), -- [Resource Detectors](./detectors). +- Instrumentations ("instrumentation-*" in [./packages](./packages)), +- Metapackages ("auto-*" in [./packages](./packages)), +- Context Propagators ("propagator-*" in [./packages](./packages)), +- Resource Detectors ("resource-detector-*" in [./packages](./packages)), +- and more. **Instrumentations**: OpenTelemetry can collect tracing data automatically using instrumentations. Vendors/Users can also create and use their own. Please read the [contributing guidelines on adding new instrumentation](CONTRIBUTING.md#new-instrumentation) before opening any PRs. diff --git a/detectors/node/opentelemetry-resource-detector-gcp/tsconfig.esm.json b/detectors/node/opentelemetry-resource-detector-gcp/tsconfig.esm.json deleted file mode 100644 index 379f547a46..0000000000 --- a/detectors/node/opentelemetry-resource-detector-gcp/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/detectors/node/opentelemetry-resource-detector-github/tsconfig.esm.json b/detectors/node/opentelemetry-resource-detector-github/tsconfig.esm.json deleted file mode 100644 index 379f547a46..0000000000 --- a/detectors/node/opentelemetry-resource-detector-github/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/detectors/node/opentelemetry-resource-detector-instana/.eslintrc.js b/detectors/node/opentelemetry-resource-detector-instana/.eslintrc.js deleted file mode 100644 index 7b832129ab..0000000000 --- a/detectors/node/opentelemetry-resource-detector-instana/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/detectors/node/opentelemetry-resource-detector-instana/tsconfig.esm.json b/detectors/node/opentelemetry-resource-detector-instana/tsconfig.esm.json deleted file mode 100644 index 379f547a46..0000000000 --- a/detectors/node/opentelemetry-resource-detector-instana/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/examples/bunyan/README.md b/examples/bunyan/README.md index 89041f4bb1..1ce804c130 100644 --- a/examples/bunyan/README.md +++ b/examples/bunyan/README.md @@ -100,12 +100,12 @@ as the following: '/Users/trentm/.nvm/versions/node/v18.18.2/bin/node', '-r', './telemetry.js', - '/Users/trentm/src/opentelemetry-js-contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/app.js' + '/Users/trentm/src/opentelemetry-js-contrib/packages/instrumentation-bunyan/examples/app.js' ], 'process.runtime.version': '18.18.2', 'process.runtime.name': 'nodejs', 'process.runtime.description': 'Node.js', - 'process.command': '/Users/trentm/src/opentelemetry-js-contrib/plugins/node/opentelemetry-instrumentation-bunyan/examples/app.js', + 'process.command': '/Users/trentm/src/opentelemetry-js-contrib/packages/instrumentation-bunyan/examples/app.js', 'process.owner': 'trentm' 'host.name': 'amachine.local', 'host.arch': 'amd64', diff --git a/examples/network/package.json b/examples/network/package.json index 28a2d4f9df..999faa8480 100644 --- a/examples/network/package.json +++ b/examples/network/package.json @@ -33,7 +33,7 @@ "@opentelemetry/exporter-jaeger": "^0.25.0", "@opentelemetry/exporter-zipkin": "^0.25.0", "@opentelemetry/instrumentation": "^0.25.0", - "@opentelemetry/instrumentation-net": "file:../../plugins/node/opentelemetry-instrumentation-net", + "@opentelemetry/instrumentation-net": "file:../../packages/instrumentation-net", "@opentelemetry/instrumentation-http": "^0.25.0", "@opentelemetry/instrumentation-dns": "^0.23.0", "@opentelemetry/sdk-trace-node": "^0.25.0", diff --git a/knip.jsonc b/knip.jsonc index 9f04c04017..a427c75b94 100644 --- a/knip.jsonc +++ b/knip.jsonc @@ -2,7 +2,7 @@ { "$schema": "https://unpkg.com/knip@5/schema-jsonc.json", "workspaces": { - "metapackages/auto-instrumentations-node": { + "packages/auto-instrumentations-node": { // Ensure register.ts is considered an entry-point (the `!` is to be // included with the `--production` flag). "entry": "src/register.ts!" diff --git a/package-lock.json b/package-lock.json index a7d1aaed4b..b10cb42bd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,12 +9,7 @@ "version": "0.1.0", "license": "Apache-2.0", "workspaces": [ - "packages/*", - "plugins/node/*", - "plugins/web/*", - "propagators/*", - "detectors/node/*", - "metapackages/*" + "packages/*" ], "devDependencies": { "@typescript-eslint/eslint-plugin": "5.62.0", @@ -40,373 +35,6 @@ "util": "0.12.5" } }, - "detectors/node/opentelemetry-resource-detector-alibaba-cloud": { - "name": "@opentelemetry/resource-detector-alibaba-cloud", - "version": "0.31.2", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nock": "13.3.3", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "detectors/node/opentelemetry-resource-detector-aws": { - "name": "@opentelemetry/resource-detector-aws", - "version": "2.2.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/instrumentation-fs": "^0.22.0", - "@opentelemetry/instrumentation-http": "^0.202.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nock": "13.3.3", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "detectors/node/opentelemetry-resource-detector-azure": { - "name": "@opentelemetry/resource-detector-azure", - "version": "0.9.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/instrumentation-http": "^0.202.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nock": "13.3.3", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "detectors/node/opentelemetry-resource-detector-container": { - "name": "@opentelemetry/resource-detector-container", - "version": "0.7.2", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/instrumentation-fs": "^0.22.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "eslint-plugin-header": "^3.1.1", - "nock": "13.3.3", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "detectors/node/opentelemetry-resource-detector-gcp": { - "name": "@opentelemetry/resource-detector-gcp", - "version": "0.36.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "gcp-metadata": "^6.0.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/instrumentation-http": "^0.202.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/semver": "7.5.8", - "nock": "13.3.3", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "detectors/node/opentelemetry-resource-detector-github": { - "name": "@opentelemetry/resource-detector-github", - "version": "0.31.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/resources": "^2.0.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "detectors/node/opentelemetry-resource-detector-instana": { - "name": "@opentelemetry/resource-detector-instana", - "version": "0.21.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/resources": "^2.0.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-node": "^0.202.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/semver": "7.5.8", - "nock": "13.3.3", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "metapackages/auto-configuration-propagators": { - "name": "@opentelemetry/auto-configuration-propagators", - "version": "0.4.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/propagator-aws-xray": "^2.1.0", - "@opentelemetry/propagator-aws-xray-lambda": "^0.55.0", - "@opentelemetry/propagator-b3": "^2.0.0", - "@opentelemetry/propagator-jaeger": "^2.0.0", - "@opentelemetry/propagator-ot-trace": "^0.28.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.4.1", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.4.1" - } - }, - "metapackages/auto-instrumentations-node": { - "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.61.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/instrumentation-amqplib": "^0.49.0", - "@opentelemetry/instrumentation-aws-lambda": "^0.53.1", - "@opentelemetry/instrumentation-aws-sdk": "^0.55.0", - "@opentelemetry/instrumentation-bunyan": "^0.48.0", - "@opentelemetry/instrumentation-cassandra-driver": "^0.48.0", - "@opentelemetry/instrumentation-connect": "^0.46.0", - "@opentelemetry/instrumentation-cucumber": "^0.17.1", - "@opentelemetry/instrumentation-dataloader": "^0.20.0", - "@opentelemetry/instrumentation-dns": "^0.46.0", - "@opentelemetry/instrumentation-express": "^0.51.1", - "@opentelemetry/instrumentation-fastify": "^0.47.1", - "@opentelemetry/instrumentation-fs": "^0.22.0", - "@opentelemetry/instrumentation-generic-pool": "^0.46.1", - "@opentelemetry/instrumentation-graphql": "^0.50.0", - "@opentelemetry/instrumentation-grpc": "^0.202.0", - "@opentelemetry/instrumentation-hapi": "^0.49.0", - "@opentelemetry/instrumentation-http": "^0.202.0", - "@opentelemetry/instrumentation-ioredis": "^0.50.1", - "@opentelemetry/instrumentation-kafkajs": "^0.11.0", - "@opentelemetry/instrumentation-knex": "^0.47.0", - "@opentelemetry/instrumentation-koa": "^0.50.2", - "@opentelemetry/instrumentation-lru-memoizer": "^0.47.0", - "@opentelemetry/instrumentation-memcached": "^0.46.0", - "@opentelemetry/instrumentation-mongodb": "^0.55.1", - "@opentelemetry/instrumentation-mongoose": "^0.49.0", - "@opentelemetry/instrumentation-mysql": "^0.48.1", - "@opentelemetry/instrumentation-mysql2": "^0.48.1", - "@opentelemetry/instrumentation-nestjs-core": "^0.48.1", - "@opentelemetry/instrumentation-net": "^0.46.1", - "@opentelemetry/instrumentation-oracledb": "^0.28.0", - "@opentelemetry/instrumentation-pg": "^0.54.1", - "@opentelemetry/instrumentation-pino": "^0.49.1", - "@opentelemetry/instrumentation-redis": "^0.50.0", - "@opentelemetry/instrumentation-restify": "^0.48.2", - "@opentelemetry/instrumentation-router": "^0.47.0", - "@opentelemetry/instrumentation-runtime-node": "^0.16.0", - "@opentelemetry/instrumentation-socket.io": "^0.49.0", - "@opentelemetry/instrumentation-tedious": "^0.21.1", - "@opentelemetry/instrumentation-undici": "^0.13.2", - "@opentelemetry/instrumentation-winston": "^0.47.0", - "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.2", - "@opentelemetry/resource-detector-aws": "^2.2.0", - "@opentelemetry/resource-detector-azure": "^0.9.0", - "@opentelemetry/resource-detector-container": "^0.7.2", - "@opentelemetry/resource-detector-gcp": "^0.36.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/sdk-node": "^0.202.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.4.1", - "@opentelemetry/core": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.4.1", - "@opentelemetry/core": "^2.0.0" - } - }, - "metapackages/auto-instrumentations-web": { - "name": "@opentelemetry/auto-instrumentations-web", - "version": "0.48.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/instrumentation-document-load": "^0.47.1", - "@opentelemetry/instrumentation-fetch": "^0.202.0", - "@opentelemetry/instrumentation-user-interaction": "^0.47.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.202.0" - }, - "devDependencies": { - "@babel/core": "7.24.6", - "@babel/preset-env": "7.24.6", - "@opentelemetry/api": "^1.3.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "@types/webpack-env": "1.16.3", - "assert": "2.0.0", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "7.0.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.1.2", - "ts-loader": "9.5.2", - "typescript": "5.0.4", - "webpack": "5.94.0", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" - } - }, - "metapackages/auto-instrumentations-web/node_modules/sinon": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", - "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", - "deprecated": "16.1.1", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^10.1.0", - "@sinonjs/samsam": "^8.0.0", - "diff": "^5.1.0", - "nise": "^5.1.4", - "supports-color": "^7.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/sinon" - } - }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -7716,15 +7344,15 @@ } }, "node_modules/@opentelemetry/auto-configuration-propagators": { - "resolved": "metapackages/auto-configuration-propagators", + "resolved": "packages/auto-configuration-propagators", "link": true }, "node_modules/@opentelemetry/auto-instrumentations-node": { - "resolved": "metapackages/auto-instrumentations-node", + "resolved": "packages/auto-instrumentations-node", "link": true }, "node_modules/@opentelemetry/auto-instrumentations-web": { - "resolved": "metapackages/auto-instrumentations-web", + "resolved": "packages/auto-instrumentations-web", "link": true }, "node_modules/@opentelemetry/baggage-log-record-processor": { @@ -7760,7 +7388,7 @@ } }, "node_modules/@opentelemetry/contrib-test-utils": { - "resolved": "packages/opentelemetry-test-utils", + "resolved": "packages/contrib-test-utils", "link": true }, "node_modules/@opentelemetry/core": { @@ -8009,11 +7637,11 @@ } }, "node_modules/@opentelemetry/host-metrics": { - "resolved": "packages/opentelemetry-host-metrics", + "resolved": "packages/host-metrics", "link": true }, "node_modules/@opentelemetry/id-generator-aws-xray": { - "resolved": "packages/opentelemetry-id-generator-aws-xray", + "resolved": "packages/id-generator-aws-xray", "link": true }, "node_modules/@opentelemetry/instrumentation": { @@ -8034,51 +7662,51 @@ } }, "node_modules/@opentelemetry/instrumentation-amqplib": { - "resolved": "plugins/node/instrumentation-amqplib", + "resolved": "packages/instrumentation-amqplib", "link": true }, "node_modules/@opentelemetry/instrumentation-aws-lambda": { - "resolved": "plugins/node/opentelemetry-instrumentation-aws-lambda", + "resolved": "packages/instrumentation-aws-lambda", "link": true }, "node_modules/@opentelemetry/instrumentation-aws-sdk": { - "resolved": "plugins/node/opentelemetry-instrumentation-aws-sdk", + "resolved": "packages/instrumentation-aws-sdk", "link": true }, "node_modules/@opentelemetry/instrumentation-bunyan": { - "resolved": "plugins/node/opentelemetry-instrumentation-bunyan", + "resolved": "packages/instrumentation-bunyan", "link": true }, "node_modules/@opentelemetry/instrumentation-cassandra-driver": { - "resolved": "plugins/node/opentelemetry-instrumentation-cassandra", + "resolved": "packages/instrumentation-cassandra-driver", "link": true }, "node_modules/@opentelemetry/instrumentation-connect": { - "resolved": "plugins/node/opentelemetry-instrumentation-connect", + "resolved": "packages/instrumentation-connect", "link": true }, "node_modules/@opentelemetry/instrumentation-cucumber": { - "resolved": "plugins/node/instrumentation-cucumber", + "resolved": "packages/instrumentation-cucumber", "link": true }, "node_modules/@opentelemetry/instrumentation-dataloader": { - "resolved": "plugins/node/instrumentation-dataloader", + "resolved": "packages/instrumentation-dataloader", "link": true }, "node_modules/@opentelemetry/instrumentation-dns": { - "resolved": "plugins/node/opentelemetry-instrumentation-dns", + "resolved": "packages/instrumentation-dns", "link": true }, "node_modules/@opentelemetry/instrumentation-document-load": { - "resolved": "plugins/web/opentelemetry-instrumentation-document-load", + "resolved": "packages/instrumentation-document-load", "link": true }, "node_modules/@opentelemetry/instrumentation-express": { - "resolved": "plugins/node/opentelemetry-instrumentation-express", + "resolved": "packages/instrumentation-express", "link": true }, "node_modules/@opentelemetry/instrumentation-fastify": { - "resolved": "plugins/node/opentelemetry-instrumentation-fastify", + "resolved": "packages/instrumentation-fastify", "link": true }, "node_modules/@opentelemetry/instrumentation-fetch": { @@ -8100,15 +7728,15 @@ } }, "node_modules/@opentelemetry/instrumentation-fs": { - "resolved": "plugins/node/instrumentation-fs", + "resolved": "packages/instrumentation-fs", "link": true }, "node_modules/@opentelemetry/instrumentation-generic-pool": { - "resolved": "plugins/node/opentelemetry-instrumentation-generic-pool", + "resolved": "packages/instrumentation-generic-pool", "link": true }, "node_modules/@opentelemetry/instrumentation-graphql": { - "resolved": "plugins/node/opentelemetry-instrumentation-graphql", + "resolved": "packages/instrumentation-graphql", "link": true }, "node_modules/@opentelemetry/instrumentation-grpc": { @@ -8128,7 +7756,7 @@ } }, "node_modules/@opentelemetry/instrumentation-hapi": { - "resolved": "plugins/node/opentelemetry-instrumentation-hapi", + "resolved": "packages/instrumentation-hapi", "link": true }, "node_modules/@opentelemetry/instrumentation-http": { @@ -8150,107 +7778,107 @@ } }, "node_modules/@opentelemetry/instrumentation-ioredis": { - "resolved": "plugins/node/opentelemetry-instrumentation-ioredis", + "resolved": "packages/instrumentation-ioredis", "link": true }, "node_modules/@opentelemetry/instrumentation-kafkajs": { - "resolved": "plugins/node/instrumentation-kafkajs", + "resolved": "packages/instrumentation-kafkajs", "link": true }, "node_modules/@opentelemetry/instrumentation-knex": { - "resolved": "plugins/node/opentelemetry-instrumentation-knex", + "resolved": "packages/instrumentation-knex", "link": true }, "node_modules/@opentelemetry/instrumentation-koa": { - "resolved": "plugins/node/opentelemetry-instrumentation-koa", + "resolved": "packages/instrumentation-koa", "link": true }, "node_modules/@opentelemetry/instrumentation-long-task": { - "resolved": "plugins/web/opentelemetry-instrumentation-long-task", + "resolved": "packages/instrumentation-long-task", "link": true }, "node_modules/@opentelemetry/instrumentation-lru-memoizer": { - "resolved": "plugins/node/instrumentation-lru-memoizer", + "resolved": "packages/instrumentation-lru-memoizer", "link": true }, "node_modules/@opentelemetry/instrumentation-memcached": { - "resolved": "plugins/node/opentelemetry-instrumentation-memcached", + "resolved": "packages/instrumentation-memcached", "link": true }, "node_modules/@opentelemetry/instrumentation-mongodb": { - "resolved": "plugins/node/opentelemetry-instrumentation-mongodb", + "resolved": "packages/instrumentation-mongodb", "link": true }, "node_modules/@opentelemetry/instrumentation-mongoose": { - "resolved": "plugins/node/instrumentation-mongoose", + "resolved": "packages/instrumentation-mongoose", "link": true }, "node_modules/@opentelemetry/instrumentation-mysql": { - "resolved": "plugins/node/opentelemetry-instrumentation-mysql", + "resolved": "packages/instrumentation-mysql", "link": true }, "node_modules/@opentelemetry/instrumentation-mysql2": { - "resolved": "plugins/node/opentelemetry-instrumentation-mysql2", + "resolved": "packages/instrumentation-mysql2", "link": true }, "node_modules/@opentelemetry/instrumentation-nestjs-core": { - "resolved": "plugins/node/opentelemetry-instrumentation-nestjs-core", + "resolved": "packages/instrumentation-nestjs-core", "link": true }, "node_modules/@opentelemetry/instrumentation-net": { - "resolved": "plugins/node/opentelemetry-instrumentation-net", + "resolved": "packages/instrumentation-net", "link": true }, "node_modules/@opentelemetry/instrumentation-oracledb": { - "resolved": "plugins/node/opentelemetry-instrumentation-oracledb", + "resolved": "packages/instrumentation-oracledb", "link": true }, "node_modules/@opentelemetry/instrumentation-pg": { - "resolved": "plugins/node/opentelemetry-instrumentation-pg", + "resolved": "packages/instrumentation-pg", "link": true }, "node_modules/@opentelemetry/instrumentation-pino": { - "resolved": "plugins/node/opentelemetry-instrumentation-pino", + "resolved": "packages/instrumentation-pino", "link": true }, "node_modules/@opentelemetry/instrumentation-redis": { - "resolved": "plugins/node/opentelemetry-instrumentation-redis", + "resolved": "packages/instrumentation-redis", "link": true }, "node_modules/@opentelemetry/instrumentation-restify": { - "resolved": "plugins/node/opentelemetry-instrumentation-restify", + "resolved": "packages/instrumentation-restify", "link": true }, "node_modules/@opentelemetry/instrumentation-router": { - "resolved": "plugins/node/opentelemetry-instrumentation-router", + "resolved": "packages/instrumentation-router", "link": true }, "node_modules/@opentelemetry/instrumentation-runtime-node": { - "resolved": "plugins/node/instrumentation-runtime-node", + "resolved": "packages/instrumentation-runtime-node", "link": true }, "node_modules/@opentelemetry/instrumentation-socket.io": { - "resolved": "plugins/node/instrumentation-socket.io", + "resolved": "packages/instrumentation-socket.io", "link": true }, "node_modules/@opentelemetry/instrumentation-tedious": { - "resolved": "plugins/node/instrumentation-tedious", + "resolved": "packages/instrumentation-tedious", "link": true }, "node_modules/@opentelemetry/instrumentation-typeorm": { - "resolved": "plugins/node/instrumentation-typeorm", + "resolved": "packages/instrumentation-typeorm", "link": true }, "node_modules/@opentelemetry/instrumentation-undici": { - "resolved": "plugins/node/instrumentation-undici", + "resolved": "packages/instrumentation-undici", "link": true }, "node_modules/@opentelemetry/instrumentation-user-interaction": { - "resolved": "plugins/web/opentelemetry-instrumentation-user-interaction", + "resolved": "packages/instrumentation-user-interaction", "link": true }, "node_modules/@opentelemetry/instrumentation-winston": { - "resolved": "plugins/node/opentelemetry-instrumentation-winston", + "resolved": "packages/instrumentation-winston", "link": true }, "node_modules/@opentelemetry/instrumentation-xml-http-request": { @@ -8327,19 +7955,19 @@ } }, "node_modules/@opentelemetry/plugin-react-load": { - "resolved": "plugins/web/opentelemetry-plugin-react-load", + "resolved": "packages/plugin-react-load", "link": true }, "node_modules/@opentelemetry/propagation-utils": { - "resolved": "packages/opentelemetry-propagation-utils", + "resolved": "packages/propagation-utils", "link": true }, "node_modules/@opentelemetry/propagator-aws-xray": { - "resolved": "propagators/propagator-aws-xray", + "resolved": "packages/propagator-aws-xray", "link": true }, "node_modules/@opentelemetry/propagator-aws-xray-lambda": { - "resolved": "propagators/propagator-aws-xray-lambda", + "resolved": "packages/propagator-aws-xray-lambda", "link": true }, "node_modules/@opentelemetry/propagator-b3": { @@ -8357,7 +7985,7 @@ } }, "node_modules/@opentelemetry/propagator-instana": { - "resolved": "propagators/opentelemetry-propagator-instana", + "resolved": "packages/propagator-instana", "link": true }, "node_modules/@opentelemetry/propagator-jaeger": { @@ -8375,39 +8003,39 @@ } }, "node_modules/@opentelemetry/propagator-ot-trace": { - "resolved": "propagators/opentelemetry-propagator-ot-trace", + "resolved": "packages/propagator-ot-trace", "link": true }, "node_modules/@opentelemetry/redis-common": { - "resolved": "packages/opentelemetry-redis-common", + "resolved": "packages/redis-common", "link": true }, "node_modules/@opentelemetry/resource-detector-alibaba-cloud": { - "resolved": "detectors/node/opentelemetry-resource-detector-alibaba-cloud", + "resolved": "packages/resource-detector-alibaba-cloud", "link": true }, "node_modules/@opentelemetry/resource-detector-aws": { - "resolved": "detectors/node/opentelemetry-resource-detector-aws", + "resolved": "packages/resource-detector-aws", "link": true }, "node_modules/@opentelemetry/resource-detector-azure": { - "resolved": "detectors/node/opentelemetry-resource-detector-azure", + "resolved": "packages/resource-detector-azure", "link": true }, "node_modules/@opentelemetry/resource-detector-container": { - "resolved": "detectors/node/opentelemetry-resource-detector-container", + "resolved": "packages/resource-detector-container", "link": true }, "node_modules/@opentelemetry/resource-detector-gcp": { - "resolved": "detectors/node/opentelemetry-resource-detector-gcp", + "resolved": "packages/resource-detector-gcp", "link": true }, "node_modules/@opentelemetry/resource-detector-github": { - "resolved": "detectors/node/opentelemetry-resource-detector-github", + "resolved": "packages/resource-detector-github", "link": true }, "node_modules/@opentelemetry/resource-detector-instana": { - "resolved": "detectors/node/opentelemetry-resource-detector-instana", + "resolved": "packages/resource-detector-instana", "link": true }, "node_modules/@opentelemetry/resources": { @@ -8550,7 +8178,7 @@ } }, "node_modules/@opentelemetry/sql-common": { - "resolved": "packages/opentelemetry-sql-common", + "resolved": "packages/sql-common", "link": true }, "node_modules/@opentelemetry/winston-transport": { @@ -31655,6 +31283,172 @@ "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.0.tgz", "integrity": "sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA==" }, + "packages/auto-configuration-propagators": { + "name": "@opentelemetry/auto-configuration-propagators", + "version": "0.4.1", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/propagator-aws-xray": "^2.1.0", + "@opentelemetry/propagator-aws-xray-lambda": "^0.55.0", + "@opentelemetry/propagator-b3": "^2.0.0", + "@opentelemetry/propagator-jaeger": "^2.0.0", + "@opentelemetry/propagator-ot-trace": "^0.28.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.4.1", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.4.1" + } + }, + "packages/auto-instrumentations-node": { + "name": "@opentelemetry/auto-instrumentations-node", + "version": "0.61.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/instrumentation-amqplib": "^0.49.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.53.1", + "@opentelemetry/instrumentation-aws-sdk": "^0.55.0", + "@opentelemetry/instrumentation-bunyan": "^0.48.0", + "@opentelemetry/instrumentation-cassandra-driver": "^0.48.0", + "@opentelemetry/instrumentation-connect": "^0.46.0", + "@opentelemetry/instrumentation-cucumber": "^0.17.1", + "@opentelemetry/instrumentation-dataloader": "^0.20.0", + "@opentelemetry/instrumentation-dns": "^0.46.0", + "@opentelemetry/instrumentation-express": "^0.51.1", + "@opentelemetry/instrumentation-fastify": "^0.47.1", + "@opentelemetry/instrumentation-fs": "^0.22.0", + "@opentelemetry/instrumentation-generic-pool": "^0.46.1", + "@opentelemetry/instrumentation-graphql": "^0.50.0", + "@opentelemetry/instrumentation-grpc": "^0.202.0", + "@opentelemetry/instrumentation-hapi": "^0.49.0", + "@opentelemetry/instrumentation-http": "^0.202.0", + "@opentelemetry/instrumentation-ioredis": "^0.50.1", + "@opentelemetry/instrumentation-kafkajs": "^0.11.0", + "@opentelemetry/instrumentation-knex": "^0.47.0", + "@opentelemetry/instrumentation-koa": "^0.50.2", + "@opentelemetry/instrumentation-lru-memoizer": "^0.47.0", + "@opentelemetry/instrumentation-memcached": "^0.46.0", + "@opentelemetry/instrumentation-mongodb": "^0.55.1", + "@opentelemetry/instrumentation-mongoose": "^0.49.0", + "@opentelemetry/instrumentation-mysql": "^0.48.1", + "@opentelemetry/instrumentation-mysql2": "^0.48.1", + "@opentelemetry/instrumentation-nestjs-core": "^0.48.1", + "@opentelemetry/instrumentation-net": "^0.46.1", + "@opentelemetry/instrumentation-oracledb": "^0.28.0", + "@opentelemetry/instrumentation-pg": "^0.54.1", + "@opentelemetry/instrumentation-pino": "^0.49.1", + "@opentelemetry/instrumentation-redis": "^0.50.0", + "@opentelemetry/instrumentation-restify": "^0.48.2", + "@opentelemetry/instrumentation-router": "^0.47.0", + "@opentelemetry/instrumentation-runtime-node": "^0.16.0", + "@opentelemetry/instrumentation-socket.io": "^0.49.0", + "@opentelemetry/instrumentation-tedious": "^0.21.1", + "@opentelemetry/instrumentation-undici": "^0.13.2", + "@opentelemetry/instrumentation-winston": "^0.47.0", + "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.2", + "@opentelemetry/resource-detector-aws": "^2.2.0", + "@opentelemetry/resource-detector-azure": "^0.9.0", + "@opentelemetry/resource-detector-container": "^0.7.2", + "@opentelemetry/resource-detector-gcp": "^0.36.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/sdk-node": "^0.202.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.4.1", + "@opentelemetry/core": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.4.1", + "@opentelemetry/core": "^2.0.0" + } + }, + "packages/auto-instrumentations-web": { + "name": "@opentelemetry/auto-instrumentations-web", + "version": "0.48.1", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/instrumentation-document-load": "^0.47.1", + "@opentelemetry/instrumentation-fetch": "^0.202.0", + "@opentelemetry/instrumentation-user-interaction": "^0.47.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.202.0" + }, + "devDependencies": { + "@babel/core": "7.24.6", + "@babel/preset-env": "7.24.6", + "@opentelemetry/api": "^1.3.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "@types/webpack-env": "1.16.3", + "assert": "2.0.0", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "7.0.0", + "karma": "6.4.4", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "5.0.1", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.1.2", + "ts-loader": "9.5.2", + "typescript": "5.0.4", + "webpack": "5.94.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0", + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" + } + }, + "packages/auto-instrumentations-web/node_modules/sinon": { + "version": "15.1.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", + "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", + "deprecated": "16.1.1", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^10.1.0", + "@sinonjs/samsam": "^8.0.0", + "diff": "^5.1.0", + "nise": "^5.1.4", + "supports-color": "^7.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, "packages/baggage-log-record-processor": { "name": "@opentelemetry/baggage-log-record-processor", "version": "0.3.0", @@ -31701,7 +31495,34 @@ "@opentelemetry/api": "^1.0.0" } }, - "packages/opentelemetry-host-metrics": { + "packages/contrib-test-utils": { + "name": "@opentelemetry/contrib-test-utils", + "version": "0.48.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/exporter-jaeger": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/sdk-metrics": "^2.0.0", + "@opentelemetry/sdk-node": "^0.202.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@types/node": "18.18.14", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "packages/host-metrics": { "name": "@opentelemetry/host-metrics", "version": "0.36.0", "license": "Apache-2.0", @@ -31726,7 +31547,7 @@ "@opentelemetry/api": "^1.3.0" } }, - "packages/opentelemetry-id-generator-aws-xray": { + "packages/id-generator-aws-xray": { "name": "@opentelemetry/id-generator-aws-xray", "version": "2.0.0", "license": "Apache-2.0", @@ -31766,7 +31587,7 @@ "@opentelemetry/api": "^1.0.0" } }, - "packages/opentelemetry-id-generator-aws-xray/node_modules/sinon": { + "packages/id-generator-aws-xray/node_modules/sinon": { "version": "15.1.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", @@ -31785,81 +31606,134 @@ "url": "https://opencollective.com/sinon" } }, - "packages/opentelemetry-propagation-utils": { - "name": "@opentelemetry/propagation-utils", - "version": "0.31.2", + "packages/instrumentation-amqplib": { + "name": "@opentelemetry/instrumentation-amqplib", + "version": "0.49.0", "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, "devDependencies": { - "@opentelemetry/api": "^1.0.0", + "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", - "@types/mocha": "^10.0.0", + "@types/amqplib": "^0.5.17", + "@types/lodash": "4.14.199", + "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "^17.0.0", + "@types/sinon": "17.0.4", + "amqplib": "0.8.0", "expect": "29.2.0", + "lodash": "4.17.21", "nyc": "17.1.0", "sinon": "15.2.0", + "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { "node": "^18.19.0 || >=20.6.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.0" + "@opentelemetry/api": "^1.3.0" } }, - "packages/opentelemetry-redis-common": { - "name": "@opentelemetry/redis-common", - "version": "0.38.0", + "packages/instrumentation-aws-lambda": { + "name": "@opentelemetry/instrumentation-aws-lambda", + "version": "0.53.1", "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "@types/aws-lambda": "8.10.150" + }, "devDependencies": { - "@types/mocha": "^10.0.0", + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/propagator-aws-xray": "^2.1.0", + "@opentelemetry/propagator-aws-xray-lambda": "^0.55.0", + "@opentelemetry/sdk-metrics": "^2.0.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/mocha": "10.0.10", "@types/node": "18.18.14", "nyc": "17.1.0", + "rimraf": "5.0.10", "typescript": "5.0.4" }, "engines": { "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "packages/opentelemetry-sql-common": { - "name": "@opentelemetry/sql-common", - "version": "0.41.0", + "packages/instrumentation-aws-sdk": { + "name": "@opentelemetry/instrumentation-aws-sdk", + "version": "0.55.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0" + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/propagation-utils": "^0.31.2", + "@opentelemetry/semantic-conventions": "^1.34.0" }, "devDependencies": { - "@opentelemetry/api": "^1.1.0", - "@types/mocha": "^10.0.0", + "@aws-sdk/client-bedrock-runtime": "^3.587.0", + "@aws-sdk/client-dynamodb": "^3.85.0", + "@aws-sdk/client-kinesis": "^3.85.0", + "@aws-sdk/client-lambda": "^3.85.0", + "@aws-sdk/client-s3": "^3.85.0", + "@aws-sdk/client-sns": "^3.85.0", + "@aws-sdk/client-sqs": "^3.85.0", + "@aws-sdk/types": "^3.370.0", + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@smithy/node-http-handler": "2.4.0", + "@types/mocha": "10.0.10", "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "eslint": "8.7.0", + "expect": "29.2.0", + "nock": "13.3.3", "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { "node": "^18.19.0 || >=20.6.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.1.0" + "@opentelemetry/api": "^1.3.0" } }, - "packages/opentelemetry-test-utils": { - "name": "@opentelemetry/contrib-test-utils", + "packages/instrumentation-bunyan": { + "name": "@opentelemetry/instrumentation-bunyan", "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/exporter-jaeger": "^2.0.0", + "@opentelemetry/api-logs": "^0.202.0", "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/sdk-metrics": "^2.0.0", - "@opentelemetry/sdk-node": "^0.202.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "@types/bunyan": "1.8.11" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/sdk-logs": "^0.202.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "@types/mocha": "10.0.10", "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "bunyan": "1.8.15", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { @@ -31869,19 +31743,25 @@ "@opentelemetry/api": "^1.3.0" } }, - "packages/winston-transport": { - "name": "@opentelemetry/winston-transport", - "version": "0.13.0", + "packages/instrumentation-cassandra-driver": { + "name": "@opentelemetry/instrumentation-cassandra-driver", + "version": "0.48.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "^0.202.0", - "winston-transport": "4.*" + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", + "@types/semver": "7.5.8", "@types/sinon": "17.0.4", - "@types/triple-beam": "1.3.5", + "cassandra-driver": "4.6.4", "nyc": "17.1.0", "rimraf": "5.0.10", "sinon": "15.2.0", @@ -31889,31 +31769,31 @@ }, "engines": { "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-amqplib": { - "name": "@opentelemetry/instrumentation-amqplib", - "version": "0.49.0", + "packages/instrumentation-connect": { + "name": "@opentelemetry/instrumentation-connect", + "version": "0.46.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "@opentelemetry/semantic-conventions": "^1.27.0", + "@types/connect": "3.4.38" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@types/amqplib": "^0.5.17", - "@types/lodash": "4.14.199", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "amqplib": "0.8.0", - "expect": "29.2.0", - "lodash": "4.17.21", + "connect": "3.7.0", "nyc": "17.1.0", - "sinon": "15.2.0", - "test-all-versions": "6.1.0", + "rimraf": "5.0.10", "typescript": "5.0.4" }, "engines": { @@ -31923,7 +31803,7 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-cucumber": { + "packages/instrumentation-cucumber": { "name": "@opentelemetry/instrumentation-cucumber", "version": "0.17.1", "license": "Apache-2.0", @@ -31957,7 +31837,7 @@ "@opentelemetry/api": "^1.0.0" } }, - "plugins/node/instrumentation-dataloader": { + "packages/instrumentation-dataloader": { "name": "@opentelemetry/instrumentation-dataloader", "version": "0.20.0", "license": "Apache-2.0", @@ -31984,23 +31864,23 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-fs": { - "name": "@opentelemetry/instrumentation-fs", - "version": "0.22.0", + "packages/instrumentation-dns": { + "name": "@opentelemetry/instrumentation-dns", + "version": "0.46.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/core": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "^17.0.0", + "@types/semver": "7.5.8", + "@types/shimmer": "1.0.3", + "@types/sinon": "17.0.4", "nyc": "17.1.0", "rimraf": "5.0.10", "sinon": "15.2.0", @@ -32013,26 +31893,32 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-kafkajs": { - "name": "@opentelemetry/instrumentation-kafkajs", - "version": "0.11.0", + "packages/instrumentation-document-load": { + "name": "@opentelemetry/instrumentation-document-load", + "version": "0.47.1", "license": "Apache-2.0", "dependencies": { + "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.30.0" + "@opentelemetry/sdk-trace-web": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { + "@babel/core": "7.22.17", + "@jsdevtools/coverage-istanbul-loader": "3.0.5", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", + "@rollup/plugin-commonjs": "^26.0.0", + "@rollup/plugin-node-resolve": "^16.0.0", + "@types/chai": "^4.3.10", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "^17.0.0", - "kafkajs": "^2.2.4", - "nyc": "17.1.0", - "rimraf": "5.0.10", + "@types/sinon": "17.0.4", + "@web/dev-server-esbuild": "^1.0.1", + "@web/dev-server-rollup": "^0.6.1", + "@web/test-runner": "^0.18.0", + "chai": "^4.3.10", "sinon": "15.2.0", - "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { @@ -32042,23 +31928,74 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-lru-memoizer": { - "name": "@opentelemetry/instrumentation-lru-memoizer", - "version": "0.47.0", + "packages/instrumentation-document-load/node_modules/@babel/core": { + "version": "7.22.17", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.17.tgz", + "integrity": "sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.22.15", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.22.17", + "@babel/helpers": "^7.22.15", + "@babel/parser": "^7.22.16", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.22.17", + "@babel/types": "^7.22.17", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "packages/instrumentation-document-load/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "packages/instrumentation-document-load/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "packages/instrumentation-express": { + "name": "@opentelemetry/instrumentation-express", + "version": "0.51.1", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0" + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", - "@types/lru-cache": "7.10.10", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/express": "4.17.23", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "expect": "29.2.0", - "lru-memoizer": "2.1.4", + "@types/sinon": "17.0.4", + "express": "^5.1.0", "nyc": "17.1.0", "rimraf": "5.0.10", + "sinon": "15.2.0", "test-all-versions": "6.1.0", "typescript": "5.0.4" }, @@ -32069,9 +32006,9 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-mongoose": { - "name": "@opentelemetry/instrumentation-mongoose", - "version": "0.49.0", + "packages/instrumentation-fastify": { + "name": "@opentelemetry/instrumentation-fastify", + "version": "0.47.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^2.0.0", @@ -32079,15 +32016,21 @@ "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { + "@fastify/express": "^3.0.0", "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/instrumentation-http": "^0.202.0", "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/express": "4.17.23", "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "expect": "29.2.0", - "mongoose": "6.13.8", + "@types/node": "18.15.3", + "@types/semver": "7.5.8", + "fastify": "4.18.0", "nyc": "17.1.0", "rimraf": "5.0.10", + "semver": "^7.5.4", "test-all-versions": "6.1.0", "typescript": "5.0.4" }, @@ -32098,20 +32041,32 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-runtime-node": { - "name": "@opentelemetry/instrumentation-runtime-node", - "version": "0.16.0", + "packages/instrumentation-fastify/node_modules/@types/node": { + "version": "18.15.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", + "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==", + "dev": true + }, + "packages/instrumentation-fs": { + "name": "@opentelemetry/instrumentation-fs", + "version": "0.22.0", "license": "Apache-2.0", "dependencies": { + "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/sdk-metrics": "^2.0.0", - "@types/mocha": "^10.0.6", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "nyc": "^17.0.0", + "@types/sinon": "^17.0.0", + "nyc": "17.1.0", "rimraf": "5.0.10", + "sinon": "15.2.0", "typescript": "5.0.4" }, "engines": { @@ -32121,26 +32076,26 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io": { - "name": "@opentelemetry/instrumentation-socket.io", - "version": "0.49.0", + "packages/instrumentation-generic-pool": { + "name": "@opentelemetry/instrumentation-generic-pool", + "version": "0.46.1", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "@opentelemetry/instrumentation": "^0.202.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/generic-pool": "^3.1.9", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "expect": "27.4.2", + "@types/semver": "7.5.8", + "generic-pool": "3.8.2", "nyc": "17.1.0", "rimraf": "5.0.10", - "socket.io": "^4.1.3", - "socket.io-client": "^4.1.3", - "test-all-versions": "6.1.0", + "semver": "7.7.2", "typescript": "5.0.4" }, "engines": { @@ -32150,178 +32105,303 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/@jest/types": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", - "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", - "dev": true, + "packages/instrumentation-graphql": { + "name": "@opentelemetry/instrumentation-graphql", + "version": "0.50.0", + "license": "Apache-2.0", "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^16.0.0", - "chalk": "^4.0.0" + "@opentelemetry/instrumentation": "^0.202.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "graphql": "^16.5.0", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/@types/yargs": { - "version": "16.0.9", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", - "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", - "dev": true, + "packages/instrumentation-hapi": { + "name": "@opentelemetry/instrumentation-hapi", + "version": "0.49.0", + "license": "Apache-2.0", "dependencies": { - "@types/yargs-parser": "*" - } - }, - "plugins/node/instrumentation-socket.io/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "plugins/node/instrumentation-socket.io/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@hapi/hapi": "21.3.12", + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "joi": "17.12.2", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" + }, "engines": { - "node": ">=10" + "node": "^18.19.0 || >=20.6.0" }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/diff-sequences": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", - "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", - "dev": true, + "packages/instrumentation-ioredis": { + "name": "@opentelemetry/instrumentation-ioredis", + "version": "0.50.1", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/redis-common": "^0.38.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/ioredis4": "npm:@types/ioredis@4.28.10", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "cross-env": "7.0.3", + "ioredis": "5.2.2", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" + }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/expect": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz", - "integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==", - "dev": true, + "packages/instrumentation-kafkajs": { + "name": "@opentelemetry/instrumentation-kafkajs", + "version": "0.11.0", + "license": "Apache-2.0", "dependencies": { - "@jest/types": "^27.4.2", - "ansi-styles": "^5.0.0", - "jest-get-type": "^27.4.0", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-regex-util": "^27.4.0" + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.30.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "^17.0.0", + "kafkajs": "^2.2.4", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/jest-diff": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", - "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", - "dev": true, + "packages/instrumentation-knex": { + "name": "@opentelemetry/instrumentation-knex", + "version": "0.47.0", + "license": "Apache-2.0", "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^27.5.1", - "jest-get-type": "^27.5.1", - "pretty-format": "^27.5.1" + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.33.1" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "better-sqlite3": "11.0.0", + "knex": "3.1.0", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sqlite3": "5.1.7", + "typescript": "5.0.4" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/jest-get-type": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", - "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", - "dev": true, + "packages/instrumentation-koa": { + "name": "@opentelemetry/instrumentation-koa", + "version": "0.50.2", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@koa/router": "13.1.1", + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/instrumentation-http": "^0.202.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/koa": "2.15.0", + "@types/koa__router": "12.0.4", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "koa": "2.16.1", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "semver": "7.7.2", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" + }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/jest-matcher-utils": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", - "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", - "dev": true, + "packages/instrumentation-long-task": { + "name": "@opentelemetry/instrumentation-long-task", + "version": "0.47.0", + "license": "Apache-2.0", "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^27.5.1", - "jest-get-type": "^27.5.1", - "pretty-format": "^27.5.1" + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0" + }, + "devDependencies": { + "@babel/core": "7.24.6", + "@babel/preset-env": "7.24.6", + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-web": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "@types/webpack-env": "1.16.3", + "assert": "2.0.0", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "7.0.0", + "karma": "6.4.4", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "5.0.1", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.1.2", + "ts-loader": "9.5.2", + "typescript": "5.0.4", + "webpack": "5.94.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0", + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/jest-message-util": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", - "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", + "packages/instrumentation-long-task/node_modules/sinon": { + "version": "15.1.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", + "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", + "deprecated": "16.1.1", "dev": true, "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.5.1", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^27.5.1", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^10.1.0", + "@sinonjs/samsam": "^8.0.0", + "diff": "^5.1.0", + "nise": "^5.1.4", + "supports-color": "^7.2.0" }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" } }, - "plugins/node/instrumentation-socket.io/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, + "packages/instrumentation-lru-memoizer": { + "name": "@opentelemetry/instrumentation-lru-memoizer", + "version": "0.47.0", + "license": "Apache-2.0", "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" + "@opentelemetry/instrumentation": "^0.202.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@types/lru-cache": "7.10.10", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "expect": "29.2.0", + "lru-memoizer": "2.1.4", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-socket.io/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true - }, - "plugins/node/instrumentation-tedious": { - "name": "@opentelemetry/instrumentation-tedious", - "version": "0.21.1", + "packages/instrumentation-memcached": { + "name": "@opentelemetry/instrumentation-memcached", + "version": "0.46.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/tedious": "^4.0.14" + "@types/memcached": "^2.2.6" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", + "cross-env": "7.0.3", + "memcached": "2.2.2", "nyc": "17.1.0", "rimraf": "5.0.10", - "semver": "7.7.2", - "tedious": "17.0.0", - "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { @@ -32331,24 +32411,28 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-typeorm": { - "name": "@opentelemetry/instrumentation-typeorm", - "version": "0.3.0", + "packages/instrumentation-mongodb": { + "name": "@opentelemetry/instrumentation-mongodb", + "version": "0.55.1", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0" + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-metrics": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@types/bson": "4.0.5", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "nyc": "15.1.0", + "mongodb": "6.15.0", + "nyc": "17.1.0", "rimraf": "5.0.10", - "sqlite3": "^5.0.2", - "typeorm": "^0.3.21", + "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { @@ -32358,18 +32442,16 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-typeorm/node_modules/@types/whatwg-url": { + "packages/instrumentation-mongodb/node_modules/@types/whatwg-url": { "version": "11.0.5", "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "@types/webidl-conversions": "*" } }, - "plugins/node/instrumentation-typeorm/node_modules/agent-base": { + "packages/instrumentation-mongodb/node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", @@ -32383,105 +32465,16 @@ "node": ">= 6.0.0" } }, - "plugins/node/instrumentation-typeorm/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/bson": { + "packages/instrumentation-mongodb/node_modules/bson": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==", "dev": true, - "optional": true, - "peer": true, "engines": { "node": ">=16.20.1" } }, - "plugins/node/instrumentation-typeorm/node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "plugins/node/instrumentation-typeorm/node_modules/dedent": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", - "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", - "dev": true, - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" - }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } - } - }, - "plugins/node/instrumentation-typeorm/node_modules/foreground-child": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", - "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/gaxios": { + "packages/instrumentation-mongodb/node_modules/gaxios": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", @@ -32498,7 +32491,7 @@ "node": ">=12" } }, - "plugins/node/instrumentation-typeorm/node_modules/gcp-metadata": { + "packages/instrumentation-mongodb/node_modules/gcp-metadata": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", @@ -32513,7 +32506,7 @@ "node": ">=12" } }, - "plugins/node/instrumentation-typeorm/node_modules/https-proxy-agent": { + "packages/instrumentation-mongodb/node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", @@ -32528,25 +32521,11 @@ "node": ">= 6" } }, - "plugins/node/instrumentation-typeorm/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/mongodb": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.16.0.tgz", - "integrity": "sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==", + "packages/instrumentation-mongodb/node_modules/mongodb": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", + "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "@mongodb-js/saslprep": "^1.1.9", "bson": "^6.10.3", @@ -32588,338 +32567,67 @@ } } }, - "plugins/node/instrumentation-typeorm/node_modules/mongodb-connection-string-url": { + "packages/instrumentation-mongodb/node_modules/mongodb-connection-string-url": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "@types/whatwg-url": "^11.0.2", "whatwg-url": "^14.1.0 || ^13.0.0" } }, - "plugins/node/instrumentation-typeorm/node_modules/nyc": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", - "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", - "dev": true, + "packages/instrumentation-mongoose": { + "name": "@opentelemetry/instrumentation-mongoose", + "version": "0.49.0", + "license": "Apache-2.0", "dependencies": { - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "caching-transform": "^4.0.0", - "convert-source-map": "^1.7.0", - "decamelize": "^1.2.0", - "find-cache-dir": "^3.2.0", - "find-up": "^4.1.0", - "foreground-child": "^2.0.0", - "get-package-type": "^0.1.0", - "glob": "^7.1.6", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-hook": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", - "istanbul-lib-processinfo": "^2.0.2", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.2", - "make-dir": "^3.0.0", - "node-preload": "^0.2.1", - "p-map": "^3.0.0", - "process-on-spawn": "^1.0.0", - "resolve-from": "^5.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "spawn-wrap": "^2.0.0", - "test-exclude": "^6.0.0", - "yargs": "^15.0.2" - }, - "bin": { - "nyc": "bin/nyc.js" + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, - "engines": { - "node": ">=8.9" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/nyc/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "expect": "29.2.0", + "mongoose": "6.13.8", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "test-all-versions": "6.1.0", + "typescript": "5.0.4" }, "engines": { - "node": "*" + "node": "^18.19.0 || >=20.6.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/instrumentation-typeorm/node_modules/nyc/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/nyc/node_modules/yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "dev": true, - "dependencies": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" - }, - "engines": { - "node": ">=8" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "plugins/node/instrumentation-typeorm/node_modules/typeorm": { - "version": "0.3.24", - "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.24.tgz", - "integrity": "sha512-4IrHG7A0tY8l5gEGXfW56VOMfUVWEkWlH/h5wmcyZ+V8oCiLj7iTPp0lEjMEZVrxEkGSdP9ErgTKHKXQApl/oA==", - "dev": true, - "dependencies": { - "@sqltools/formatter": "^1.2.5", - "ansis": "^3.17.0", - "app-root-path": "^3.1.0", - "buffer": "^6.0.3", - "dayjs": "^1.11.13", - "debug": "^4.4.0", - "dedent": "^1.6.0", - "dotenv": "^16.4.7", - "glob": "^10.4.5", - "sha.js": "^2.4.11", - "sql-highlight": "^6.0.0", - "tslib": "^2.8.1", - "uuid": "^11.1.0", - "yargs": "^17.7.2" - }, - "bin": { - "typeorm": "cli.js", - "typeorm-ts-node-commonjs": "cli-ts-node-commonjs.js", - "typeorm-ts-node-esm": "cli-ts-node-esm.js" - }, - "engines": { - "node": ">=16.13.0" - }, - "funding": { - "url": "https://opencollective.com/typeorm" - }, - "peerDependencies": { - "@google-cloud/spanner": "^5.18.0 || ^6.0.0 || ^7.0.0", - "@sap/hana-client": "^2.12.25", - "better-sqlite3": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0", - "hdb-pool": "^0.1.6", - "ioredis": "^5.0.4", - "mongodb": "^5.8.0 || ^6.0.0", - "mssql": "^9.1.1 || ^10.0.1 || ^11.0.1", - "mysql2": "^2.2.5 || ^3.0.1", - "oracledb": "^6.3.0", - "pg": "^8.5.1", - "pg-native": "^3.0.0", - "pg-query-stream": "^4.0.0", - "redis": "^3.1.1 || ^4.0.0", - "reflect-metadata": "^0.1.14 || ^0.2.0", - "sql.js": "^1.4.0", - "sqlite3": "^5.0.3", - "ts-node": "^10.7.0", - "typeorm-aurora-data-api-driver": "^2.0.0 || ^3.0.0" - }, - "peerDependenciesMeta": { - "@google-cloud/spanner": { - "optional": true - }, - "@sap/hana-client": { - "optional": true - }, - "better-sqlite3": { - "optional": true - }, - "hdb-pool": { - "optional": true - }, - "ioredis": { - "optional": true - }, - "mongodb": { - "optional": true - }, - "mssql": { - "optional": true - }, - "mysql2": { - "optional": true - }, - "oracledb": { - "optional": true - }, - "pg": { - "optional": true - }, - "pg-native": { - "optional": true - }, - "pg-query-stream": { - "optional": true - }, - "redis": { - "optional": true - }, - "sql.js": { - "optional": true - }, - "sqlite3": { - "optional": true - }, - "ts-node": { - "optional": true - }, - "typeorm-aurora-data-api-driver": { - "optional": true - } - } - }, - "plugins/node/instrumentation-typeorm/node_modules/uuid": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", - "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", - "dev": true, - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/esm/bin/uuid" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "plugins/node/instrumentation-typeorm/node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true - }, - "plugins/node/instrumentation-typeorm/node_modules/yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "engines": { - "node": ">=6" - } - }, - "plugins/node/instrumentation-undici": { - "name": "@opentelemetry/instrumentation-undici", - "version": "0.13.2", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.7.0", - "@opentelemetry/sdk-metrics": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "semver": "^7.6.0", - "test-all-versions": "6.1.0", - "typescript": "5.0.4", - "undici": "6.21.3" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.7.0" - } - }, - "plugins/node/opentelemetry-instrumentation-aws-lambda": { - "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.53.1", - "license": "Apache-2.0", + "packages/instrumentation-mysql": { + "name": "@opentelemetry/instrumentation-mysql", + "version": "0.48.1", + "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/aws-lambda": "8.10.150" + "@types/mysql": "2.15.27" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/propagator-aws-xray": "^2.1.0", - "@opentelemetry/propagator-aws-xray-lambda": "^0.55.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-metrics": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "mysql": "2.18.1", "nyc": "17.1.0", "rimraf": "5.0.10", + "sinon": "15.2.0", "typescript": "5.0.4" }, "engines": { @@ -32929,38 +32637,27 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-aws-sdk": { - "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.55.0", + "packages/instrumentation-mysql2": { + "name": "@opentelemetry/instrumentation-mysql2", + "version": "0.48.1", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/propagation-utils": "^0.31.2", - "@opentelemetry/semantic-conventions": "^1.34.0" + "@opentelemetry/semantic-conventions": "^1.27.0", + "@opentelemetry/sql-common": "^0.41.0" }, "devDependencies": { - "@aws-sdk/client-bedrock-runtime": "^3.587.0", - "@aws-sdk/client-dynamodb": "^3.85.0", - "@aws-sdk/client-kinesis": "^3.85.0", - "@aws-sdk/client-lambda": "^3.85.0", - "@aws-sdk/client-s3": "^3.85.0", - "@aws-sdk/client-sns": "^3.85.0", - "@aws-sdk/client-sqs": "^3.85.0", - "@aws-sdk/types": "^3.370.0", "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", - "@smithy/node-http-handler": "2.4.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "eslint": "8.7.0", - "expect": "29.2.0", - "nock": "13.3.3", + "@types/semver": "7.5.8", + "mysql2": "3.11.5", "nyc": "17.1.0", "rimraf": "5.0.10", - "sinon": "15.2.0", + "semver": "7.7.2", "test-all-versions": "6.1.0", "typescript": "5.0.4" }, @@ -32971,29 +32668,32 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-bunyan": { - "name": "@opentelemetry/instrumentation-bunyan", - "version": "0.48.0", + "packages/instrumentation-nestjs-core": { + "name": "@opentelemetry/instrumentation-nestjs-core", + "version": "0.48.1", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/api-logs": "^0.202.0", "@opentelemetry/instrumentation": "^0.202.0", - "@types/bunyan": "1.8.11" + "@opentelemetry/semantic-conventions": "^1.30.0" }, "devDependencies": { + "@nestjs/common": "11.0.10", + "@nestjs/core": "11.0.10", + "@nestjs/platform-express": "11.0.10", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/resources": "^2.0.0", - "@opentelemetry/sdk-logs": "^0.202.0", + "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "bunyan": "1.8.15", + "@types/semver": "7.5.8", + "cross-env": "7.0.3", "nyc": "17.1.0", + "reflect-metadata": "0.2.2", "rimraf": "5.0.10", - "sinon": "15.2.0", + "rxjs": "7.8.2", + "rxjs-compat": "6.6.7", + "semver": "7.7.2", "test-all-versions": "6.1.0", "typescript": "5.0.4" }, @@ -33004,9 +32704,9 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-cassandra": { - "name": "@opentelemetry/instrumentation-cassandra-driver", - "version": "0.48.0", + "packages/instrumentation-net": { + "name": "@opentelemetry/instrumentation-net", + "version": "0.46.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.202.0", @@ -33015,14 +32715,11 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/semver": "7.5.8", "@types/sinon": "17.0.4", - "cassandra-driver": "4.6.4", "nyc": "17.1.0", "rimraf": "5.0.10", "sinon": "15.2.0", @@ -33035,55 +32732,31 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-connect": { - "name": "@opentelemetry/instrumentation-connect", - "version": "0.46.0", + "packages/instrumentation-oracledb": { + "name": "@opentelemetry/instrumentation-oracledb", + "version": "0.28.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/connect": "3.4.38" + "@types/oracledb": "6.5.2" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "connect": "3.7.0", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/node/opentelemetry-instrumentation-dns": { - "name": "@opentelemetry/instrumentation-dns", - "version": "0.46.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/semver": "7.5.8", - "@types/shimmer": "1.0.3", "@types/sinon": "17.0.4", + "cross-env": "7.0.3", "nyc": "17.1.0", + "oracledb": "^6.7.0", "rimraf": "5.0.10", + "safe-stable-stringify": "^2.4.1", "sinon": "15.2.0", + "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { @@ -33093,14 +32766,17 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-express": { - "name": "@opentelemetry/instrumentation-express", - "version": "0.51.1", + "packages/instrumentation-pg": { + "name": "@opentelemetry/instrumentation-pg", + "version": "0.54.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "@opentelemetry/semantic-conventions": "^1.27.0", + "@opentelemetry/sql-common": "^0.41.0", + "@types/pg": "8.15.4", + "@types/pg-pool": "2.0.6" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", @@ -33108,13 +32784,15 @@ "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/express": "4.17.23", "@types/mocha": "10.0.10", "@types/node": "18.18.14", "@types/sinon": "17.0.4", - "express": "^5.1.0", + "cross-env": "7.0.3", "nyc": "17.1.0", + "pg": "8.7.1", + "pg-pool": "3.4.1", "rimraf": "5.0.10", + "safe-stable-stringify": "^2.4.1", "sinon": "15.2.0", "test-all-versions": "6.1.0", "typescript": "5.0.4" @@ -33126,67 +32804,31 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-fastify": { - "name": "@opentelemetry/instrumentation-fastify", - "version": "0.47.1", + "packages/instrumentation-pino": { + "name": "@opentelemetry/instrumentation-pino", + "version": "0.49.1", "license": "Apache-2.0", "dependencies": { + "@opentelemetry/api-logs": "^0.202.0", "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@fastify/express": "^3.0.0", - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/instrumentation-http": "^0.202.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/express": "4.17.23", - "@types/mocha": "10.0.10", - "@types/node": "18.15.3", - "@types/semver": "7.5.8", - "fastify": "4.18.0", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "semver": "^7.5.4", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/node/opentelemetry-instrumentation-fastify/node_modules/@types/node": { - "version": "18.15.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", - "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==", - "dev": true - }, - "plugins/node/opentelemetry-instrumentation-generic-pool": { - "name": "@opentelemetry/instrumentation-generic-pool", - "version": "0.46.1", - "license": "Apache-2.0", - "dependencies": { "@opentelemetry/instrumentation": "^0.202.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/generic-pool": "^3.1.9", + "@opentelemetry/semantic-conventions": "^1.27.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", "@types/semver": "7.5.8", - "generic-pool": "3.8.2", + "@types/sinon": "17.0.4", "nyc": "17.1.0", + "pino": "8.3.1", "rimraf": "5.0.10", "semver": "7.7.2", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", "typescript": "5.0.4" }, "engines": { @@ -33196,21 +32838,26 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-graphql": { - "name": "@opentelemetry/instrumentation-graphql", + "packages/instrumentation-redis": { + "name": "@opentelemetry/instrumentation-redis", "version": "0.50.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0" + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/redis-common": "^0.38.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "graphql": "^16.5.0", + "cross-env": "7.0.3", "nyc": "17.1.0", + "redis": "^4.7.1", "rimraf": "5.0.10", "test-all-versions": "6.1.0", "typescript": "5.0.4" @@ -33222,9 +32869,9 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-hapi": { - "name": "@opentelemetry/instrumentation-hapi", - "version": "0.49.0", + "packages/instrumentation-restify": { + "name": "@opentelemetry/instrumentation-restify", + "version": "0.48.2", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^2.0.0", @@ -33232,18 +32879,19 @@ "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { - "@hapi/hapi": "21.3.12", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "joi": "17.12.2", + "@types/restify": "4.3.12", + "@types/semver": "7.5.8", "nyc": "17.1.0", + "restify": "11.1.0", "rimraf": "5.0.10", - "test-all-versions": "6.1.0", + "semver": "7.7.2", + "test-all-versions": "^6.0.0", "typescript": "5.0.4" }, "engines": { @@ -33253,31 +32901,24 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-ioredis": { - "name": "@opentelemetry/instrumentation-ioredis", - "version": "0.50.1", + "packages/instrumentation-router": { + "name": "@opentelemetry/instrumentation-router", + "version": "0.47.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/redis-common": "^0.38.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/ioredis4": "npm:@types/ioredis@4.28.10", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "cross-env": "7.0.3", - "ioredis": "5.2.2", "nyc": "17.1.0", "rimraf": "5.0.10", - "sinon": "15.2.0", - "test-all-versions": "6.1.0", + "router": "1.3.8", "typescript": "5.0.4" }, "engines": { @@ -33287,26 +32928,20 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-knex": { - "name": "@opentelemetry/instrumentation-knex", - "version": "0.47.0", + "packages/instrumentation-runtime-node": { + "name": "@opentelemetry/instrumentation-runtime-node", + "version": "0.16.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.33.1" + "@opentelemetry/instrumentation": "^0.202.0" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", + "@opentelemetry/sdk-metrics": "^2.0.0", + "@types/mocha": "^10.0.6", "@types/node": "18.18.14", - "better-sqlite3": "11.0.0", - "knex": "3.1.0", - "nyc": "17.1.0", + "nyc": "^17.0.0", "rimraf": "5.0.10", - "sqlite3": "5.1.7", "typescript": "5.0.4" }, "engines": { @@ -33316,33 +32951,25 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-koa": { - "name": "@opentelemetry/instrumentation-koa", - "version": "0.50.2", + "packages/instrumentation-socket.io": { + "name": "@opentelemetry/instrumentation-socket.io", + "version": "0.49.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, "devDependencies": { - "@koa/router": "13.1.1", "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/instrumentation-http": "^0.202.0", "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/koa": "2.15.0", - "@types/koa__router": "12.0.4", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "koa": "2.16.1", + "expect": "27.4.2", "nyc": "17.1.0", "rimraf": "5.0.10", - "semver": "7.7.2", - "sinon": "15.2.0", + "socket.io": "^4.1.3", + "socket.io-client": "^4.1.3", "test-all-versions": "6.1.0", "typescript": "5.0.4" }, @@ -33353,57 +32980,177 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-memcached": { - "name": "@opentelemetry/instrumentation-memcached", - "version": "0.46.0", - "license": "Apache-2.0", + "packages/instrumentation-socket.io/node_modules/@jest/types": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", + "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", + "dev": true, "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/memcached": "^2.2.6" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "cross-env": "7.0.3", - "memcached": "2.2.2", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "typescript": "5.0.4" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" }, "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "plugins/node/opentelemetry-instrumentation-mongodb": { - "name": "@opentelemetry/instrumentation-mongodb", - "version": "0.55.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "packages/instrumentation-socket.io/node_modules/@types/yargs": { + "version": "16.0.9", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", + "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "packages/instrumentation-socket.io/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "packages/instrumentation-socket.io/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "packages/instrumentation-socket.io/node_modules/diff-sequences": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", + "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", + "dev": true, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/expect": { + "version": "27.4.2", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz", + "integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==", + "dev": true, + "dependencies": { + "@jest/types": "^27.4.2", + "ansi-styles": "^5.0.0", + "jest-get-type": "^27.4.0", + "jest-matcher-utils": "^27.4.2", + "jest-message-util": "^27.4.2", + "jest-regex-util": "^27.4.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/jest-diff": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", + "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/jest-get-type": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", + "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", + "dev": true, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/jest-matcher-utils": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", + "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/jest-message-util": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", + "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.5.1", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "packages/instrumentation-socket.io/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true + }, + "packages/instrumentation-tedious": { + "name": "@opentelemetry/instrumentation-tedious", + "version": "0.21.1", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/instrumentation": "^0.202.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "@types/tedious": "^4.0.14" }, "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-metrics": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/bson": "4.0.5", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "mongodb": "6.15.0", "nyc": "17.1.0", "rimraf": "5.0.10", + "semver": "7.7.2", + "tedious": "17.0.0", "test-all-versions": "6.1.0", "typescript": "5.0.4" }, @@ -33414,16 +33161,45 @@ "@opentelemetry/api": "^1.3.0" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/@types/whatwg-url": { + "packages/instrumentation-typeorm": { + "name": "@opentelemetry/instrumentation-typeorm", + "version": "0.3.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/instrumentation": "^0.202.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "nyc": "15.1.0", + "rimraf": "5.0.10", + "sqlite3": "^5.0.2", + "typeorm": "^0.3.21", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "packages/instrumentation-typeorm/node_modules/@types/whatwg-url": { "version": "11.0.5", "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@types/webidl-conversions": "*" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/agent-base": { + "packages/instrumentation-typeorm/node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", @@ -33437,16 +33213,105 @@ "node": ">= 6.0.0" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/bson": { + "packages/instrumentation-typeorm/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "packages/instrumentation-typeorm/node_modules/bson": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">=16.20.1" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/gaxios": { + "packages/instrumentation-typeorm/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "packages/instrumentation-typeorm/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "packages/instrumentation-typeorm/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "packages/instrumentation-typeorm/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "packages/instrumentation-typeorm/node_modules/dedent": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz", + "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "packages/instrumentation-typeorm/node_modules/foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "packages/instrumentation-typeorm/node_modules/gaxios": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", @@ -33463,7 +33328,7 @@ "node": ">=12" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/gcp-metadata": { + "packages/instrumentation-typeorm/node_modules/gcp-metadata": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", @@ -33478,7 +33343,7 @@ "node": ">=12" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/https-proxy-agent": { + "packages/instrumentation-typeorm/node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", @@ -33493,11 +33358,25 @@ "node": ">= 6" } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/mongodb": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz", - "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==", + "packages/instrumentation-typeorm/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "packages/instrumentation-typeorm/node_modules/mongodb": { + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.16.0.tgz", + "integrity": "sha512-D1PNcdT0y4Grhou5Zi/qgipZOYeWrhLEpk33n3nm6LGtz61jvO88WlrWCK/bigMjpnOdAUKKQwsGIl0NtWMyYw==", + "dev": true, + "optional": true, + "peer": true, "dependencies": { "@mongodb-js/saslprep": "^1.1.9", "bson": "^6.10.3", @@ -33539,515 +33418,318 @@ } } }, - "plugins/node/opentelemetry-instrumentation-mongodb/node_modules/mongodb-connection-string-url": { + "packages/instrumentation-typeorm/node_modules/mongodb-connection-string-url": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "@types/whatwg-url": "^11.0.2", "whatwg-url": "^14.1.0 || ^13.0.0" } }, - "plugins/node/opentelemetry-instrumentation-mysql": { - "name": "@opentelemetry/instrumentation-mysql", - "version": "0.48.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/mysql": "2.15.27" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-metrics": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "mysql": "2.18.1", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/node/opentelemetry-instrumentation-mysql2": { - "name": "@opentelemetry/instrumentation-mysql2", - "version": "0.48.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "@opentelemetry/sql-common": "^0.41.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/semver": "7.5.8", - "mysql2": "3.11.5", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "semver": "7.7.2", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/node/opentelemetry-instrumentation-nestjs-core": { - "name": "@opentelemetry/instrumentation-nestjs-core", - "version": "0.48.1", - "license": "Apache-2.0", + "packages/instrumentation-typeorm/node_modules/nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.30.0" + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" }, - "devDependencies": { - "@nestjs/common": "11.0.10", - "@nestjs/core": "11.0.10", - "@nestjs/platform-express": "11.0.10", - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/semver": "7.5.8", - "cross-env": "7.0.3", - "nyc": "17.1.0", - "reflect-metadata": "0.2.2", - "rimraf": "5.0.10", - "rxjs": "7.8.2", - "rxjs-compat": "6.6.7", - "semver": "7.7.2", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" + "bin": { + "nyc": "bin/nyc.js" }, "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": ">=8.9" } }, - "plugins/node/opentelemetry-instrumentation-net": { - "name": "@opentelemetry/instrumentation-net", - "version": "0.46.1", - "license": "Apache-2.0", + "packages/instrumentation-typeorm/node_modules/nyc/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "typescript": "5.0.4" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": "^18.19.0 || >=20.6.0" + "node": "*" }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "plugins/node/opentelemetry-instrumentation-oracledb": { - "name": "@opentelemetry/instrumentation-oracledb", - "version": "0.28.0", - "license": "Apache-2.0", + "packages/instrumentation-typeorm/node_modules/nyc/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/oracledb": "6.5.2" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "cross-env": "7.0.3", - "nyc": "17.1.0", - "oracledb": "^6.7.0", - "rimraf": "5.0.10", - "safe-stable-stringify": "^2.4.1", - "sinon": "15.2.0", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" + "glob": "^7.1.3" }, - "engines": { - "node": "^18.19.0 || >=20.6.0" + "bin": { + "rimraf": "bin.js" }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "plugins/node/opentelemetry-instrumentation-pg": { - "name": "@opentelemetry/instrumentation-pg", - "version": "0.54.1", - "license": "Apache-2.0", + "packages/instrumentation-typeorm/node_modules/nyc/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "@opentelemetry/sql-common": "^0.41.0", - "@types/pg": "8.15.4", - "@types/pg-pool": "2.0.6" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "cross-env": "7.0.3", - "nyc": "17.1.0", - "pg": "8.7.1", - "pg-pool": "3.4.1", - "rimraf": "5.0.10", - "safe-stable-stringify": "^2.4.1", - "sinon": "15.2.0", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" }, "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": ">=8" } }, - "plugins/node/opentelemetry-instrumentation-pino": { - "name": "@opentelemetry/instrumentation-pino", - "version": "0.49.1", - "license": "Apache-2.0", + "packages/instrumentation-typeorm/node_modules/p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, "dependencies": { - "@opentelemetry/api-logs": "^0.202.0", - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/semver": "7.5.8", - "@types/sinon": "17.0.4", - "nyc": "17.1.0", - "pino": "8.3.1", - "rimraf": "5.0.10", - "semver": "7.7.2", - "sinon": "15.2.0", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" + "aggregate-error": "^3.0.0" }, "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "node": ">=8" } }, - "plugins/node/opentelemetry-instrumentation-redis": { - "name": "@opentelemetry/instrumentation-redis", - "version": "0.50.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/redis-common": "^0.38.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/contrib-test-utils": "^0.48.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "cross-env": "7.0.3", - "nyc": "17.1.0", - "redis": "^4.7.1", - "rimraf": "5.0.10", - "test-all-versions": "6.1.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } + "packages/instrumentation-typeorm/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true }, - "plugins/node/opentelemetry-instrumentation-restify": { - "name": "@opentelemetry/instrumentation-restify", - "version": "0.48.2", - "license": "Apache-2.0", + "packages/instrumentation-typeorm/node_modules/typeorm": { + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.24.tgz", + "integrity": "sha512-4IrHG7A0tY8l5gEGXfW56VOMfUVWEkWlH/h5wmcyZ+V8oCiLj7iTPp0lEjMEZVrxEkGSdP9ErgTKHKXQApl/oA==", + "dev": true, "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "@sqltools/formatter": "^1.2.5", + "ansis": "^3.17.0", + "app-root-path": "^3.1.0", + "buffer": "^6.0.3", + "dayjs": "^1.11.13", + "debug": "^4.4.0", + "dedent": "^1.6.0", + "dotenv": "^16.4.7", + "glob": "^10.4.5", + "sha.js": "^2.4.11", + "sql-highlight": "^6.0.0", + "tslib": "^2.8.1", + "uuid": "^11.1.0", + "yargs": "^17.7.2" }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/restify": "4.3.12", - "@types/semver": "7.5.8", - "nyc": "17.1.0", - "restify": "11.1.0", - "rimraf": "5.0.10", - "semver": "7.7.2", - "test-all-versions": "^6.0.0", - "typescript": "5.0.4" + "bin": { + "typeorm": "cli.js", + "typeorm-ts-node-commonjs": "cli-ts-node-commonjs.js", + "typeorm-ts-node-esm": "cli-ts-node-esm.js" }, "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/node/opentelemetry-instrumentation-router": { - "name": "@opentelemetry/instrumentation-router", - "version": "0.47.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "router": "1.3.8", - "typescript": "5.0.4" + "node": ">=16.13.0" }, - "engines": { - "node": "^18.19.0 || >=20.6.0" + "funding": { + "url": "https://opencollective.com/typeorm" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/node/opentelemetry-instrumentation-winston": { - "name": "@opentelemetry/instrumentation-winston", - "version": "0.47.0", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/api-logs": "^0.202.0", - "@opentelemetry/instrumentation": "^0.202.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/context-async-hooks": "^2.0.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-node": "^2.0.0", - "@opentelemetry/winston-transport": "^0.13.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "@types/triple-beam": "^1.3.2", - "nyc": "17.1.0", - "rimraf": "5.0.10", - "sinon": "15.2.0", - "test-all-versions": "6.1.0", - "typescript": "5.0.4", - "winston": "3.3.3", - "winston2": "npm:winston@2.4.7" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" + "@google-cloud/spanner": "^5.18.0 || ^6.0.0 || ^7.0.0", + "@sap/hana-client": "^2.12.25", + "better-sqlite3": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0", + "hdb-pool": "^0.1.6", + "ioredis": "^5.0.4", + "mongodb": "^5.8.0 || ^6.0.0", + "mssql": "^9.1.1 || ^10.0.1 || ^11.0.1", + "mysql2": "^2.2.5 || ^3.0.1", + "oracledb": "^6.3.0", + "pg": "^8.5.1", + "pg-native": "^3.0.0", + "pg-query-stream": "^4.0.0", + "redis": "^3.1.1 || ^4.0.0", + "reflect-metadata": "^0.1.14 || ^0.2.0", + "sql.js": "^1.4.0", + "sqlite3": "^5.0.3", + "ts-node": "^10.7.0", + "typeorm-aurora-data-api-driver": "^2.0.0 || ^3.0.0" }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "peerDependenciesMeta": { + "@google-cloud/spanner": { + "optional": true + }, + "@sap/hana-client": { + "optional": true + }, + "better-sqlite3": { + "optional": true + }, + "hdb-pool": { + "optional": true + }, + "ioredis": { + "optional": true + }, + "mongodb": { + "optional": true + }, + "mssql": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "oracledb": { + "optional": true + }, + "pg": { + "optional": true + }, + "pg-native": { + "optional": true + }, + "pg-query-stream": { + "optional": true + }, + "redis": { + "optional": true + }, + "sql.js": { + "optional": true + }, + "sqlite3": { + "optional": true + }, + "ts-node": { + "optional": true + }, + "typeorm-aurora-data-api-driver": { + "optional": true + } } }, - "plugins/web/opentelemetry-instrumentation-document-load": { - "name": "@opentelemetry/instrumentation-document-load", - "version": "0.47.1", - "license": "Apache-2.0", - "dependencies": { - "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.202.0", - "@opentelemetry/sdk-trace-web": "^2.0.0", - "@opentelemetry/semantic-conventions": "^1.27.0" - }, - "devDependencies": { - "@babel/core": "7.22.17", - "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "^1.3.0", - "@opentelemetry/sdk-trace-base": "^2.0.0", - "@rollup/plugin-commonjs": "^26.0.0", - "@rollup/plugin-node-resolve": "^16.0.0", - "@types/chai": "^4.3.10", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "@web/dev-server-esbuild": "^1.0.1", - "@web/dev-server-rollup": "^0.6.1", - "@web/test-runner": "^0.18.0", - "chai": "^4.3.10", - "sinon": "15.2.0", - "typescript": "5.0.4" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" + "packages/instrumentation-typeorm/node_modules/uuid": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz", + "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/esm/bin/uuid" } }, - "plugins/web/opentelemetry-instrumentation-document-load/node_modules/@babel/core": { - "version": "7.22.17", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.17.tgz", - "integrity": "sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==", + "packages/instrumentation-typeorm/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-module-transforms": "^7.22.17", - "@babel/helpers": "^7.22.15", - "@babel/parser": "^7.22.16", - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.22.17", - "@babel/types": "^7.22.17", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" + "node": ">=8" } }, - "plugins/web/opentelemetry-instrumentation-document-load/node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "packages/instrumentation-typeorm/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true }, - "plugins/web/opentelemetry-instrumentation-document-load/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "packages/instrumentation-typeorm/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" } }, - "plugins/web/opentelemetry-instrumentation-long-task": { - "name": "@opentelemetry/instrumentation-long-task", - "version": "0.47.0", + "packages/instrumentation-undici": { + "name": "@opentelemetry/instrumentation-undici", + "version": "0.13.2", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, "devDependencies": { - "@babel/core": "7.24.6", - "@babel/preset-env": "7.24.6", - "@opentelemetry/api": "^1.3.0", + "@opentelemetry/api": "^1.7.0", + "@opentelemetry/sdk-metrics": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", - "@opentelemetry/sdk-trace-web": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", "@types/mocha": "10.0.10", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "@types/webpack-env": "1.16.3", - "assert": "2.0.0", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "7.0.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", "nyc": "17.1.0", "rimraf": "5.0.10", - "sinon": "15.1.2", - "ts-loader": "9.5.2", + "semver": "^7.6.0", + "test-all-versions": "6.1.0", "typescript": "5.0.4", - "webpack": "5.94.0", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" + "undici": "6.21.3" }, "engines": { "node": "^18.19.0 || >=20.6.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "plugins/web/opentelemetry-instrumentation-long-task/node_modules/sinon": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", - "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", - "deprecated": "16.1.1", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^10.1.0", - "@sinonjs/samsam": "^8.0.0", - "diff": "^5.1.0", - "nise": "^5.1.4", - "supports-color": "^7.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/sinon" + "@opentelemetry/api": "^1.7.0" } }, - "plugins/web/opentelemetry-instrumentation-user-interaction": { + "packages/instrumentation-user-interaction": { "name": "@opentelemetry/instrumentation-user-interaction", "version": "0.47.0", "license": "Apache-2.0", @@ -34095,7 +33777,7 @@ "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" } }, - "plugins/web/opentelemetry-instrumentation-user-interaction/node_modules/sinon": { + "packages/instrumentation-user-interaction/node_modules/sinon": { "version": "15.1.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", @@ -34114,7 +33796,40 @@ "url": "https://opencollective.com/sinon" } }, - "plugins/web/opentelemetry-plugin-react-load": { + "packages/instrumentation-winston": { + "name": "@opentelemetry/instrumentation-winston", + "version": "0.47.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api-logs": "^0.202.0", + "@opentelemetry/instrumentation": "^0.202.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/context-async-hooks": "^2.0.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@opentelemetry/sdk-trace-node": "^2.0.0", + "@opentelemetry/winston-transport": "^0.13.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "@types/triple-beam": "^1.3.2", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "test-all-versions": "6.1.0", + "typescript": "5.0.4", + "winston": "3.3.3", + "winston2": "npm:winston@2.4.7" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "packages/plugin-react-load": { "name": "@opentelemetry/plugin-react-load", "version": "0.34.1", "license": "Apache-2.0", @@ -34165,7 +33880,7 @@ "react": "^16.13.1 || ^17.0.0" } }, - "plugins/web/opentelemetry-plugin-react-load/node_modules/sinon": { + "packages/plugin-react-load/node_modules/sinon": { "version": "15.1.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", @@ -34184,70 +33899,20 @@ "url": "https://opencollective.com/sinon" } }, - "propagators/opentelemetry-propagator-instana": { - "name": "@opentelemetry/propagator-instana", - "version": "0.4.0", - "license": "Apache-2.0", - "devDependencies": { - "@babel/core": "7.24.6", - "@babel/preset-env": "7.24.6", - "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.10", - "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "@types/webpack-env": "1.16.3", - "assert": "2.0.0", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "7.0.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", - "nyc": "17.1.0", - "process": "0.11.10", - "ts-loader": "9.5.2", - "typescript": "5.0.4", - "webpack": "5.94.0", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" - }, - "engines": { - "node": "^18.19.0 || >=20.6.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - } - }, - "propagators/opentelemetry-propagator-ot-trace": { - "name": "@opentelemetry/propagator-ot-trace", - "version": "0.28.0", + "packages/propagation-utils": { + "name": "@opentelemetry/propagation-utils", + "version": "0.31.2", "license": "Apache-2.0", "devDependencies": { - "@babel/core": "7.24.6", - "@babel/preset-env": "7.24.6", "@opentelemetry/api": "^1.0.0", - "@types/mocha": "10.0.10", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@types/mocha": "^10.0.0", "@types/node": "18.18.14", - "@types/sinon": "17.0.4", - "@types/webpack-env": "1.16.3", - "assert": "2.0.0", - "babel-loader": "8.3.0", - "babel-plugin-istanbul": "7.0.0", - "karma": "6.4.4", - "karma-chrome-launcher": "3.1.0", - "karma-coverage": "2.2.1", - "karma-mocha": "2.0.1", - "karma-spec-reporter": "0.0.36", - "karma-webpack": "5.0.1", + "@types/sinon": "^17.0.0", + "expect": "29.2.0", "nyc": "17.1.0", - "sinon": "15.1.2", - "ts-loader": "9.5.2", - "typescript": "5.0.4", - "webpack": "5.94.0", - "webpack-cli": "5.1.4", - "webpack-merge": "5.10.0" + "sinon": "15.2.0", + "typescript": "5.0.4" }, "engines": { "node": "^18.19.0 || >=20.6.0" @@ -34256,26 +33921,7 @@ "@opentelemetry/api": "^1.0.0" } }, - "propagators/opentelemetry-propagator-ot-trace/node_modules/sinon": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", - "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", - "deprecated": "16.1.1", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^10.1.0", - "@sinonjs/samsam": "^8.0.0", - "diff": "^5.1.0", - "nise": "^5.1.4", - "supports-color": "^7.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/sinon" - } - }, - "propagators/propagator-aws-xray": { + "packages/propagator-aws-xray": { "name": "@opentelemetry/propagator-aws-xray", "version": "2.1.0", "license": "Apache-2.0", @@ -34308,7 +33954,7 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, - "propagators/propagator-aws-xray-lambda": { + "packages/propagator-aws-xray-lambda": { "name": "@opentelemetry/propagator-aws-xray-lambda", "version": "0.55.0", "license": "Apache-2.0", @@ -34336,7 +33982,7 @@ "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, - "propagators/propagator-aws-xray-lambda/node_modules/sinon": { + "packages/propagator-aws-xray-lambda/node_modules/sinon": { "version": "15.1.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", @@ -34355,13 +34001,13 @@ "url": "https://opencollective.com/sinon" } }, - "propagators/propagator-aws-xray/node_modules/json-parse-even-better-errors": { + "packages/propagator-aws-xray/node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, - "propagators/propagator-aws-xray/node_modules/schema-utils": { + "packages/propagator-aws-xray/node_modules/schema-utils": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", @@ -34379,7 +34025,7 @@ "url": "https://opencollective.com/webpack" } }, - "propagators/propagator-aws-xray/node_modules/webpack": { + "packages/propagator-aws-xray/node_modules/webpack": { "version": "5.95.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz", "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==", @@ -34424,6 +34070,355 @@ "optional": true } } + }, + "packages/propagator-instana": { + "name": "@opentelemetry/propagator-instana", + "version": "0.4.0", + "license": "Apache-2.0", + "devDependencies": { + "@babel/core": "7.24.6", + "@babel/preset-env": "7.24.6", + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "@types/webpack-env": "1.16.3", + "assert": "2.0.0", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "7.0.0", + "karma": "6.4.4", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "5.0.1", + "nyc": "17.1.0", + "process": "0.11.10", + "ts-loader": "9.5.2", + "typescript": "5.0.4", + "webpack": "5.94.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/propagator-ot-trace": { + "name": "@opentelemetry/propagator-ot-trace", + "version": "0.28.0", + "license": "Apache-2.0", + "devDependencies": { + "@babel/core": "7.24.6", + "@babel/preset-env": "7.24.6", + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "@types/webpack-env": "1.16.3", + "assert": "2.0.0", + "babel-loader": "8.3.0", + "babel-plugin-istanbul": "7.0.0", + "karma": "6.4.4", + "karma-chrome-launcher": "3.1.0", + "karma-coverage": "2.2.1", + "karma-mocha": "2.0.1", + "karma-spec-reporter": "0.0.36", + "karma-webpack": "5.0.1", + "nyc": "17.1.0", + "sinon": "15.1.2", + "ts-loader": "9.5.2", + "typescript": "5.0.4", + "webpack": "5.94.0", + "webpack-cli": "5.1.4", + "webpack-merge": "5.10.0" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/propagator-ot-trace/node_modules/sinon": { + "version": "15.1.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.2.tgz", + "integrity": "sha512-uG1pU54Fis4EfYOPoEi13fmRHgZNg/u+3aReSEzHsN52Bpf+bMVfsBQS5MjouI+rTuG6UBIINlpuuO2Epr7SiA==", + "deprecated": "16.1.1", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^10.1.0", + "@sinonjs/samsam": "^8.0.0", + "diff": "^5.1.0", + "nise": "^5.1.4", + "supports-color": "^7.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "packages/redis-common": { + "name": "@opentelemetry/redis-common", + "version": "0.38.0", + "license": "Apache-2.0", + "devDependencies": { + "@types/mocha": "^10.0.0", + "@types/node": "18.18.14", + "nyc": "17.1.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + } + }, + "packages/resource-detector-alibaba-cloud": { + "name": "@opentelemetry/resource-detector-alibaba-cloud", + "version": "0.31.2", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "nock": "13.3.3", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/resource-detector-aws": { + "name": "@opentelemetry/resource-detector-aws", + "version": "2.2.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/instrumentation-fs": "^0.22.0", + "@opentelemetry/instrumentation-http": "^0.202.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "nock": "13.3.3", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/resource-detector-azure": { + "name": "@opentelemetry/resource-detector-azure", + "version": "0.9.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/instrumentation-http": "^0.202.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "nock": "13.3.3", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/resource-detector-container": { + "name": "@opentelemetry/resource-detector-container", + "version": "0.7.2", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/instrumentation-fs": "^0.22.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "eslint-plugin-header": "^3.1.1", + "nock": "13.3.3", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/resource-detector-gcp": { + "name": "@opentelemetry/resource-detector-gcp", + "version": "0.36.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/resources": "^2.0.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "gcp-metadata": "^6.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/instrumentation-http": "^0.202.0", + "@opentelemetry/sdk-trace-base": "^2.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/semver": "7.5.8", + "nock": "13.3.3", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/resource-detector-github": { + "name": "@opentelemetry/resource-detector-github", + "version": "0.31.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/resources": "^2.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + } + }, + "packages/resource-detector-instana": { + "name": "@opentelemetry/resource-detector-instana", + "version": "0.21.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0", + "@opentelemetry/resources": "^2.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.3.0", + "@opentelemetry/contrib-test-utils": "^0.48.0", + "@opentelemetry/sdk-node": "^0.202.0", + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/semver": "7.5.8", + "nock": "13.3.3", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "packages/sql-common": { + "name": "@opentelemetry/sql-common", + "version": "0.41.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/core": "^2.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.1.0", + "@types/mocha": "^10.0.0", + "@types/node": "18.18.14", + "nyc": "17.1.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0" + } + }, + "packages/winston-transport": { + "name": "@opentelemetry/winston-transport", + "version": "0.13.0", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api-logs": "^0.202.0", + "winston-transport": "4.*" + }, + "devDependencies": { + "@types/mocha": "10.0.10", + "@types/node": "18.18.14", + "@types/sinon": "17.0.4", + "@types/triple-beam": "1.3.5", + "nyc": "17.1.0", + "rimraf": "5.0.10", + "sinon": "15.2.0", + "typescript": "5.0.4" + }, + "engines": { + "node": "^18.19.0 || >=20.6.0" + } } }, "dependencies": { @@ -39832,7 +39827,7 @@ } }, "@opentelemetry/auto-configuration-propagators": { - "version": "file:metapackages/auto-configuration-propagators", + "version": "file:packages/auto-configuration-propagators", "requires": { "@opentelemetry/api": "^1.4.1", "@opentelemetry/core": "^2.0.0", @@ -39851,7 +39846,7 @@ } }, "@opentelemetry/auto-instrumentations-node": { - "version": "file:metapackages/auto-instrumentations-node", + "version": "file:packages/auto-instrumentations-node", "requires": { "@opentelemetry/api": "^1.4.1", "@opentelemetry/core": "^2.0.0", @@ -39913,7 +39908,7 @@ } }, "@opentelemetry/auto-instrumentations-web": { - "version": "file:metapackages/auto-instrumentations-web", + "version": "file:packages/auto-instrumentations-web", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -40002,7 +39997,7 @@ "requires": {} }, "@opentelemetry/contrib-test-utils": { - "version": "file:packages/opentelemetry-test-utils", + "version": "file:packages/contrib-test-utils", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/core": "^2.0.0", @@ -40176,7 +40171,7 @@ } }, "@opentelemetry/host-metrics": { - "version": "file:packages/opentelemetry-host-metrics", + "version": "file:packages/host-metrics", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-metrics": "^2.0.0", @@ -40191,7 +40186,7 @@ } }, "@opentelemetry/id-generator-aws-xray": { - "version": "file:packages/opentelemetry-id-generator-aws-xray", + "version": "file:packages/id-generator-aws-xray", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -40247,7 +40242,7 @@ } }, "@opentelemetry/instrumentation-amqplib": { - "version": "file:plugins/node/instrumentation-amqplib", + "version": "file:packages/instrumentation-amqplib", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -40269,7 +40264,7 @@ } }, "@opentelemetry/instrumentation-aws-lambda": { - "version": "file:plugins/node/opentelemetry-instrumentation-aws-lambda", + "version": "file:packages/instrumentation-aws-lambda", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/core": "^2.0.0", @@ -40289,7 +40284,7 @@ } }, "@opentelemetry/instrumentation-aws-sdk": { - "version": "file:plugins/node/opentelemetry-instrumentation-aws-sdk", + "version": "file:packages/instrumentation-aws-sdk", "requires": { "@aws-sdk/client-bedrock-runtime": "^3.587.0", "@aws-sdk/client-dynamodb": "^3.85.0", @@ -40321,7 +40316,7 @@ } }, "@opentelemetry/instrumentation-bunyan": { - "version": "file:plugins/node/opentelemetry-instrumentation-bunyan", + "version": "file:packages/instrumentation-bunyan", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/api-logs": "^0.202.0", @@ -40344,7 +40339,7 @@ } }, "@opentelemetry/instrumentation-cassandra-driver": { - "version": "file:plugins/node/opentelemetry-instrumentation-cassandra", + "version": "file:packages/instrumentation-cassandra-driver", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40365,7 +40360,7 @@ } }, "@opentelemetry/instrumentation-connect": { - "version": "file:plugins/node/opentelemetry-instrumentation-connect", + "version": "file:packages/instrumentation-connect", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40384,7 +40379,7 @@ } }, "@opentelemetry/instrumentation-cucumber": { - "version": "file:plugins/node/instrumentation-cucumber", + "version": "file:packages/instrumentation-cucumber", "requires": { "@cucumber/cucumber": "^11.0.0", "@cucumber/messages": "^22.0.0", @@ -40408,7 +40403,7 @@ } }, "@opentelemetry/instrumentation-dataloader": { - "version": "file:plugins/node/instrumentation-dataloader", + "version": "file:packages/instrumentation-dataloader", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40425,7 +40420,7 @@ } }, "@opentelemetry/instrumentation-dns": { - "version": "file:plugins/node/opentelemetry-instrumentation-dns", + "version": "file:packages/instrumentation-dns", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/core": "^2.0.0", @@ -40444,7 +40439,7 @@ } }, "@opentelemetry/instrumentation-document-load": { - "version": "file:plugins/web/opentelemetry-instrumentation-document-load", + "version": "file:packages/instrumentation-document-load", "requires": { "@babel/core": "7.22.17", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -40506,7 +40501,7 @@ } }, "@opentelemetry/instrumentation-express": { - "version": "file:plugins/node/opentelemetry-instrumentation-express", + "version": "file:packages/instrumentation-express", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40529,7 +40524,7 @@ } }, "@opentelemetry/instrumentation-fastify": { - "version": "file:plugins/node/opentelemetry-instrumentation-fastify", + "version": "file:packages/instrumentation-fastify", "requires": { "@fastify/express": "^3.0.0", "@opentelemetry/api": "^1.3.0", @@ -40573,7 +40568,7 @@ } }, "@opentelemetry/instrumentation-fs": { - "version": "file:plugins/node/instrumentation-fs", + "version": "file:packages/instrumentation-fs", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40592,7 +40587,7 @@ } }, "@opentelemetry/instrumentation-generic-pool": { - "version": "file:plugins/node/opentelemetry-instrumentation-generic-pool", + "version": "file:packages/instrumentation-generic-pool", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40611,7 +40606,7 @@ } }, "@opentelemetry/instrumentation-graphql": { - "version": "file:plugins/node/opentelemetry-instrumentation-graphql", + "version": "file:packages/instrumentation-graphql", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/instrumentation": "^0.202.0", @@ -40636,7 +40631,7 @@ } }, "@opentelemetry/instrumentation-hapi": { - "version": "file:plugins/node/opentelemetry-instrumentation-hapi", + "version": "file:packages/instrumentation-hapi", "requires": { "@hapi/hapi": "21.3.12", "@opentelemetry/api": "^1.3.0", @@ -40668,7 +40663,7 @@ } }, "@opentelemetry/instrumentation-ioredis": { - "version": "file:plugins/node/opentelemetry-instrumentation-ioredis", + "version": "file:packages/instrumentation-ioredis", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40692,7 +40687,7 @@ } }, "@opentelemetry/instrumentation-kafkajs": { - "version": "file:plugins/node/instrumentation-kafkajs", + "version": "file:packages/instrumentation-kafkajs", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -40711,7 +40706,7 @@ } }, "@opentelemetry/instrumentation-knex": { - "version": "file:plugins/node/opentelemetry-instrumentation-knex", + "version": "file:packages/instrumentation-knex", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40730,7 +40725,7 @@ } }, "@opentelemetry/instrumentation-koa": { - "version": "file:plugins/node/opentelemetry-instrumentation-koa", + "version": "file:packages/instrumentation-koa", "requires": { "@koa/router": "13.1.1", "@opentelemetry/api": "^1.3.0", @@ -40757,7 +40752,7 @@ } }, "@opentelemetry/instrumentation-long-task": { - "version": "file:plugins/web/opentelemetry-instrumentation-long-task", + "version": "file:packages/instrumentation-long-task", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -40807,7 +40802,7 @@ } }, "@opentelemetry/instrumentation-lru-memoizer": { - "version": "file:plugins/node/instrumentation-lru-memoizer", + "version": "file:packages/instrumentation-lru-memoizer", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -40824,7 +40819,7 @@ } }, "@opentelemetry/instrumentation-memcached": { - "version": "file:plugins/node/opentelemetry-instrumentation-memcached", + "version": "file:packages/instrumentation-memcached", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40844,7 +40839,7 @@ } }, "@opentelemetry/instrumentation-mongodb": { - "version": "file:plugins/node/opentelemetry-instrumentation-mongodb", + "version": "file:packages/instrumentation-mongodb", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40952,7 +40947,7 @@ } }, "@opentelemetry/instrumentation-mongoose": { - "version": "file:plugins/node/instrumentation-mongoose", + "version": "file:packages/instrumentation-mongoose", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -40971,7 +40966,7 @@ } }, "@opentelemetry/instrumentation-mysql": { - "version": "file:plugins/node/opentelemetry-instrumentation-mysql", + "version": "file:packages/instrumentation-mysql", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -40992,7 +40987,7 @@ } }, "@opentelemetry/instrumentation-mysql2": { - "version": "file:plugins/node/opentelemetry-instrumentation-mysql2", + "version": "file:packages/instrumentation-mysql2", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41013,7 +41008,7 @@ } }, "@opentelemetry/instrumentation-nestjs-core": { - "version": "file:plugins/node/opentelemetry-instrumentation-nestjs-core", + "version": "file:packages/instrumentation-nestjs-core", "requires": { "@nestjs/common": "11.0.10", "@nestjs/core": "11.0.10", @@ -41039,7 +41034,7 @@ } }, "@opentelemetry/instrumentation-net": { - "version": "file:plugins/node/opentelemetry-instrumentation-net", + "version": "file:packages/instrumentation-net", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41057,7 +41052,7 @@ } }, "@opentelemetry/instrumentation-oracledb": { - "version": "file:plugins/node/opentelemetry-instrumentation-oracledb", + "version": "file:packages/instrumentation-oracledb", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41081,7 +41076,7 @@ } }, "@opentelemetry/instrumentation-pg": { - "version": "file:plugins/node/opentelemetry-instrumentation-pg", + "version": "file:packages/instrumentation-pg", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41109,7 +41104,7 @@ } }, "@opentelemetry/instrumentation-pino": { - "version": "file:plugins/node/opentelemetry-instrumentation-pino", + "version": "file:packages/instrumentation-pino", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/api-logs": "^0.202.0", @@ -41133,7 +41128,7 @@ } }, "@opentelemetry/instrumentation-redis": { - "version": "file:plugins/node/opentelemetry-instrumentation-redis", + "version": "file:packages/instrumentation-redis", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41154,7 +41149,7 @@ } }, "@opentelemetry/instrumentation-restify": { - "version": "file:plugins/node/opentelemetry-instrumentation-restify", + "version": "file:packages/instrumentation-restify", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41176,7 +41171,7 @@ } }, "@opentelemetry/instrumentation-router": { - "version": "file:plugins/node/opentelemetry-instrumentation-router", + "version": "file:packages/instrumentation-router", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41193,7 +41188,7 @@ } }, "@opentelemetry/instrumentation-runtime-node": { - "version": "file:plugins/node/instrumentation-runtime-node", + "version": "file:packages/instrumentation-runtime-node", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/instrumentation": "^0.202.0", @@ -41206,7 +41201,7 @@ } }, "@opentelemetry/instrumentation-socket.io": { - "version": "file:plugins/node/instrumentation-socket.io", + "version": "file:packages/instrumentation-socket.io", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -41345,7 +41340,7 @@ } }, "@opentelemetry/instrumentation-tedious": { - "version": "file:plugins/node/instrumentation-tedious", + "version": "file:packages/instrumentation-tedious", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-async-hooks": "^2.0.0", @@ -41365,7 +41360,7 @@ } }, "@opentelemetry/instrumentation-typeorm": { - "version": "file:plugins/node/instrumentation-typeorm", + "version": "file:packages/instrumentation-typeorm", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -41695,7 +41690,7 @@ } }, "@opentelemetry/instrumentation-undici": { - "version": "file:plugins/node/instrumentation-undici", + "version": "file:packages/instrumentation-undici", "requires": { "@opentelemetry/api": "^1.7.0", "@opentelemetry/core": "^2.0.0", @@ -41714,7 +41709,7 @@ } }, "@opentelemetry/instrumentation-user-interaction": { - "version": "file:plugins/web/opentelemetry-instrumentation-user-interaction", + "version": "file:packages/instrumentation-user-interaction", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -41767,7 +41762,7 @@ } }, "@opentelemetry/instrumentation-winston": { - "version": "file:plugins/node/opentelemetry-instrumentation-winston", + "version": "file:packages/instrumentation-winston", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/api-logs": "^0.202.0", @@ -41835,7 +41830,7 @@ } }, "@opentelemetry/plugin-react-load": { - "version": "file:plugins/web/opentelemetry-plugin-react-load", + "version": "file:packages/plugin-react-load", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -41891,7 +41886,7 @@ } }, "@opentelemetry/propagation-utils": { - "version": "file:packages/opentelemetry-propagation-utils", + "version": "file:packages/propagation-utils", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -41905,7 +41900,7 @@ } }, "@opentelemetry/propagator-aws-xray": { - "version": "file:propagators/propagator-aws-xray", + "version": "file:packages/propagator-aws-xray", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/core": "^2.0.0", @@ -41980,7 +41975,7 @@ } }, "@opentelemetry/propagator-aws-xray-lambda": { - "version": "file:propagators/propagator-aws-xray-lambda", + "version": "file:packages/propagator-aws-xray-lambda", "requires": { "@babel/core": "^7.21.8", "@babel/preset-env": "7.24.6", @@ -42022,7 +42017,7 @@ } }, "@opentelemetry/propagator-instana": { - "version": "file:propagators/opentelemetry-propagator-instana", + "version": "file:packages/propagator-instana", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -42058,7 +42053,7 @@ } }, "@opentelemetry/propagator-ot-trace": { - "version": "file:propagators/opentelemetry-propagator-ot-trace", + "version": "file:packages/propagator-ot-trace", "requires": { "@babel/core": "7.24.6", "@babel/preset-env": "7.24.6", @@ -42102,7 +42097,7 @@ } }, "@opentelemetry/redis-common": { - "version": "file:packages/opentelemetry-redis-common", + "version": "file:packages/redis-common", "requires": { "@types/mocha": "^10.0.0", "@types/node": "18.18.14", @@ -42111,7 +42106,7 @@ } }, "@opentelemetry/resource-detector-alibaba-cloud": { - "version": "file:detectors/node/opentelemetry-resource-detector-alibaba-cloud", + "version": "file:packages/resource-detector-alibaba-cloud", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -42130,7 +42125,7 @@ } }, "@opentelemetry/resource-detector-aws": { - "version": "file:detectors/node/opentelemetry-resource-detector-aws", + "version": "file:packages/resource-detector-aws", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -42151,7 +42146,7 @@ } }, "@opentelemetry/resource-detector-azure": { - "version": "file:detectors/node/opentelemetry-resource-detector-azure", + "version": "file:packages/resource-detector-azure", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -42170,7 +42165,7 @@ } }, "@opentelemetry/resource-detector-container": { - "version": "file:detectors/node/opentelemetry-resource-detector-container", + "version": "file:packages/resource-detector-container", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -42191,7 +42186,7 @@ } }, "@opentelemetry/resource-detector-gcp": { - "version": "file:detectors/node/opentelemetry-resource-detector-gcp", + "version": "file:packages/resource-detector-gcp", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -42211,7 +42206,7 @@ } }, "@opentelemetry/resource-detector-github": { - "version": "file:detectors/node/opentelemetry-resource-detector-github", + "version": "file:packages/resource-detector-github", "requires": { "@opentelemetry/api": "^1.0.0", "@opentelemetry/resources": "^2.0.0", @@ -42225,7 +42220,7 @@ } }, "@opentelemetry/resource-detector-instana": { - "version": "file:detectors/node/opentelemetry-resource-detector-instana", + "version": "file:packages/resource-detector-instana", "requires": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.48.0", @@ -42333,7 +42328,7 @@ "integrity": "sha512-aKcOkyrorBGlajjRdVoJWHTxfxO1vCNHLJVlSDaRHDIdjU+pX8IYQPvPDkYiujKLbRnWU+1TBwEt0QRgSm4SGA==" }, "@opentelemetry/sql-common": { - "version": "file:packages/opentelemetry-sql-common", + "version": "file:packages/sql-common", "requires": { "@opentelemetry/api": "^1.1.0", "@opentelemetry/core": "^2.0.0", diff --git a/package.json b/package.json index 6aac32fa28..9d16879251 100644 --- a/package.json +++ b/package.json @@ -81,11 +81,6 @@ ] }, "workspaces": [ - "packages/*", - "plugins/node/*", - "plugins/web/*", - "propagators/*", - "detectors/node/*", - "metapackages/*" + "packages/*" ] } diff --git a/metapackages/auto-configuration-propagators/.eslintignore b/packages/auto-configuration-propagators/.eslintignore similarity index 100% rename from metapackages/auto-configuration-propagators/.eslintignore rename to packages/auto-configuration-propagators/.eslintignore diff --git a/metapackages/auto-configuration-propagators/.eslintrc.js b/packages/auto-configuration-propagators/.eslintrc.js similarity index 100% rename from metapackages/auto-configuration-propagators/.eslintrc.js rename to packages/auto-configuration-propagators/.eslintrc.js diff --git a/metapackages/auto-configuration-propagators/CHANGELOG.md b/packages/auto-configuration-propagators/CHANGELOG.md similarity index 100% rename from metapackages/auto-configuration-propagators/CHANGELOG.md rename to packages/auto-configuration-propagators/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/LICENSE b/packages/auto-configuration-propagators/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/LICENSE rename to packages/auto-configuration-propagators/LICENSE diff --git a/metapackages/auto-configuration-propagators/README.md b/packages/auto-configuration-propagators/README.md similarity index 90% rename from metapackages/auto-configuration-propagators/README.md rename to packages/auto-configuration-propagators/README.md index d98966e0c6..c2a8e2b485 100644 --- a/metapackages/auto-configuration-propagators/README.md +++ b/packages/auto-configuration-propagators/README.md @@ -34,9 +34,9 @@ The specification defines a list of [known propagators][env-var-url] for the `OT - "b3": [B3 Single](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3) - "b3multi": [B3 Multi](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3) - "jaeger": [Jaeger](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger) -- "xray": [AWS X-Ray (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray) -- "xray-lambda": [AWS X-Ray Lambda (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray-lambda) -- "ottrace": [OT Trace (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace) +- "xray": [AWS X-Ray (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray) +- "xray-lambda": [AWS X-Ray Lambda (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray-lambda) +- "ottrace": [OT Trace (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-ot-trace) ## Useful links diff --git a/metapackages/auto-configuration-propagators/package.json b/packages/auto-configuration-propagators/package.json similarity index 87% rename from metapackages/auto-configuration-propagators/package.json rename to packages/auto-configuration-propagators/package.json index c2be250430..29da658e78 100644 --- a/metapackages/auto-configuration-propagators/package.json +++ b/packages/auto-configuration-propagators/package.json @@ -3,7 +3,7 @@ "version": "0.4.1", "description": "Metapackage which bundles known propagators for configuration via an env variable.", "author": "OpenTelemetry Authors", - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-configuration-propagators#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/auto-configuration-propagators#readme", "license": "Apache-2.0", "engines": { "node": "^18.19.0 || >=20.6.0" @@ -13,7 +13,11 @@ }, "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/auto-configuration-propagators" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/auto-configuration-propagators", diff --git a/metapackages/auto-configuration-propagators/src/index.ts b/packages/auto-configuration-propagators/src/index.ts similarity index 100% rename from metapackages/auto-configuration-propagators/src/index.ts rename to packages/auto-configuration-propagators/src/index.ts diff --git a/metapackages/auto-configuration-propagators/src/utils.ts b/packages/auto-configuration-propagators/src/utils.ts similarity index 100% rename from metapackages/auto-configuration-propagators/src/utils.ts rename to packages/auto-configuration-propagators/src/utils.ts diff --git a/metapackages/auto-configuration-propagators/test/utils.test.ts b/packages/auto-configuration-propagators/test/utils.test.ts similarity index 100% rename from metapackages/auto-configuration-propagators/test/utils.test.ts rename to packages/auto-configuration-propagators/test/utils.test.ts diff --git a/metapackages/auto-configuration-propagators/tsconfig.json b/packages/auto-configuration-propagators/tsconfig.json similarity index 100% rename from metapackages/auto-configuration-propagators/tsconfig.json rename to packages/auto-configuration-propagators/tsconfig.json diff --git a/metapackages/auto-instrumentations-node/.eslintignore b/packages/auto-instrumentations-node/.eslintignore similarity index 100% rename from metapackages/auto-instrumentations-node/.eslintignore rename to packages/auto-instrumentations-node/.eslintignore diff --git a/metapackages/auto-instrumentations-node/.eslintrc.js b/packages/auto-instrumentations-node/.eslintrc.js similarity index 100% rename from metapackages/auto-instrumentations-node/.eslintrc.js rename to packages/auto-instrumentations-node/.eslintrc.js diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/packages/auto-instrumentations-node/CHANGELOG.md similarity index 100% rename from metapackages/auto-instrumentations-node/CHANGELOG.md rename to packages/auto-instrumentations-node/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-aws/LICENSE b/packages/auto-instrumentations-node/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/LICENSE rename to packages/auto-instrumentations-node/LICENSE diff --git a/metapackages/auto-instrumentations-node/README.md b/packages/auto-instrumentations-node/README.md similarity index 73% rename from metapackages/auto-instrumentations-node/README.md rename to packages/auto-instrumentations-node/README.md index dc6658c199..c9df22f09c 100644 --- a/metapackages/auto-instrumentations-node/README.md +++ b/packages/auto-instrumentations-node/README.md @@ -84,14 +84,14 @@ by providing a comma-separated list of the instrumentation package names without For example, to enable only [@opentelemetry/instrumentation-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-http) -and [@opentelemetry/instrumentation-nestjs-core](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core) +and [@opentelemetry/instrumentation-nestjs-core](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-nestjs-core) instrumentations: ```shell export OTEL_NODE_ENABLED_INSTRUMENTATIONS="http,nestjs-core" ``` -To disable only [@opentelemetry/instrumentation-net](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-net): +To disable only [@opentelemetry/instrumentation-net](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-net): ```shell export OTEL_NODE_DISABLED_INSTRUMENTATIONS="net" @@ -161,47 +161,47 @@ registerInstrumentations({ ## Supported instrumentations -- [@opentelemetry/instrumentation-amqplib](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-amqplib) -- [@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-cucumber](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber) -- [@opentelemetry/instrumentation-dataloader](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader) -- [@opentelemetry/instrumentation-dns](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns) -- [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express) -- [@opentelemetry/instrumentation-fastify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify) (deprecated, default disabled) +- [@opentelemetry/instrumentation-amqplib](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-amqplib) +- [@opentelemetry/instrumentation-aws-lambda](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-aws-lambda) +- [@opentelemetry/instrumentation-aws-sdk](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-aws-sdk) +- [@opentelemetry/instrumentation-bunyan](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-bunyan) +- [@opentelemetry/instrumentation-cassandra-driver](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-cassandra-driver) +- [@opentelemetry/instrumentation-connect](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-connect) +- [@opentelemetry/instrumentation-cucumber](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-cucumber) +- [@opentelemetry/instrumentation-dataloader](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-dataloader) +- [@opentelemetry/instrumentation-dns](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-dns) +- [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-express) +- [@opentelemetry/instrumentation-fastify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-fastify) (deprecated, default disabled) - This component is **deprecated** in favor of the official instrumentation package [`@fastify/otel`](https://www.npmjs.com/package/@fastify/otel), maintained by the Fastify authors. - Please see [here](https://github.com/fastify/otel?tab=readme-ov-file#usage) for instructions on how to use `@fastify/otel`. - This component will be removed on June 30, 2025 -- [@opentelemetry/instrumentation-fs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs) (default disabled) -- [@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-fs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-fs) (default disabled) +- [@opentelemetry/instrumentation-generic-pool](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-generic-pool) +- [@opentelemetry/instrumentation-graphql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-graphql) - [@opentelemetry/instrumentation-grpc](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc) -- [@opentelemetry/instrumentation-hapi](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi) +- [@opentelemetry/instrumentation-hapi](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-hapi) - [@opentelemetry/instrumentation-http](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http) -- [@opentelemetry/instrumentation-ioredis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-ioredis) -- [@opentelemetry/instrumentation-kafkajs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-kafkajs) -- [@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-lru-memoizer](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer) -- [@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-mongoose](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose) -- [@opentelemetry/instrumentation-mysql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql) -- [@opentelemetry/instrumentation-mysql2](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2) -- [@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-oracledb](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-oracledb) -- [@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-runtime-node](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-runtime-node) -- [@opentelemetry/instrumentation-socket.io](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io) -- [@opentelemetry/instrumentation-undici](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-undici) -- [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston) +- [@opentelemetry/instrumentation-ioredis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-ioredis) +- [@opentelemetry/instrumentation-kafkajs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-kafkajs) +- [@opentelemetry/instrumentation-knex](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-knex) +- [@opentelemetry/instrumentation-koa](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-koa) +- [@opentelemetry/instrumentation-lru-memoizer](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-lru-memoizer) +- [@opentelemetry/instrumentation-memcached](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-memcached) +- [@opentelemetry/instrumentation-mongodb](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mongodb) +- [@opentelemetry/instrumentation-mongoose](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mongoose) +- [@opentelemetry/instrumentation-mysql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mysql) +- [@opentelemetry/instrumentation-mysql2](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mysql2) +- [@opentelemetry/instrumentation-nestjs-core](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-nestjs-core) +- [@opentelemetry/instrumentation-net](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-net) +- [@opentelemetry/instrumentation-oracledb](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-oracledb) +- [@opentelemetry/instrumentation-pg](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-pg) +- [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-pino) +- [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-redis) +- [@opentelemetry/instrumentation-restify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-restify) +- [@opentelemetry/instrumentation-runtime-node](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-runtime-node) +- [@opentelemetry/instrumentation-socket.io](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-socket.io) +- [@opentelemetry/instrumentation-undici](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-undici) +- [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-winston) ## Useful links diff --git a/metapackages/auto-instrumentations-node/package.json b/packages/auto-instrumentations-node/package.json similarity index 94% rename from metapackages/auto-instrumentations-node/package.json rename to packages/auto-instrumentations-node/package.json index 503794abb0..838e21c1e8 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/packages/auto-instrumentations-node/package.json @@ -3,7 +3,7 @@ "version": "0.61.0", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/auto-instrumentations-node#readme", "license": "Apache-2.0", "engines": { "node": "^18.19.0 || >=20.6.0" @@ -17,7 +17,11 @@ ".": "./build/src/index.js", "./register": "./build/src/register.js" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/auto-instrumentations-node" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-node", diff --git a/metapackages/auto-instrumentations-node/src/index.ts b/packages/auto-instrumentations-node/src/index.ts similarity index 100% rename from metapackages/auto-instrumentations-node/src/index.ts rename to packages/auto-instrumentations-node/src/index.ts diff --git a/metapackages/auto-instrumentations-node/src/register.ts b/packages/auto-instrumentations-node/src/register.ts similarity index 100% rename from metapackages/auto-instrumentations-node/src/register.ts rename to packages/auto-instrumentations-node/src/register.ts diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/packages/auto-instrumentations-node/src/utils.ts similarity index 100% rename from metapackages/auto-instrumentations-node/src/utils.ts rename to packages/auto-instrumentations-node/src/utils.ts diff --git a/metapackages/auto-instrumentations-node/test/register.test.ts b/packages/auto-instrumentations-node/test/register.test.ts similarity index 100% rename from metapackages/auto-instrumentations-node/test/register.test.ts rename to packages/auto-instrumentations-node/test/register.test.ts diff --git a/metapackages/auto-instrumentations-node/test/test-app/app-server.js b/packages/auto-instrumentations-node/test/test-app/app-server.js similarity index 100% rename from metapackages/auto-instrumentations-node/test/test-app/app-server.js rename to packages/auto-instrumentations-node/test/test-app/app-server.js diff --git a/metapackages/auto-instrumentations-node/test/test-app/app.js b/packages/auto-instrumentations-node/test/test-app/app.js similarity index 100% rename from metapackages/auto-instrumentations-node/test/test-app/app.js rename to packages/auto-instrumentations-node/test/test-app/app.js diff --git a/metapackages/auto-instrumentations-node/test/utils.test.ts b/packages/auto-instrumentations-node/test/utils.test.ts similarity index 100% rename from metapackages/auto-instrumentations-node/test/utils.test.ts rename to packages/auto-instrumentations-node/test/utils.test.ts diff --git a/metapackages/auto-instrumentations-node/tsconfig.json b/packages/auto-instrumentations-node/tsconfig.json similarity index 100% rename from metapackages/auto-instrumentations-node/tsconfig.json rename to packages/auto-instrumentations-node/tsconfig.json diff --git a/metapackages/auto-instrumentations-web/.eslintignore b/packages/auto-instrumentations-web/.eslintignore similarity index 100% rename from metapackages/auto-instrumentations-web/.eslintignore rename to packages/auto-instrumentations-web/.eslintignore diff --git a/metapackages/auto-instrumentations-web/.eslintrc.js b/packages/auto-instrumentations-web/.eslintrc.js similarity index 100% rename from metapackages/auto-instrumentations-web/.eslintrc.js rename to packages/auto-instrumentations-web/.eslintrc.js diff --git a/metapackages/auto-instrumentations-web/CHANGELOG.md b/packages/auto-instrumentations-web/CHANGELOG.md similarity index 100% rename from metapackages/auto-instrumentations-web/CHANGELOG.md rename to packages/auto-instrumentations-web/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-container/LICENSE b/packages/auto-instrumentations-web/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/LICENSE rename to packages/auto-instrumentations-web/LICENSE diff --git a/metapackages/auto-instrumentations-web/README.md b/packages/auto-instrumentations-web/README.md similarity index 91% rename from metapackages/auto-instrumentations-web/README.md rename to packages/auto-instrumentations-web/README.md index e51b806e84..28344e446f 100644 --- a/metapackages/auto-instrumentations-web/README.md +++ b/packages/auto-instrumentations-web/README.md @@ -51,9 +51,9 @@ registerInstrumentations({ ## Supported instrumentations -- [@opentelemetry/instrumentation-document-load](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load) +- [@opentelemetry/instrumentation-document-load](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-document-load) - [@opentelemetry/instrumentation-fetch](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch) -- [@opentelemetry/instrumentation-user-interaction](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-user-interaction) +- [@opentelemetry/instrumentation-user-interaction](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-user-interaction) - [@opentelemetry/instrumentation-xml-http-request](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request) ## Useful links diff --git a/metapackages/auto-instrumentations-web/karma.conf.js b/packages/auto-instrumentations-web/karma.conf.js similarity index 100% rename from metapackages/auto-instrumentations-web/karma.conf.js rename to packages/auto-instrumentations-web/karma.conf.js diff --git a/metapackages/auto-instrumentations-web/package.json b/packages/auto-instrumentations-web/package.json similarity index 91% rename from metapackages/auto-instrumentations-web/package.json rename to packages/auto-instrumentations-web/package.json index e54cddd429..45974b3193 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/packages/auto-instrumentations-web/package.json @@ -3,7 +3,7 @@ "version": "0.48.1", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-web#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/auto-instrumentations-web#readme", "license": "Apache-2.0", "engines": { "node": "^18.19.0 || >=20.6.0" @@ -15,7 +15,11 @@ "module": "build/esm/index.js", "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/auto-instrumentations-web" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-web", diff --git a/metapackages/auto-instrumentations-web/src/index.ts b/packages/auto-instrumentations-web/src/index.ts similarity index 100% rename from metapackages/auto-instrumentations-web/src/index.ts rename to packages/auto-instrumentations-web/src/index.ts diff --git a/metapackages/auto-instrumentations-web/src/utils.ts b/packages/auto-instrumentations-web/src/utils.ts similarity index 100% rename from metapackages/auto-instrumentations-web/src/utils.ts rename to packages/auto-instrumentations-web/src/utils.ts diff --git a/metapackages/auto-instrumentations-web/test/index-webpack.ts b/packages/auto-instrumentations-web/test/index-webpack.ts similarity index 100% rename from metapackages/auto-instrumentations-web/test/index-webpack.ts rename to packages/auto-instrumentations-web/test/index-webpack.ts diff --git a/metapackages/auto-instrumentations-web/test/utils.test.ts b/packages/auto-instrumentations-web/test/utils.test.ts similarity index 100% rename from metapackages/auto-instrumentations-web/test/utils.test.ts rename to packages/auto-instrumentations-web/test/utils.test.ts diff --git a/metapackages/auto-instrumentations-web/tsconfig.esm.json b/packages/auto-instrumentations-web/tsconfig.esm.json similarity index 100% rename from metapackages/auto-instrumentations-web/tsconfig.esm.json rename to packages/auto-instrumentations-web/tsconfig.esm.json diff --git a/metapackages/auto-instrumentations-web/tsconfig.esnext.json b/packages/auto-instrumentations-web/tsconfig.esnext.json similarity index 100% rename from metapackages/auto-instrumentations-web/tsconfig.esnext.json rename to packages/auto-instrumentations-web/tsconfig.esnext.json diff --git a/metapackages/auto-instrumentations-web/tsconfig.json b/packages/auto-instrumentations-web/tsconfig.json similarity index 100% rename from metapackages/auto-instrumentations-web/tsconfig.json rename to packages/auto-instrumentations-web/tsconfig.json diff --git a/packages/baggage-log-record-processor/package.json b/packages/baggage-log-record-processor/package.json index 9801e6d2ad..9fa37aac11 100644 --- a/packages/baggage-log-record-processor/package.json +++ b/packages/baggage-log-record-processor/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry Baggage Log Record Processor", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/baggage-log-record-processor" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/baggage-log-record-processor", diff --git a/packages/baggage-span-processor/package.json b/packages/baggage-span-processor/package.json index 30f506c7ae..eb29241698 100644 --- a/packages/baggage-span-processor/package.json +++ b/packages/baggage-span-processor/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry Baggage Span Processor for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/baggage-span-processor" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/baggage-span-processor", diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.eslintignore b/packages/contrib-test-utils/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/.eslintignore rename to packages/contrib-test-utils/.eslintignore diff --git a/packages/opentelemetry-host-metrics/.eslintrc.js b/packages/contrib-test-utils/.eslintrc.js similarity index 100% rename from packages/opentelemetry-host-metrics/.eslintrc.js rename to packages/contrib-test-utils/.eslintrc.js diff --git a/packages/opentelemetry-test-utils/CHANGELOG.md b/packages/contrib-test-utils/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-test-utils/CHANGELOG.md rename to packages/contrib-test-utils/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-gcp/LICENSE b/packages/contrib-test-utils/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/LICENSE rename to packages/contrib-test-utils/LICENSE diff --git a/packages/opentelemetry-test-utils/README.md b/packages/contrib-test-utils/README.md similarity index 100% rename from packages/opentelemetry-test-utils/README.md rename to packages/contrib-test-utils/README.md diff --git a/packages/opentelemetry-test-utils/package.json b/packages/contrib-test-utils/package.json similarity index 87% rename from packages/opentelemetry-test-utils/package.json rename to packages/contrib-test-utils/package.json index 9aeb241dd9..94098516a6 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/contrib-test-utils/package.json @@ -15,7 +15,11 @@ "prepublishOnly": "npm run compile", "watch": "tsc -w" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/contrib-test-utils" + }, "keywords": [ "opentelemetry", "contrib-test-utils" @@ -33,7 +37,7 @@ "bugs": { "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-test-utils#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/contrib-test-utils#readme", "peerDependencies": { "@opentelemetry/api": "^1.3.0" }, diff --git a/packages/opentelemetry-test-utils/src/index.ts b/packages/contrib-test-utils/src/index.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/index.ts rename to packages/contrib-test-utils/src/index.ts diff --git a/packages/opentelemetry-test-utils/src/instrumentations/index.ts b/packages/contrib-test-utils/src/instrumentations/index.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/instrumentations/index.ts rename to packages/contrib-test-utils/src/instrumentations/index.ts diff --git a/packages/opentelemetry-test-utils/src/instrumentations/instrumentation-singleton.ts b/packages/contrib-test-utils/src/instrumentations/instrumentation-singleton.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/instrumentations/instrumentation-singleton.ts rename to packages/contrib-test-utils/src/instrumentations/instrumentation-singleton.ts diff --git a/packages/opentelemetry-test-utils/src/instrumentations/otel-default-provider.ts b/packages/contrib-test-utils/src/instrumentations/otel-default-provider.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/instrumentations/otel-default-provider.ts rename to packages/contrib-test-utils/src/instrumentations/otel-default-provider.ts diff --git a/packages/opentelemetry-test-utils/src/instrumentations/otel-provider-api.ts b/packages/contrib-test-utils/src/instrumentations/otel-provider-api.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/instrumentations/otel-provider-api.ts rename to packages/contrib-test-utils/src/instrumentations/otel-provider-api.ts diff --git a/packages/opentelemetry-test-utils/src/otlp-types.ts b/packages/contrib-test-utils/src/otlp-types.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/otlp-types.ts rename to packages/contrib-test-utils/src/otlp-types.ts diff --git a/packages/opentelemetry-test-utils/src/resource-assertions.ts b/packages/contrib-test-utils/src/resource-assertions.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/resource-assertions.ts rename to packages/contrib-test-utils/src/resource-assertions.ts diff --git a/packages/opentelemetry-test-utils/src/test-fixtures.ts b/packages/contrib-test-utils/src/test-fixtures.ts similarity index 100% rename from packages/opentelemetry-test-utils/src/test-fixtures.ts rename to packages/contrib-test-utils/src/test-fixtures.ts diff --git a/packages/opentelemetry-test-utils/src/test-utils.ts b/packages/contrib-test-utils/src/test-utils.ts similarity index 98% rename from packages/opentelemetry-test-utils/src/test-utils.ts rename to packages/contrib-test-utils/src/test-utils.ts index 2fe2a2785d..fdcc0b6e4a 100644 --- a/packages/opentelemetry-test-utils/src/test-utils.ts +++ b/packages/contrib-test-utils/src/test-utils.ts @@ -157,7 +157,7 @@ export const getPackageVersion = (packageName: string) => { // With npm workspaces, `require.main` could be in the top-level node_modules, // e.g. "/node_modules/mocha/bin/mocha" when running mocha tests, while // the target package could be installed in a workspace subdir, e.g. - // "/plugins/node/opentelemetry-instrumentation/mysql2" for + // "/packages/instrumentation/mysql2" for // "test-all-versions" tests that tend to install conflicting package // versions. Prefix the search paths with the cwd to include the workspace // dir. diff --git a/packages/opentelemetry-test-utils/tsconfig.json b/packages/contrib-test-utils/tsconfig.json similarity index 100% rename from packages/opentelemetry-test-utils/tsconfig.json rename to packages/contrib-test-utils/tsconfig.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/.eslintignore b/packages/host-metrics/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/.eslintignore rename to packages/host-metrics/.eslintignore diff --git a/packages/opentelemetry-propagation-utils/.eslintrc.js b/packages/host-metrics/.eslintrc.js similarity index 100% rename from packages/opentelemetry-propagation-utils/.eslintrc.js rename to packages/host-metrics/.eslintrc.js diff --git a/packages/opentelemetry-host-metrics/CHANGELOG.md b/packages/host-metrics/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-host-metrics/CHANGELOG.md rename to packages/host-metrics/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-github/LICENSE b/packages/host-metrics/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/LICENSE rename to packages/host-metrics/LICENSE diff --git a/packages/opentelemetry-host-metrics/README.md b/packages/host-metrics/README.md similarity index 100% rename from packages/opentelemetry-host-metrics/README.md rename to packages/host-metrics/README.md diff --git a/packages/opentelemetry-host-metrics/global.d.ts b/packages/host-metrics/global.d.ts similarity index 100% rename from packages/opentelemetry-host-metrics/global.d.ts rename to packages/host-metrics/global.d.ts diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/host-metrics/package.json similarity index 87% rename from packages/opentelemetry-host-metrics/package.json rename to packages/host-metrics/package.json index 53f15015a5..1d93e5723b 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/host-metrics/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry Host Metrics for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/host-metrics" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/host-metrics", @@ -55,5 +59,5 @@ "dependencies": { "systeminformation": "5.23.8" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/host-metrics#readme" } diff --git a/packages/opentelemetry-host-metrics/src/BaseMetrics.ts b/packages/host-metrics/src/BaseMetrics.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/BaseMetrics.ts rename to packages/host-metrics/src/BaseMetrics.ts diff --git a/packages/opentelemetry-host-metrics/src/enum.ts b/packages/host-metrics/src/enum.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/enum.ts rename to packages/host-metrics/src/enum.ts diff --git a/packages/opentelemetry-host-metrics/src/index.ts b/packages/host-metrics/src/index.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/index.ts rename to packages/host-metrics/src/index.ts diff --git a/packages/opentelemetry-host-metrics/src/metric.ts b/packages/host-metrics/src/metric.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/metric.ts rename to packages/host-metrics/src/metric.ts diff --git a/packages/opentelemetry-host-metrics/src/stats/common.ts b/packages/host-metrics/src/stats/common.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/stats/common.ts rename to packages/host-metrics/src/stats/common.ts diff --git a/packages/opentelemetry-host-metrics/src/stats/si.ts b/packages/host-metrics/src/stats/si.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/stats/si.ts rename to packages/host-metrics/src/stats/si.ts diff --git a/packages/opentelemetry-host-metrics/src/types.ts b/packages/host-metrics/src/types.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/types.ts rename to packages/host-metrics/src/types.ts diff --git a/packages/opentelemetry-host-metrics/src/util.ts b/packages/host-metrics/src/util.ts similarity index 100% rename from packages/opentelemetry-host-metrics/src/util.ts rename to packages/host-metrics/src/util.ts diff --git a/packages/opentelemetry-host-metrics/test/metric.test.ts b/packages/host-metrics/test/metric.test.ts similarity index 100% rename from packages/opentelemetry-host-metrics/test/metric.test.ts rename to packages/host-metrics/test/metric.test.ts diff --git a/packages/opentelemetry-host-metrics/test/mocks/cpu.json b/packages/host-metrics/test/mocks/cpu.json similarity index 100% rename from packages/opentelemetry-host-metrics/test/mocks/cpu.json rename to packages/host-metrics/test/mocks/cpu.json diff --git a/packages/opentelemetry-host-metrics/test/mocks/network.json b/packages/host-metrics/test/mocks/network.json similarity index 100% rename from packages/opentelemetry-host-metrics/test/mocks/network.json rename to packages/host-metrics/test/mocks/network.json diff --git a/packages/opentelemetry-host-metrics/test/mocks/process.json b/packages/host-metrics/test/mocks/process.json similarity index 100% rename from packages/opentelemetry-host-metrics/test/mocks/process.json rename to packages/host-metrics/test/mocks/process.json diff --git a/packages/opentelemetry-host-metrics/tsconfig.json b/packages/host-metrics/tsconfig.json similarity index 100% rename from packages/opentelemetry-host-metrics/tsconfig.json rename to packages/host-metrics/tsconfig.json diff --git a/detectors/node/opentelemetry-resource-detector-azure/.eslintignore b/packages/id-generator-aws-xray/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/.eslintignore rename to packages/id-generator-aws-xray/.eslintignore diff --git a/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js b/packages/id-generator-aws-xray/.eslintrc.js similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/.eslintrc.js rename to packages/id-generator-aws-xray/.eslintrc.js diff --git a/packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md b/packages/id-generator-aws-xray/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/CHANGELOG.md rename to packages/id-generator-aws-xray/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-instana/LICENSE b/packages/id-generator-aws-xray/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/LICENSE rename to packages/id-generator-aws-xray/LICENSE diff --git a/packages/opentelemetry-id-generator-aws-xray/README.md b/packages/id-generator-aws-xray/README.md similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/README.md rename to packages/id-generator-aws-xray/README.md diff --git a/packages/opentelemetry-id-generator-aws-xray/karma.conf.js b/packages/id-generator-aws-xray/karma.conf.js similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/karma.conf.js rename to packages/id-generator-aws-xray/karma.conf.js diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/id-generator-aws-xray/package.json similarity index 91% rename from packages/opentelemetry-id-generator-aws-xray/package.json rename to packages/id-generator-aws-xray/package.json index bbd5af7935..0b8aac94ab 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/id-generator-aws-xray/package.json @@ -13,7 +13,11 @@ "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/id-generator-aws-xray" + }, "scripts": { "setup:dev": "nx run-many -t compile -p @opentelemetry/id-generator-aws-xray", "compile": "tsc --build tsconfig.json tsconfig.esm.json", @@ -78,5 +82,5 @@ "dependencies": { "@opentelemetry/sdk-trace-base": "^2.0.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-id-generator-aws-xray#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/id-generator-aws-xray#readme" } diff --git a/packages/opentelemetry-id-generator-aws-xray/src/index.ts b/packages/id-generator-aws-xray/src/index.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/index.ts rename to packages/id-generator-aws-xray/src/index.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/src/internal/xray-id-generation.ts b/packages/id-generator-aws-xray/src/internal/xray-id-generation.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/internal/xray-id-generation.ts rename to packages/id-generator-aws-xray/src/internal/xray-id-generation.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AWSXRayIdGenerator.ts b/packages/id-generator-aws-xray/src/platform/browser/AWSXRayIdGenerator.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AWSXRayIdGenerator.ts rename to packages/id-generator-aws-xray/src/platform/browser/AWSXRayIdGenerator.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts b/packages/id-generator-aws-xray/src/platform/browser/index.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts rename to packages/id-generator-aws-xray/src/platform/browser/index.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/index.ts b/packages/id-generator-aws-xray/src/platform/index.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/platform/index.ts rename to packages/id-generator-aws-xray/src/platform/index.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AWSXRayIdGenerator.ts b/packages/id-generator-aws-xray/src/platform/node/AWSXRayIdGenerator.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/platform/node/AWSXRayIdGenerator.ts rename to packages/id-generator-aws-xray/src/platform/node/AWSXRayIdGenerator.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts b/packages/id-generator-aws-xray/src/platform/node/index.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts rename to packages/id-generator-aws-xray/src/platform/node/index.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/test/AWSXrayIdGenerator.test.ts b/packages/id-generator-aws-xray/test/AWSXrayIdGenerator.test.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/test/AWSXrayIdGenerator.test.ts rename to packages/id-generator-aws-xray/test/AWSXrayIdGenerator.test.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/test/index-webpack.ts b/packages/id-generator-aws-xray/test/index-webpack.ts similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/test/index-webpack.ts rename to packages/id-generator-aws-xray/test/index-webpack.ts diff --git a/packages/opentelemetry-id-generator-aws-xray/tsconfig.esm.json b/packages/id-generator-aws-xray/tsconfig.esm.json similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/tsconfig.esm.json rename to packages/id-generator-aws-xray/tsconfig.esm.json diff --git a/packages/opentelemetry-id-generator-aws-xray/tsconfig.json b/packages/id-generator-aws-xray/tsconfig.json similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/tsconfig.json rename to packages/id-generator-aws-xray/tsconfig.json diff --git a/detectors/node/opentelemetry-resource-detector-container/.eslintignore b/packages/instrumentation-amqplib/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/.eslintignore rename to packages/instrumentation-amqplib/.eslintignore diff --git a/packages/opentelemetry-redis-common/.eslintrc.js b/packages/instrumentation-amqplib/.eslintrc.js similarity index 100% rename from packages/opentelemetry-redis-common/.eslintrc.js rename to packages/instrumentation-amqplib/.eslintrc.js diff --git a/plugins/node/instrumentation-amqplib/.tav.yml b/packages/instrumentation-amqplib/.tav.yml similarity index 100% rename from plugins/node/instrumentation-amqplib/.tav.yml rename to packages/instrumentation-amqplib/.tav.yml diff --git a/plugins/node/instrumentation-amqplib/CHANGELOG.md b/packages/instrumentation-amqplib/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-amqplib/CHANGELOG.md rename to packages/instrumentation-amqplib/CHANGELOG.md diff --git a/metapackages/auto-configuration-propagators/LICENSE b/packages/instrumentation-amqplib/LICENSE similarity index 100% rename from metapackages/auto-configuration-propagators/LICENSE rename to packages/instrumentation-amqplib/LICENSE diff --git a/plugins/node/instrumentation-amqplib/README.md b/packages/instrumentation-amqplib/README.md similarity index 100% rename from plugins/node/instrumentation-amqplib/README.md rename to packages/instrumentation-amqplib/README.md diff --git a/plugins/node/instrumentation-amqplib/package.json b/packages/instrumentation-amqplib/package.json similarity index 85% rename from plugins/node/instrumentation-amqplib/package.json rename to packages/instrumentation-amqplib/package.json index 1fdae36d46..dc49fed88d 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/packages/instrumentation-amqplib/package.json @@ -8,7 +8,7 @@ "rabbitmq", "AMQP 0-9-1" ], - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-amqplib#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-amqplib#readme", "license": "Apache-2.0", "author": "OpenTelemetry Authors", "bugs": { @@ -24,19 +24,23 @@ "publishConfig": { "access": "public" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-amqplib" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-amqplib", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w", "test:docker:run": "docker run -d --hostname demo-amqplib-rabbit --name amqplib-unittests -p 22221:5672 --env RABBITMQ_DEFAULT_USER=username --env RABBITMQ_DEFAULT_PASS=password rabbitmq:3" }, diff --git a/plugins/node/instrumentation-amqplib/src/amqplib.ts b/packages/instrumentation-amqplib/src/amqplib.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/src/amqplib.ts rename to packages/instrumentation-amqplib/src/amqplib.ts diff --git a/plugins/node/instrumentation-amqplib/src/index.ts b/packages/instrumentation-amqplib/src/index.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/src/index.ts rename to packages/instrumentation-amqplib/src/index.ts diff --git a/plugins/node/instrumentation-amqplib/src/types.ts b/packages/instrumentation-amqplib/src/types.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/src/types.ts rename to packages/instrumentation-amqplib/src/types.ts diff --git a/plugins/node/instrumentation-amqplib/src/utils.ts b/packages/instrumentation-amqplib/src/utils.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/src/utils.ts rename to packages/instrumentation-amqplib/src/utils.ts diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts b/packages/instrumentation-amqplib/test/amqplib-callbacks.test.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts rename to packages/instrumentation-amqplib/test/amqplib-callbacks.test.ts diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts b/packages/instrumentation-amqplib/test/amqplib-connection.test.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts rename to packages/instrumentation-amqplib/test/amqplib-connection.test.ts diff --git a/plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts b/packages/instrumentation-amqplib/test/amqplib-promise.test.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts rename to packages/instrumentation-amqplib/test/amqplib-promise.test.ts diff --git a/plugins/node/instrumentation-amqplib/test/config.ts b/packages/instrumentation-amqplib/test/config.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/test/config.ts rename to packages/instrumentation-amqplib/test/config.ts diff --git a/plugins/node/instrumentation-amqplib/test/utils.test.ts b/packages/instrumentation-amqplib/test/utils.test.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/test/utils.test.ts rename to packages/instrumentation-amqplib/test/utils.test.ts diff --git a/plugins/node/instrumentation-amqplib/test/utils.ts b/packages/instrumentation-amqplib/test/utils.ts similarity index 100% rename from plugins/node/instrumentation-amqplib/test/utils.ts rename to packages/instrumentation-amqplib/test/utils.ts diff --git a/packages/opentelemetry-propagation-utils/tsconfig.json b/packages/instrumentation-amqplib/tsconfig.json similarity index 100% rename from packages/opentelemetry-propagation-utils/tsconfig.json rename to packages/instrumentation-amqplib/tsconfig.json diff --git a/detectors/node/opentelemetry-resource-detector-gcp/.eslintignore b/packages/instrumentation-aws-lambda/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/.eslintignore rename to packages/instrumentation-aws-lambda/.eslintignore diff --git a/packages/opentelemetry-test-utils/.eslintrc.js b/packages/instrumentation-aws-lambda/.eslintrc.js similarity index 100% rename from packages/opentelemetry-test-utils/.eslintrc.js rename to packages/instrumentation-aws-lambda/.eslintrc.js diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md b/packages/instrumentation-aws-lambda/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md rename to packages/instrumentation-aws-lambda/CHANGELOG.md diff --git a/metapackages/auto-instrumentations-node/LICENSE b/packages/instrumentation-aws-lambda/LICENSE similarity index 100% rename from metapackages/auto-instrumentations-node/LICENSE rename to packages/instrumentation-aws-lambda/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md b/packages/instrumentation-aws-lambda/README.md similarity index 93% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/README.md rename to packages/instrumentation-aws-lambda/README.md index dd0568d652..84e96f275b 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md +++ b/packages/instrumentation-aws-lambda/README.md @@ -92,9 +92,9 @@ AWS Active Tracing can provide a parent context for the span generated by this i If you use version `<=0.46.0` of this package, then the Active Tracing context is used as the parent context by default if present. In this case, in order to prevent broken traces, set the `disableAwsContextPropagation` option to `false`. Additional propagators can be added in the TracerProvider configuration. -If you use version `>0.46.0`, the Active Tracing context is no longer used by default. In order to enable it, include the [AWSXRayLambdaPropagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray-lambda) propagator in the list of propagators provided to the TracerProvider via its configuration, or by including `xray-lambda` in the OTEL_PROPAGATORS environment variable (see the example below on using the env variable). +If you use version `>0.46.0`, the Active Tracing context is no longer used by default. In order to enable it, include the [AWSXRayLambdaPropagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray-lambda) propagator in the list of propagators provided to the TracerProvider via its configuration, or by including `xray-lambda` in the OTEL_PROPAGATORS environment variable (see the example below on using the env variable). -Note that there are two AWS-related propagators: [AWSXRayPropagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray) and [AWSXRayLambdaPropagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray-lambda). Here is a guideline for when to use one or the other: +Note that there are two AWS-related propagators: [AWSXRayPropagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray) and [AWSXRayLambdaPropagator](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray-lambda). Here is a guideline for when to use one or the other: - If you export traces to AWS X-Ray, then use the `AWSXRayLambdaPropagator` or the `xray-lambda` value in the OTEL_PROPAGATORS environment variable. This will handle the active tracing lambda context as well as X-Ray HTTP headers. - If you export traces to a backend other than AWS X-Ray, then use the `AWSXrayPropagator` or `xray` in the environment variable. This propagator only handles the X-Ray HTTP headers. @@ -113,7 +113,7 @@ provider.register({ }); ``` -Alternatively, use the `getPropagators()` function from the [auto-configuration-propagators](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/metapackages/auto-configuration-propagators/README.md) package, and set the OTEL_PROPAGATORS environment variable to `xray-lambda`. +Alternatively, use the `getPropagators()` function from the [auto-configuration-propagators](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/auto-configuration-propagators/README.md) package, and set the OTEL_PROPAGATORS environment variable to `xray-lambda`. ```js const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node'); diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/packages/instrumentation-aws-lambda/package.json similarity index 83% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/package.json rename to packages/instrumentation-aws-lambda/package.json index b84de8001a..d1ddc0e616 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/packages/instrumentation-aws-lambda/package.json @@ -4,16 +4,20 @@ "description": "OpenTelemetry instrumentation for AWS Lambda function invocations", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-aws-lambda" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-aws-lambda", "compile": "tsc -p ." }, @@ -60,5 +64,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@types/aws-lambda": "8.10.150" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-aws-lambda#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/index.ts b/packages/instrumentation-aws-lambda/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/src/index.ts rename to packages/instrumentation-aws-lambda/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts b/packages/instrumentation-aws-lambda/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts rename to packages/instrumentation-aws-lambda/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/internal-types.ts b/packages/instrumentation-aws-lambda/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/src/internal-types.ts rename to packages/instrumentation-aws-lambda/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/semconv.ts b/packages/instrumentation-aws-lambda/src/semconv.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/src/semconv.ts rename to packages/instrumentation-aws-lambda/src/semconv.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/types.ts b/packages/instrumentation-aws-lambda/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/src/types.ts rename to packages/instrumentation-aws-lambda/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.force-flush.test.ts b/packages/instrumentation-aws-lambda/test/integrations/lambda-handler.force-flush.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.force-flush.test.ts rename to packages/instrumentation-aws-lambda/test/integrations/lambda-handler.force-flush.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts b/packages/instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts rename to packages/instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/async.js b/packages/instrumentation-aws-lambda/test/lambda-test/async.js similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/async.js rename to packages/instrumentation-aws-lambda/test/lambda-test/async.js diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/commonjs.cjs b/packages/instrumentation-aws-lambda/test/lambda-test/commonjs.cjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/commonjs.cjs rename to packages/instrumentation-aws-lambda/test/lambda-test/commonjs.cjs diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/package.json b/packages/instrumentation-aws-lambda/test/lambda-test/package.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/package.json rename to packages/instrumentation-aws-lambda/test/lambda-test/package.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/sync.js b/packages/instrumentation-aws-lambda/test/lambda-test/sync.js similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/test/lambda-test/sync.js rename to packages/instrumentation-aws-lambda/test/lambda-test/sync.js diff --git a/packages/opentelemetry-redis-common/tsconfig.json b/packages/instrumentation-aws-lambda/tsconfig.json similarity index 100% rename from packages/opentelemetry-redis-common/tsconfig.json rename to packages/instrumentation-aws-lambda/tsconfig.json diff --git a/detectors/node/opentelemetry-resource-detector-github/.eslintignore b/packages/instrumentation-aws-sdk/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/.eslintignore rename to packages/instrumentation-aws-sdk/.eslintignore diff --git a/propagators/opentelemetry-propagator-instana/.eslintrc.js b/packages/instrumentation-aws-sdk/.eslintrc.js similarity index 100% rename from propagators/opentelemetry-propagator-instana/.eslintrc.js rename to packages/instrumentation-aws-sdk/.eslintrc.js diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml b/packages/instrumentation-aws-sdk/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml rename to packages/instrumentation-aws-sdk/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md b/packages/instrumentation-aws-sdk/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md rename to packages/instrumentation-aws-sdk/CHANGELOG.md diff --git a/metapackages/auto-instrumentations-web/LICENSE b/packages/instrumentation-aws-sdk/LICENSE similarity index 100% rename from metapackages/auto-instrumentations-web/LICENSE rename to packages/instrumentation-aws-sdk/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/README.md b/packages/instrumentation-aws-sdk/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/README.md rename to packages/instrumentation-aws-sdk/README.md diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/doc/lambda.md b/packages/instrumentation-aws-sdk/doc/lambda.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/doc/lambda.md rename to packages/instrumentation-aws-sdk/doc/lambda.md diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/doc/sns.md b/packages/instrumentation-aws-sdk/doc/sns.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/doc/sns.md rename to packages/instrumentation-aws-sdk/doc/sns.md diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/doc/sqs.md b/packages/instrumentation-aws-sdk/doc/sqs.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/doc/sqs.md rename to packages/instrumentation-aws-sdk/doc/sqs.md diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/packages/instrumentation-aws-sdk/package.json similarity index 87% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/package.json rename to packages/instrumentation-aws-sdk/package.json index 4d9d0e90fa..b80752393e 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/packages/instrumentation-aws-sdk/package.json @@ -8,7 +8,7 @@ "nodejs", "opentelemetry" ], - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-sdk#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-aws-sdk#readme", "license": "Apache-2.0", "author": "OpenTelemetry Authors", "bugs": { @@ -25,19 +25,23 @@ "publishConfig": { "access": "public" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-aws-sdk" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-aws-sdk", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "peerDependencies": { diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts b/packages/instrumentation-aws-sdk/src/aws-sdk.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts rename to packages/instrumentation-aws-sdk/src/aws-sdk.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.types.ts b/packages/instrumentation-aws-sdk/src/aws-sdk.types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.types.ts rename to packages/instrumentation-aws-sdk/src/aws-sdk.types.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/enums.ts b/packages/instrumentation-aws-sdk/src/enums.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/enums.ts rename to packages/instrumentation-aws-sdk/src/enums.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/index.ts b/packages/instrumentation-aws-sdk/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/index.ts rename to packages/instrumentation-aws-sdk/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/propwrap.ts b/packages/instrumentation-aws-sdk/src/propwrap.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/propwrap.ts rename to packages/instrumentation-aws-sdk/src/propwrap.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/semconv.ts b/packages/instrumentation-aws-sdk/src/semconv.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/semconv.ts rename to packages/instrumentation-aws-sdk/src/semconv.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/MessageAttributes.ts b/packages/instrumentation-aws-sdk/src/services/MessageAttributes.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/MessageAttributes.ts rename to packages/instrumentation-aws-sdk/src/services/MessageAttributes.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/ServiceExtension.ts b/packages/instrumentation-aws-sdk/src/services/ServiceExtension.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/ServiceExtension.ts rename to packages/instrumentation-aws-sdk/src/services/ServiceExtension.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/ServicesExtensions.ts b/packages/instrumentation-aws-sdk/src/services/ServicesExtensions.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/ServicesExtensions.ts rename to packages/instrumentation-aws-sdk/src/services/ServicesExtensions.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/bedrock-runtime.ts b/packages/instrumentation-aws-sdk/src/services/bedrock-runtime.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/bedrock-runtime.ts rename to packages/instrumentation-aws-sdk/src/services/bedrock-runtime.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts b/packages/instrumentation-aws-sdk/src/services/dynamodb.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/dynamodb.ts rename to packages/instrumentation-aws-sdk/src/services/dynamodb.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/index.ts b/packages/instrumentation-aws-sdk/src/services/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/index.ts rename to packages/instrumentation-aws-sdk/src/services/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/kinesis.ts b/packages/instrumentation-aws-sdk/src/services/kinesis.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/kinesis.ts rename to packages/instrumentation-aws-sdk/src/services/kinesis.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/lambda.ts b/packages/instrumentation-aws-sdk/src/services/lambda.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/lambda.ts rename to packages/instrumentation-aws-sdk/src/services/lambda.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/s3.ts b/packages/instrumentation-aws-sdk/src/services/s3.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/s3.ts rename to packages/instrumentation-aws-sdk/src/services/s3.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sns.ts b/packages/instrumentation-aws-sdk/src/services/sns.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sns.ts rename to packages/instrumentation-aws-sdk/src/services/sns.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sqs.ts b/packages/instrumentation-aws-sdk/src/services/sqs.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sqs.ts rename to packages/instrumentation-aws-sdk/src/services/sqs.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/types.ts b/packages/instrumentation-aws-sdk/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/types.ts rename to packages/instrumentation-aws-sdk/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/src/utils.ts b/packages/instrumentation-aws-sdk/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/src/utils.ts rename to packages/instrumentation-aws-sdk/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts b/packages/instrumentation-aws-sdk/test/MessageAttributes.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts rename to packages/instrumentation-aws-sdk/test/MessageAttributes.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3-s3.test.ts b/packages/instrumentation-aws-sdk/test/aws-sdk-v3-s3.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3-s3.test.ts rename to packages/instrumentation-aws-sdk/test/aws-sdk-v3-s3.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3-sqs.test.ts b/packages/instrumentation-aws-sdk/test/aws-sdk-v3-sqs.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3-sqs.test.ts rename to packages/instrumentation-aws-sdk/test/aws-sdk-v3-sqs.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/bedrock-runtime.test.ts b/packages/instrumentation-aws-sdk/test/bedrock-runtime.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/bedrock-runtime.test.ts rename to packages/instrumentation-aws-sdk/test/bedrock-runtime.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/kinesis.test.ts b/packages/instrumentation-aws-sdk/test/kinesis.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/kinesis.test.ts rename to packages/instrumentation-aws-sdk/test/kinesis.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts b/packages/instrumentation-aws-sdk/test/lambda.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts rename to packages/instrumentation-aws-sdk/test/lambda.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/load-instrumentation.ts b/packages/instrumentation-aws-sdk/test/load-instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/load-instrumentation.ts rename to packages/instrumentation-aws-sdk/test/load-instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-converse-adds-genai-conventions.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-converse-adds-genai-conventions.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-converse-adds-genai-conventions.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-converse-adds-genai-conventions.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-conversestream-adds-genai-conventions.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-conversestream-adds-genai-conventions.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-conversestream-adds-genai-conventions.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-conversestream-adds-genai-conventions.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-nova-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-nova-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-nova-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-nova-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-titan-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-titan-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-titan-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-amazon-titan-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-anthropic-claude-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-anthropic-claude-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-anthropic-claude-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-anthropic-claude-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-r-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-r-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-r-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-cohere-command-r-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-meta-llama-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-meta-llama-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-meta-llama-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-meta-llama-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-mistral-ai-model-attributes-to-span.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-mistral-ai-model-attributes-to-span.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-mistral-ai-model-attributes-to-span.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-adds-mistral-ai-model-attributes-to-span.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-does-not-currently-add-genai-conventions.json b/packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-does-not-currently-add-genai-conventions.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-does-not-currently-add-genai-conventions.json rename to packages/instrumentation-aws-sdk/test/mock-responses/bedrock-invokemodel-does-not-currently-add-genai-conventions.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/invalid-bucket.xml b/packages/instrumentation-aws-sdk/test/mock-responses/invalid-bucket.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/invalid-bucket.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/invalid-bucket.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/kinesis-describe-stream.json b/packages/instrumentation-aws-sdk/test/mock-responses/kinesis-describe-stream.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/kinesis-describe-stream.json rename to packages/instrumentation-aws-sdk/test/mock-responses/kinesis-describe-stream.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/s3-put-object.xml b/packages/instrumentation-aws-sdk/test/mock-responses/s3-put-object.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/s3-put-object.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/s3-put-object.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sns-create-topic.xml b/packages/instrumentation-aws-sdk/test/mock-responses/sns-create-topic.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sns-create-topic.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/sns-create-topic.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sns-publish.xml b/packages/instrumentation-aws-sdk/test/mock-responses/sns-publish.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sns-publish.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/sns-publish.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-receive.json b/packages/instrumentation-aws-sdk/test/mock-responses/sqs-receive.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-receive.json rename to packages/instrumentation-aws-sdk/test/mock-responses/sqs-receive.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-receive.xml b/packages/instrumentation-aws-sdk/test/mock-responses/sqs-receive.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-receive.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/sqs-receive.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.json b/packages/instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.json rename to packages/instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.xml b/packages/instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/sqs-send-batch.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send.json b/packages/instrumentation-aws-sdk/test/mock-responses/sqs-send.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send.json rename to packages/instrumentation-aws-sdk/test/mock-responses/sqs-send.json diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send.xml b/packages/instrumentation-aws-sdk/test/mock-responses/sqs-send.xml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/mock-responses/sqs-send.xml rename to packages/instrumentation-aws-sdk/test/mock-responses/sqs-send.xml diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/s3.test.ts b/packages/instrumentation-aws-sdk/test/s3.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/s3.test.ts rename to packages/instrumentation-aws-sdk/test/s3.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts b/packages/instrumentation-aws-sdk/test/sns.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/test/sns.test.ts rename to packages/instrumentation-aws-sdk/test/sns.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/tsconfig.json b/packages/instrumentation-aws-sdk/tsconfig.json similarity index 78% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/tsconfig.json rename to packages/instrumentation-aws-sdk/tsconfig.json index 505b67a248..134a5b57c6 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/tsconfig.json +++ b/packages/instrumentation-aws-sdk/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/detectors/node/opentelemetry-resource-detector-instana/.eslintignore b/packages/instrumentation-bunyan/.eslintignore similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/.eslintignore rename to packages/instrumentation-bunyan/.eslintignore diff --git a/plugins/node/instrumentation-amqplib/.eslintrc.js b/packages/instrumentation-bunyan/.eslintrc.js similarity index 65% rename from plugins/node/instrumentation-amqplib/.eslintrc.js rename to packages/instrumentation-bunyan/.eslintrc.js index f756f4488b..d9630e1c33 100644 --- a/plugins/node/instrumentation-amqplib/.eslintrc.js +++ b/packages/instrumentation-bunyan/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js'), } diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/.tav.yml b/packages/instrumentation-bunyan/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/.tav.yml rename to packages/instrumentation-bunyan/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md b/packages/instrumentation-bunyan/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md rename to packages/instrumentation-bunyan/CHANGELOG.md diff --git a/packages/opentelemetry-host-metrics/LICENSE b/packages/instrumentation-bunyan/LICENSE similarity index 100% rename from packages/opentelemetry-host-metrics/LICENSE rename to packages/instrumentation-bunyan/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/README.md b/packages/instrumentation-bunyan/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/README.md rename to packages/instrumentation-bunyan/README.md diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/packages/instrumentation-bunyan/package.json similarity index 86% rename from plugins/node/opentelemetry-instrumentation-bunyan/package.json rename to packages/instrumentation-bunyan/package.json index f823803cbd..b3c4a65df0 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/packages/instrumentation-bunyan/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `bunyan` logger", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-bunyan" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-bunyan", @@ -15,7 +19,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "bunyan", @@ -64,5 +68,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@types/bunyan": "1.8.11" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-bunyan#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/OpenTelemetryBunyanStream.ts b/packages/instrumentation-bunyan/src/OpenTelemetryBunyanStream.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/src/OpenTelemetryBunyanStream.ts rename to packages/instrumentation-bunyan/src/OpenTelemetryBunyanStream.ts diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/index.ts b/packages/instrumentation-bunyan/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/src/index.ts rename to packages/instrumentation-bunyan/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts b/packages/instrumentation-bunyan/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts rename to packages/instrumentation-bunyan/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/types.ts b/packages/instrumentation-bunyan/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/src/types.ts rename to packages/instrumentation-bunyan/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts b/packages/instrumentation-bunyan/test/bunyan.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts rename to packages/instrumentation-bunyan/test/bunyan.test.ts diff --git a/propagators/opentelemetry-propagator-instana/tsconfig.json b/packages/instrumentation-bunyan/tsconfig.json similarity index 100% rename from propagators/opentelemetry-propagator-instana/tsconfig.json rename to packages/instrumentation-bunyan/tsconfig.json diff --git a/packages/opentelemetry-host-metrics/.eslintignore b/packages/instrumentation-cassandra-driver/.eslintignore similarity index 100% rename from packages/opentelemetry-host-metrics/.eslintignore rename to packages/instrumentation-cassandra-driver/.eslintignore diff --git a/plugins/node/instrumentation-cucumber/.eslintrc.js b/packages/instrumentation-cassandra-driver/.eslintrc.js similarity index 65% rename from plugins/node/instrumentation-cucumber/.eslintrc.js rename to packages/instrumentation-cassandra-driver/.eslintrc.js index f756f4488b..d9630e1c33 100644 --- a/plugins/node/instrumentation-cucumber/.eslintrc.js +++ b/packages/instrumentation-cassandra-driver/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js'), } diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md b/packages/instrumentation-cassandra-driver/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md rename to packages/instrumentation-cassandra-driver/CHANGELOG.md diff --git a/packages/opentelemetry-id-generator-aws-xray/LICENSE b/packages/instrumentation-cassandra-driver/LICENSE similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/LICENSE rename to packages/instrumentation-cassandra-driver/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/README.md b/packages/instrumentation-cassandra-driver/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/README.md rename to packages/instrumentation-cassandra-driver/README.md diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/packages/instrumentation-cassandra-driver/package.json similarity index 83% rename from plugins/node/opentelemetry-instrumentation-cassandra/package.json rename to packages/instrumentation-cassandra-driver/package.json index 1781d2f3d9..fac392bba5 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/packages/instrumentation-cassandra-driver/package.json @@ -4,16 +4,20 @@ "description": "OpenTelemetry instrumentation for `cassandra-driver` database client library for Apache Cassandra", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-cassandra-driver" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-cassandra-driver", "compile": "tsc -p ." }, @@ -62,5 +66,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-cassandra-driver#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/src/index.ts b/packages/instrumentation-cassandra-driver/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/src/index.ts rename to packages/instrumentation-cassandra-driver/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/src/instrumentation.ts b/packages/instrumentation-cassandra-driver/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/src/instrumentation.ts rename to packages/instrumentation-cassandra-driver/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/src/types.ts b/packages/instrumentation-cassandra-driver/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/src/types.ts rename to packages/instrumentation-cassandra-driver/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts b/packages/instrumentation-cassandra-driver/test/cassandra-driver.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts rename to packages/instrumentation-cassandra-driver/test/cassandra-driver.test.ts diff --git a/propagators/opentelemetry-propagator-ot-trace/tsconfig.json b/packages/instrumentation-cassandra-driver/tsconfig.json similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/tsconfig.json rename to packages/instrumentation-cassandra-driver/tsconfig.json diff --git a/plugins/node/opentelemetry-instrumentation-connect/.eslintignore b/packages/instrumentation-connect/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/.eslintignore rename to packages/instrumentation-connect/.eslintignore diff --git a/plugins/node/instrumentation-kafkajs/.eslintrc.js b/packages/instrumentation-connect/.eslintrc.js similarity index 65% rename from plugins/node/instrumentation-kafkajs/.eslintrc.js rename to packages/instrumentation-connect/.eslintrc.js index f756f4488b..f726f3becb 100644 --- a/plugins/node/instrumentation-kafkajs/.eslintrc.js +++ b/packages/instrumentation-connect/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md b/packages/instrumentation-connect/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md rename to packages/instrumentation-connect/CHANGELOG.md diff --git a/packages/opentelemetry-propagation-utils/LICENSE b/packages/instrumentation-connect/LICENSE similarity index 100% rename from packages/opentelemetry-propagation-utils/LICENSE rename to packages/instrumentation-connect/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-connect/README.md b/packages/instrumentation-connect/README.md similarity index 94% rename from plugins/node/opentelemetry-instrumentation-connect/README.md rename to packages/instrumentation-connect/README.md index 36e8c1842b..68ab3b0994 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/README.md +++ b/packages/instrumentation-connect/README.md @@ -11,9 +11,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. ## Status -| Maturity | [Component Owner](../../../.github/component_owners.yml) | Compatibility | +| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility | | ----------------------------------------------------- | -------------------------------------------------------- | --------------------- | -| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | +| [Unmaintained](../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | ## Installation diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/packages/instrumentation-connect/package.json similarity index 82% rename from plugins/node/opentelemetry-instrumentation-connect/package.json rename to packages/instrumentation-connect/package.json index 9a58368051..96fea3f22d 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/packages/instrumentation-connect/package.json @@ -4,17 +4,21 @@ "description": "OpenTelemetry instrumentation for `connect` http middleware framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-connect" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-connect", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "test": "nyc mocha 'test/**/*.test.ts'", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -59,5 +63,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@types/connect": "3.4.38" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-connect#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/enums/AttributeNames.ts b/packages/instrumentation-connect/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/src/enums/AttributeNames.ts rename to packages/instrumentation-connect/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/index.ts b/packages/instrumentation-connect/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/src/index.ts rename to packages/instrumentation-connect/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts b/packages/instrumentation-connect/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts rename to packages/instrumentation-connect/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/internal-types.ts b/packages/instrumentation-connect/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/src/internal-types.ts rename to packages/instrumentation-connect/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/utils.ts b/packages/instrumentation-connect/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/src/utils.ts rename to packages/instrumentation-connect/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts b/packages/instrumentation-connect/test/instrumentation.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts rename to packages/instrumentation-connect/test/instrumentation.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-connect/test/utils.test.ts b/packages/instrumentation-connect/test/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/test/utils.test.ts rename to packages/instrumentation-connect/test/utils.test.ts diff --git a/propagators/propagator-aws-xray-lambda/tsconfig.json b/packages/instrumentation-connect/tsconfig.json similarity index 100% rename from propagators/propagator-aws-xray-lambda/tsconfig.json rename to packages/instrumentation-connect/tsconfig.json diff --git a/packages/opentelemetry-id-generator-aws-xray/.eslintignore b/packages/instrumentation-cucumber/.eslintignore similarity index 100% rename from packages/opentelemetry-id-generator-aws-xray/.eslintignore rename to packages/instrumentation-cucumber/.eslintignore diff --git a/plugins/node/instrumentation-fs/.eslintrc.js b/packages/instrumentation-cucumber/.eslintrc.js similarity index 65% rename from plugins/node/instrumentation-fs/.eslintrc.js rename to packages/instrumentation-cucumber/.eslintrc.js index f756f4488b..f726f3becb 100644 --- a/plugins/node/instrumentation-fs/.eslintrc.js +++ b/packages/instrumentation-cucumber/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/plugins/node/instrumentation-cucumber/.tav.yml b/packages/instrumentation-cucumber/.tav.yml similarity index 100% rename from plugins/node/instrumentation-cucumber/.tav.yml rename to packages/instrumentation-cucumber/.tav.yml diff --git a/plugins/node/instrumentation-cucumber/CHANGELOG.md b/packages/instrumentation-cucumber/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-cucumber/CHANGELOG.md rename to packages/instrumentation-cucumber/CHANGELOG.md diff --git a/packages/opentelemetry-redis-common/LICENSE b/packages/instrumentation-cucumber/LICENSE similarity index 100% rename from packages/opentelemetry-redis-common/LICENSE rename to packages/instrumentation-cucumber/LICENSE diff --git a/plugins/node/instrumentation-cucumber/README.md b/packages/instrumentation-cucumber/README.md similarity index 100% rename from plugins/node/instrumentation-cucumber/README.md rename to packages/instrumentation-cucumber/README.md diff --git a/plugins/node/instrumentation-cucumber/package.json b/packages/instrumentation-cucumber/package.json similarity index 84% rename from plugins/node/instrumentation-cucumber/package.json rename to packages/instrumentation-cucumber/package.json index 54d6b37eda..e89a7062c5 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/packages/instrumentation-cucumber/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `@cucumber/cucumber` automated tests runner", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-cucumber" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -12,9 +16,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-cucumber", "compile": "tsc -p ." }, @@ -65,5 +69,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-cucumber#readme" } diff --git a/plugins/node/instrumentation-cucumber/src/index.ts b/packages/instrumentation-cucumber/src/index.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/src/index.ts rename to packages/instrumentation-cucumber/src/index.ts diff --git a/plugins/node/instrumentation-cucumber/src/instrumentation.ts b/packages/instrumentation-cucumber/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/src/instrumentation.ts rename to packages/instrumentation-cucumber/src/instrumentation.ts diff --git a/plugins/node/instrumentation-cucumber/src/types.ts b/packages/instrumentation-cucumber/src/types.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/src/types.ts rename to packages/instrumentation-cucumber/src/types.ts diff --git a/plugins/node/instrumentation-cucumber/test/.gitignore b/packages/instrumentation-cucumber/test/.gitignore similarity index 100% rename from plugins/node/instrumentation-cucumber/test/.gitignore rename to packages/instrumentation-cucumber/test/.gitignore diff --git a/plugins/node/instrumentation-cucumber/test/cucumber.test.ts b/packages/instrumentation-cucumber/test/cucumber.test.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/test/cucumber.test.ts rename to packages/instrumentation-cucumber/test/cucumber.test.ts diff --git a/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts b/packages/instrumentation-cucumber/test/features/step_definitions/steps.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts rename to packages/instrumentation-cucumber/test/features/step_definitions/steps.ts diff --git a/plugins/node/instrumentation-cucumber/test/features/support/world.ts b/packages/instrumentation-cucumber/test/features/support/world.ts similarity index 100% rename from plugins/node/instrumentation-cucumber/test/features/support/world.ts rename to packages/instrumentation-cucumber/test/features/support/world.ts diff --git a/packages/opentelemetry-sql-common/tsconfig.json b/packages/instrumentation-cucumber/tsconfig.json similarity index 100% rename from packages/opentelemetry-sql-common/tsconfig.json rename to packages/instrumentation-cucumber/tsconfig.json diff --git a/packages/opentelemetry-propagation-utils/.eslintignore b/packages/instrumentation-dataloader/.eslintignore similarity index 100% rename from packages/opentelemetry-propagation-utils/.eslintignore rename to packages/instrumentation-dataloader/.eslintignore diff --git a/packages/instrumentation-dataloader/.eslintrc.js b/packages/instrumentation-dataloader/.eslintrc.js new file mode 100644 index 0000000000..d9630e1c33 --- /dev/null +++ b/packages/instrumentation-dataloader/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js'), +} diff --git a/plugins/node/instrumentation-dataloader/.tav.yml b/packages/instrumentation-dataloader/.tav.yml similarity index 100% rename from plugins/node/instrumentation-dataloader/.tav.yml rename to packages/instrumentation-dataloader/.tav.yml diff --git a/plugins/node/instrumentation-dataloader/CHANGELOG.md b/packages/instrumentation-dataloader/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-dataloader/CHANGELOG.md rename to packages/instrumentation-dataloader/CHANGELOG.md diff --git a/packages/opentelemetry-sql-common/LICENSE b/packages/instrumentation-dataloader/LICENSE similarity index 100% rename from packages/opentelemetry-sql-common/LICENSE rename to packages/instrumentation-dataloader/LICENSE diff --git a/plugins/node/instrumentation-dataloader/README.md b/packages/instrumentation-dataloader/README.md similarity index 100% rename from plugins/node/instrumentation-dataloader/README.md rename to packages/instrumentation-dataloader/README.md diff --git a/plugins/node/instrumentation-dataloader/package.json b/packages/instrumentation-dataloader/package.json similarity index 84% rename from plugins/node/instrumentation-dataloader/package.json rename to packages/instrumentation-dataloader/package.json index d7662f8a01..87b16c8734 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/packages/instrumentation-dataloader/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `dataloader` data fetching layer", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-dataloader" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-dataloader", @@ -15,7 +19,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "dataloader", @@ -57,5 +61,5 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-dataloader#readme" } diff --git a/plugins/node/instrumentation-dataloader/src/index.ts b/packages/instrumentation-dataloader/src/index.ts similarity index 100% rename from plugins/node/instrumentation-dataloader/src/index.ts rename to packages/instrumentation-dataloader/src/index.ts diff --git a/plugins/node/instrumentation-dataloader/src/instrumentation.ts b/packages/instrumentation-dataloader/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-dataloader/src/instrumentation.ts rename to packages/instrumentation-dataloader/src/instrumentation.ts diff --git a/plugins/node/instrumentation-dataloader/src/types.ts b/packages/instrumentation-dataloader/src/types.ts similarity index 100% rename from plugins/node/instrumentation-dataloader/src/types.ts rename to packages/instrumentation-dataloader/src/types.ts diff --git a/plugins/node/instrumentation-dataloader/test/dataloader.test.ts b/packages/instrumentation-dataloader/test/dataloader.test.ts similarity index 100% rename from plugins/node/instrumentation-dataloader/test/dataloader.test.ts rename to packages/instrumentation-dataloader/test/dataloader.test.ts diff --git a/propagators/propagator-aws-xray/tsconfig.json b/packages/instrumentation-dataloader/tsconfig.json similarity index 100% rename from propagators/propagator-aws-xray/tsconfig.json rename to packages/instrumentation-dataloader/tsconfig.json diff --git a/packages/opentelemetry-redis-common/.eslintignore b/packages/instrumentation-dns/.eslintignore similarity index 100% rename from packages/opentelemetry-redis-common/.eslintignore rename to packages/instrumentation-dns/.eslintignore diff --git a/packages/instrumentation-dns/.eslintrc.js b/packages/instrumentation-dns/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-dns/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md b/packages/instrumentation-dns/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md rename to packages/instrumentation-dns/CHANGELOG.md diff --git a/packages/opentelemetry-test-utils/LICENSE b/packages/instrumentation-dns/LICENSE similarity index 100% rename from packages/opentelemetry-test-utils/LICENSE rename to packages/instrumentation-dns/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-dns/README.md b/packages/instrumentation-dns/README.md similarity index 87% rename from plugins/node/opentelemetry-instrumentation-dns/README.md rename to packages/instrumentation-dns/README.md index e1940425d9..5488588426 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/README.md +++ b/packages/instrumentation-dns/README.md @@ -11,9 +11,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. ## Status -| Maturity | [Component Owner](../../../.github/component_owners.yml) | Compatibility | +| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility | | ----------------------------------------------------- | -------------------------------------------------------- | --------------------- | -| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | +| [Unmaintained](../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | ## Installation @@ -50,7 +50,7 @@ DNS instrumentation has currently one option. You can set the following: | Options | Type | Description | | ------- | ---- | ----------- | -| [`ignoreHostnames`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/opentelemetry-instrumentation-dns/src/types.ts#L99) | `IgnoreMatcher \| IgnoreMatcher[]` | DNS instrumentation will not trace all requests that match hostnames | +| [`ignoreHostnames`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-dns/src/types.ts#L99) | `IgnoreMatcher \| IgnoreMatcher[]` | DNS instrumentation will not trace all requests that match hostnames | ## Semantic Conventions diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/packages/instrumentation-dns/package.json similarity index 82% rename from plugins/node/opentelemetry-instrumentation-dns/package.json rename to packages/instrumentation-dns/package.json index cc90e65e76..cf88e2be3e 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/packages/instrumentation-dns/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `node:dns` name resolution module", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-dns" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", @@ -12,8 +16,8 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", - "lint:readme": "node ../../../scripts/lint-readme", + "version:update": "node ../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-dns", "compile": "tsc -p ." }, @@ -59,5 +63,5 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-dns#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AddressFamily.ts b/packages/instrumentation-dns/src/enums/AddressFamily.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/enums/AddressFamily.ts rename to packages/instrumentation-dns/src/enums/AddressFamily.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts b/packages/instrumentation-dns/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/enums/AttributeNames.ts rename to packages/instrumentation-dns/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/index.ts b/packages/instrumentation-dns/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/index.ts rename to packages/instrumentation-dns/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts b/packages/instrumentation-dns/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/instrumentation.ts rename to packages/instrumentation-dns/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/internal-types.ts b/packages/instrumentation-dns/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/internal-types.ts rename to packages/instrumentation-dns/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/types.ts b/packages/instrumentation-dns/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/types.ts rename to packages/instrumentation-dns/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/src/utils.ts b/packages/instrumentation-dns/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/src/utils.ts rename to packages/instrumentation-dns/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/functionals/dns-disable.test.ts b/packages/instrumentation-dns/test/functionals/dns-disable.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/functionals/dns-disable.test.ts rename to packages/instrumentation-dns/test/functionals/dns-disable.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/functionals/utils.test.ts b/packages/instrumentation-dns/test/functionals/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/functionals/utils.test.ts rename to packages/instrumentation-dns/test/functionals/utils.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/integrations/dns-lookup.test.ts b/packages/instrumentation-dns/test/integrations/dns-lookup.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/integrations/dns-lookup.test.ts rename to packages/instrumentation-dns/test/integrations/dns-lookup.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/integrations/dns-slash-promises-lookup.test.ts b/packages/instrumentation-dns/test/integrations/dns-slash-promises-lookup.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/integrations/dns-slash-promises-lookup.test.ts rename to packages/instrumentation-dns/test/integrations/dns-slash-promises-lookup.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/integrations/dnspromise-lookup.test.ts b/packages/instrumentation-dns/test/integrations/dnspromise-lookup.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/integrations/dnspromise-lookup.test.ts rename to packages/instrumentation-dns/test/integrations/dnspromise-lookup.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts b/packages/instrumentation-dns/test/utils/assertSpan.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts rename to packages/instrumentation-dns/test/utils/assertSpan.ts diff --git a/plugins/node/opentelemetry-instrumentation-dns/test/utils/utils.ts b/packages/instrumentation-dns/test/utils/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/test/utils/utils.ts rename to packages/instrumentation-dns/test/utils/utils.ts diff --git a/detectors/node/opentelemetry-resource-detector-gcp/tsconfig.json b/packages/instrumentation-dns/tsconfig.json similarity index 77% rename from detectors/node/opentelemetry-resource-detector-gcp/tsconfig.json rename to packages/instrumentation-dns/tsconfig.json index 28be80d266..4078877ce6 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/tsconfig.json +++ b/packages/instrumentation-dns/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/packages/opentelemetry-sql-common/.eslintignore b/packages/instrumentation-document-load/.eslintignore similarity index 100% rename from packages/opentelemetry-sql-common/.eslintignore rename to packages/instrumentation-document-load/.eslintignore diff --git a/plugins/web/opentelemetry-instrumentation-document-load/.eslintrc.js b/packages/instrumentation-document-load/.eslintrc.js similarity index 75% rename from plugins/web/opentelemetry-instrumentation-document-load/.eslintrc.js rename to packages/instrumentation-document-load/.eslintrc.js index 6ad6c9f216..01b8d09740 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/.eslintrc.js +++ b/packages/instrumentation-document-load/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md b/packages/instrumentation-document-load/CHANGELOG.md similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md rename to packages/instrumentation-document-load/CHANGELOG.md diff --git a/plugins/node/instrumentation-amqplib/LICENSE b/packages/instrumentation-document-load/LICENSE similarity index 100% rename from plugins/node/instrumentation-amqplib/LICENSE rename to packages/instrumentation-document-load/LICENSE diff --git a/plugins/web/opentelemetry-instrumentation-document-load/README.md b/packages/instrumentation-document-load/README.md similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/README.md rename to packages/instrumentation-document-load/README.md diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/packages/instrumentation-document-load/package.json similarity index 86% rename from plugins/web/opentelemetry-instrumentation-document-load/package.json rename to packages/instrumentation-document-load/package.json index 03e75a7d34..e7b6840303 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/packages/instrumentation-document-load/package.json @@ -6,13 +6,17 @@ "module": "build/esm/index.js", "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-document-load" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-document-load", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "prepublishOnly": "npm run compile", @@ -74,5 +78,5 @@ "@opentelemetry/sdk-trace-web": "^2.0.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-document-load#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-document-load#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/enums/AttributeNames.ts b/packages/instrumentation-document-load/src/enums/AttributeNames.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/src/enums/AttributeNames.ts rename to packages/instrumentation-document-load/src/enums/AttributeNames.ts diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/enums/EventNames.ts b/packages/instrumentation-document-load/src/enums/EventNames.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/src/enums/EventNames.ts rename to packages/instrumentation-document-load/src/enums/EventNames.ts diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/index.ts b/packages/instrumentation-document-load/src/index.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/src/index.ts rename to packages/instrumentation-document-load/src/index.ts diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts b/packages/instrumentation-document-load/src/instrumentation.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/src/instrumentation.ts rename to packages/instrumentation-document-load/src/instrumentation.ts diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/types.ts b/packages/instrumentation-document-load/src/types.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/src/types.ts rename to packages/instrumentation-document-load/src/types.ts diff --git a/plugins/web/opentelemetry-instrumentation-document-load/src/utils.ts b/packages/instrumentation-document-load/src/utils.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/src/utils.ts rename to packages/instrumentation-document-load/src/utils.ts diff --git a/plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts b/packages/instrumentation-document-load/test/documentLoad.test.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/test/documentLoad.test.ts rename to packages/instrumentation-document-load/test/documentLoad.test.ts diff --git a/packages/opentelemetry-propagation-utils/tsconfig.esm.json b/packages/instrumentation-document-load/tsconfig.esm.json similarity index 100% rename from packages/opentelemetry-propagation-utils/tsconfig.esm.json rename to packages/instrumentation-document-load/tsconfig.esm.json diff --git a/propagators/propagator-aws-xray-lambda/tsconfig.esnext.json b/packages/instrumentation-document-load/tsconfig.esnext.json similarity index 100% rename from propagators/propagator-aws-xray-lambda/tsconfig.esnext.json rename to packages/instrumentation-document-load/tsconfig.esnext.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/tsconfig.json b/packages/instrumentation-document-load/tsconfig.json similarity index 77% rename from detectors/node/opentelemetry-resource-detector-aws/tsconfig.json rename to packages/instrumentation-document-load/tsconfig.json index 28be80d266..4078877ce6 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/tsconfig.json +++ b/packages/instrumentation-document-load/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/plugins/web/opentelemetry-instrumentation-document-load/web-test-runner.config.mjs b/packages/instrumentation-document-load/web-test-runner.config.mjs similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/web-test-runner.config.mjs rename to packages/instrumentation-document-load/web-test-runner.config.mjs diff --git a/packages/opentelemetry-test-utils/.eslintignore b/packages/instrumentation-express/.eslintignore similarity index 100% rename from packages/opentelemetry-test-utils/.eslintignore rename to packages/instrumentation-express/.eslintignore diff --git a/packages/instrumentation-express/.eslintrc.js b/packages/instrumentation-express/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-express/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-express/.tav.yml b/packages/instrumentation-express/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/.tav.yml rename to packages/instrumentation-express/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md b/packages/instrumentation-express/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md rename to packages/instrumentation-express/CHANGELOG.md diff --git a/plugins/node/instrumentation-cucumber/LICENSE b/packages/instrumentation-express/LICENSE similarity index 100% rename from plugins/node/instrumentation-cucumber/LICENSE rename to packages/instrumentation-express/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-express/README.md b/packages/instrumentation-express/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/README.md rename to packages/instrumentation-express/README.md diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/packages/instrumentation-express/package.json similarity index 84% rename from plugins/node/opentelemetry-instrumentation-express/package.json rename to packages/instrumentation-express/package.json index 24405f19e4..cca88babed 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/packages/instrumentation-express/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `express` http web application framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-express" + }, "scripts": { "test-all-versions": "tav", "test": "nyc mocha 'test/**/*.test.ts'", @@ -12,8 +16,8 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-express", "compile": "tsc -p .", "prepublishOnly": "npm run compile", @@ -65,5 +69,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-express#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-express/src/enums/AttributeNames.ts b/packages/instrumentation-express/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/src/enums/AttributeNames.ts rename to packages/instrumentation-express/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/src/enums/ExpressLayerType.ts b/packages/instrumentation-express/src/enums/ExpressLayerType.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/src/enums/ExpressLayerType.ts rename to packages/instrumentation-express/src/enums/ExpressLayerType.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/src/index.ts b/packages/instrumentation-express/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/src/index.ts rename to packages/instrumentation-express/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/packages/instrumentation-express/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts rename to packages/instrumentation-express/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/src/internal-types.ts b/packages/instrumentation-express/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/src/internal-types.ts rename to packages/instrumentation-express/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/src/types.ts b/packages/instrumentation-express/src/types.ts similarity index 95% rename from plugins/node/opentelemetry-instrumentation-express/src/types.ts rename to packages/instrumentation-express/src/types.ts index 4ccb36e6af..10f711bd3d 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/types.ts +++ b/packages/instrumentation-express/src/types.ts @@ -49,7 +49,7 @@ export interface ExpressRequestCustomAttributeFunction { } /** - * Options available for the Express Instrumentation (see [documentation](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#express-instrumentation-options)) + * Options available for the Express Instrumentation (see [documentation](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-express#express-instrumentation-options)) */ export interface ExpressInstrumentationConfig extends InstrumentationConfig { /** Ignore specific based on their name */ diff --git a/plugins/node/opentelemetry-instrumentation-express/src/utils.ts b/packages/instrumentation-express/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/src/utils.ts rename to packages/instrumentation-express/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts b/packages/instrumentation-express/test/custom-config.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts rename to packages/instrumentation-express/test/custom-config.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/packages/instrumentation-express/test/express.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/express.test.ts rename to packages/instrumentation-express/test/express.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-nested-router.mjs b/packages/instrumentation-express/test/fixtures/use-express-nested-router.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-nested-router.mjs rename to packages/instrumentation-express/test/fixtures/use-express-nested-router.mjs diff --git a/plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-regex.mjs b/packages/instrumentation-express/test/fixtures/use-express-regex.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-regex.mjs rename to packages/instrumentation-express/test/fixtures/use-express-regex.mjs diff --git a/plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-router.mjs b/packages/instrumentation-express/test/fixtures/use-express-router.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-router.mjs rename to packages/instrumentation-express/test/fixtures/use-express-router.mjs diff --git a/plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express.mjs b/packages/instrumentation-express/test/fixtures/use-express.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express.mjs rename to packages/instrumentation-express/test/fixtures/use-express.mjs diff --git a/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts b/packages/instrumentation-express/test/hooks.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts rename to packages/instrumentation-express/test/hooks.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts b/packages/instrumentation-express/test/ignore-all.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/ignore-all.test.ts rename to packages/instrumentation-express/test/ignore-all.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/test/utils.test.ts b/packages/instrumentation-express/test/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/utils.test.ts rename to packages/instrumentation-express/test/utils.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-express/test/utils.ts b/packages/instrumentation-express/test/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/test/utils.ts rename to packages/instrumentation-express/test/utils.ts diff --git a/detectors/node/opentelemetry-resource-detector-github/tsconfig.json b/packages/instrumentation-express/tsconfig.json similarity index 77% rename from detectors/node/opentelemetry-resource-detector-github/tsconfig.json rename to packages/instrumentation-express/tsconfig.json index 28be80d266..4078877ce6 100644 --- a/detectors/node/opentelemetry-resource-detector-github/tsconfig.json +++ b/packages/instrumentation-express/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/plugins/node/opentelemetry-instrumentation-fastify/.eslintignore b/packages/instrumentation-fastify/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/.eslintignore rename to packages/instrumentation-fastify/.eslintignore diff --git a/packages/instrumentation-fastify/.eslintrc.js b/packages/instrumentation-fastify/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-fastify/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-fastify/.tav.yml b/packages/instrumentation-fastify/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/.tav.yml rename to packages/instrumentation-fastify/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md b/packages/instrumentation-fastify/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md rename to packages/instrumentation-fastify/CHANGELOG.md diff --git a/plugins/node/instrumentation-dataloader/LICENSE b/packages/instrumentation-fastify/LICENSE similarity index 100% rename from plugins/node/instrumentation-dataloader/LICENSE rename to packages/instrumentation-fastify/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-fastify/README.md b/packages/instrumentation-fastify/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/README.md rename to packages/instrumentation-fastify/README.md diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/packages/instrumentation-fastify/package.json similarity index 84% rename from plugins/node/opentelemetry-instrumentation-fastify/package.json rename to packages/instrumentation-fastify/package.json index 0936cfd241..a7ec0de298 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/packages/instrumentation-fastify/package.json @@ -4,18 +4,22 @@ "description": "OpenTelemetry instrumentation for `fastify` http web application framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-fastify" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-fastify", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -66,5 +70,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-fastify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/constants.ts b/packages/instrumentation-fastify/src/constants.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/constants.ts rename to packages/instrumentation-fastify/src/constants.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/enums/AttributeNames.ts b/packages/instrumentation-fastify/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/enums/AttributeNames.ts rename to packages/instrumentation-fastify/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/index.ts b/packages/instrumentation-fastify/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/index.ts rename to packages/instrumentation-fastify/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts b/packages/instrumentation-fastify/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts rename to packages/instrumentation-fastify/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/internal-types.ts b/packages/instrumentation-fastify/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/internal-types.ts rename to packages/instrumentation-fastify/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/types.ts b/packages/instrumentation-fastify/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/types.ts rename to packages/instrumentation-fastify/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts b/packages/instrumentation-fastify/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts rename to packages/instrumentation-fastify/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-fastify/test/fixtures/use-fastify.mjs b/packages/instrumentation-fastify/test/fixtures/use-fastify.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/test/fixtures/use-fastify.mjs rename to packages/instrumentation-fastify/test/fixtures/use-fastify.mjs diff --git a/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts b/packages/instrumentation-fastify/test/instrumentation.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts rename to packages/instrumentation-fastify/test/instrumentation.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/tsconfig.json b/packages/instrumentation-fastify/tsconfig.json similarity index 77% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/tsconfig.json rename to packages/instrumentation-fastify/tsconfig.json index 28be80d266..4078877ce6 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/tsconfig.json +++ b/packages/instrumentation-fastify/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/plugins/node/instrumentation-amqplib/.eslintignore b/packages/instrumentation-fs/.eslintignore similarity index 100% rename from plugins/node/instrumentation-amqplib/.eslintignore rename to packages/instrumentation-fs/.eslintignore diff --git a/packages/instrumentation-fs/.eslintrc.js b/packages/instrumentation-fs/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-fs/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-fs/CHANGELOG.md b/packages/instrumentation-fs/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-fs/CHANGELOG.md rename to packages/instrumentation-fs/CHANGELOG.md diff --git a/plugins/node/instrumentation-fs/LICENSE b/packages/instrumentation-fs/LICENSE similarity index 100% rename from plugins/node/instrumentation-fs/LICENSE rename to packages/instrumentation-fs/LICENSE diff --git a/plugins/node/instrumentation-fs/README.md b/packages/instrumentation-fs/README.md similarity index 100% rename from plugins/node/instrumentation-fs/README.md rename to packages/instrumentation-fs/README.md diff --git a/plugins/node/instrumentation-fs/package.json b/packages/instrumentation-fs/package.json similarity index 83% rename from plugins/node/instrumentation-fs/package.json rename to packages/instrumentation-fs/package.json index e377045007..193c850cdd 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/packages/instrumentation-fs/package.json @@ -4,16 +4,20 @@ "description": "OpenTelemetry instrumentation for `node:fs` file system interactions module", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-fs" + }, "scripts": { "test": "mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-fs", "compile": "tsc -p ." }, @@ -59,5 +63,5 @@ "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-fs#readme" } diff --git a/plugins/node/instrumentation-fs/src/constants.ts b/packages/instrumentation-fs/src/constants.ts similarity index 100% rename from plugins/node/instrumentation-fs/src/constants.ts rename to packages/instrumentation-fs/src/constants.ts diff --git a/plugins/node/instrumentation-fs/src/index.ts b/packages/instrumentation-fs/src/index.ts similarity index 100% rename from plugins/node/instrumentation-fs/src/index.ts rename to packages/instrumentation-fs/src/index.ts diff --git a/plugins/node/instrumentation-fs/src/instrumentation.ts b/packages/instrumentation-fs/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-fs/src/instrumentation.ts rename to packages/instrumentation-fs/src/instrumentation.ts diff --git a/plugins/node/instrumentation-fs/src/types.ts b/packages/instrumentation-fs/src/types.ts similarity index 100% rename from plugins/node/instrumentation-fs/src/types.ts rename to packages/instrumentation-fs/src/types.ts diff --git a/plugins/node/instrumentation-fs/src/utils.ts b/packages/instrumentation-fs/src/utils.ts similarity index 100% rename from plugins/node/instrumentation-fs/src/utils.ts rename to packages/instrumentation-fs/src/utils.ts diff --git a/plugins/node/instrumentation-fs/test/definitions.ts b/packages/instrumentation-fs/test/definitions.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/definitions.ts rename to packages/instrumentation-fs/test/definitions.ts diff --git a/plugins/node/instrumentation-fs/test/fixtures/readtest b/packages/instrumentation-fs/test/fixtures/readtest similarity index 100% rename from plugins/node/instrumentation-fs/test/fixtures/readtest rename to packages/instrumentation-fs/test/fixtures/readtest diff --git a/plugins/node/instrumentation-fs/test/fixtures/writetest b/packages/instrumentation-fs/test/fixtures/writetest similarity index 100% rename from plugins/node/instrumentation-fs/test/fixtures/writetest rename to packages/instrumentation-fs/test/fixtures/writetest diff --git a/plugins/node/instrumentation-fs/test/fs.test.ts b/packages/instrumentation-fs/test/fs.test.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/fs.test.ts rename to packages/instrumentation-fs/test/fs.test.ts diff --git a/plugins/node/instrumentation-fs/test/fsHooks.test.ts b/packages/instrumentation-fs/test/fsHooks.test.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/fsHooks.test.ts rename to packages/instrumentation-fs/test/fsHooks.test.ts diff --git a/plugins/node/instrumentation-fs/test/fsPromises.test.ts b/packages/instrumentation-fs/test/fsPromises.test.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/fsPromises.test.ts rename to packages/instrumentation-fs/test/fsPromises.test.ts diff --git a/plugins/node/instrumentation-fs/test/fsPromisesHooks.test.ts b/packages/instrumentation-fs/test/fsPromisesHooks.test.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/fsPromisesHooks.test.ts rename to packages/instrumentation-fs/test/fsPromisesHooks.test.ts diff --git a/plugins/node/instrumentation-fs/test/parent.test.ts b/packages/instrumentation-fs/test/parent.test.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/parent.test.ts rename to packages/instrumentation-fs/test/parent.test.ts diff --git a/plugins/node/instrumentation-fs/test/utils.ts b/packages/instrumentation-fs/test/utils.ts similarity index 100% rename from plugins/node/instrumentation-fs/test/utils.ts rename to packages/instrumentation-fs/test/utils.ts diff --git a/packages/instrumentation-fs/tsconfig.json b/packages/instrumentation-fs/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-fs/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-cucumber/.eslintignore b/packages/instrumentation-generic-pool/.eslintignore similarity index 100% rename from plugins/node/instrumentation-cucumber/.eslintignore rename to packages/instrumentation-generic-pool/.eslintignore diff --git a/packages/instrumentation-generic-pool/.eslintrc.js b/packages/instrumentation-generic-pool/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-generic-pool/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md b/packages/instrumentation-generic-pool/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md rename to packages/instrumentation-generic-pool/CHANGELOG.md diff --git a/plugins/node/instrumentation-kafkajs/LICENSE b/packages/instrumentation-generic-pool/LICENSE similarity index 100% rename from plugins/node/instrumentation-kafkajs/LICENSE rename to packages/instrumentation-generic-pool/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/README.md b/packages/instrumentation-generic-pool/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/README.md rename to packages/instrumentation-generic-pool/README.md diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/packages/instrumentation-generic-pool/package.json similarity index 82% rename from plugins/node/opentelemetry-instrumentation-generic-pool/package.json rename to packages/instrumentation-generic-pool/package.json index 3b4cb6efe4..fea8843c52 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/packages/instrumentation-generic-pool/package.json @@ -4,15 +4,19 @@ "description": "OpenTelemetry instrumentation for `generic-pool` resource pool for managing expensive resources", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-generic-pool" + }, "scripts": { "test": "nyc mocha 'test/**/*.ts'", "tdd": "yarn test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-generic-pool", "compile": "tsc -p .", "prepublishOnly": "npm run compile", @@ -59,5 +63,5 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-generic-pool#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/src/index.ts b/packages/instrumentation-generic-pool/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/src/index.ts rename to packages/instrumentation-generic-pool/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/src/instrumentation.ts b/packages/instrumentation-generic-pool/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/src/instrumentation.ts rename to packages/instrumentation-generic-pool/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/test/index.test.ts b/packages/instrumentation-generic-pool/test/index.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/test/index.test.ts rename to packages/instrumentation-generic-pool/test/index.test.ts diff --git a/packages/instrumentation-generic-pool/tsconfig.json b/packages/instrumentation-generic-pool/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-generic-pool/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-dataloader/.eslintignore b/packages/instrumentation-graphql/.eslintignore similarity index 100% rename from plugins/node/instrumentation-dataloader/.eslintignore rename to packages/instrumentation-graphql/.eslintignore diff --git a/packages/instrumentation-graphql/.eslintrc.js b/packages/instrumentation-graphql/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-graphql/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-graphql/.gitignore b/packages/instrumentation-graphql/.gitignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/.gitignore rename to packages/instrumentation-graphql/.gitignore diff --git a/plugins/node/opentelemetry-instrumentation-graphql/.tav.yml b/packages/instrumentation-graphql/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/.tav.yml rename to packages/instrumentation-graphql/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md b/packages/instrumentation-graphql/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md rename to packages/instrumentation-graphql/CHANGELOG.md diff --git a/plugins/node/instrumentation-lru-memoizer/LICENSE b/packages/instrumentation-graphql/LICENSE similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/LICENSE rename to packages/instrumentation-graphql/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-graphql/README.md b/packages/instrumentation-graphql/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/README.md rename to packages/instrumentation-graphql/README.md diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/packages/instrumentation-graphql/package.json similarity index 82% rename from plugins/node/opentelemetry-instrumentation-graphql/package.json rename to packages/instrumentation-graphql/package.json index 0276386db0..efd4571255 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/packages/instrumentation-graphql/package.json @@ -4,19 +4,23 @@ "description": "OpenTelemetry instrumentation for `graphql` gql query language and runtime for GraphQL", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-graphql" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-graphql", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", "tdd": "npm run test -- --watch-extensions ts --watch", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -58,5 +62,5 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-graphql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/enum.ts b/packages/instrumentation-graphql/src/enum.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/enum.ts rename to packages/instrumentation-graphql/src/enum.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/enums/AttributeNames.ts b/packages/instrumentation-graphql/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/enums/AttributeNames.ts rename to packages/instrumentation-graphql/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/index.ts b/packages/instrumentation-graphql/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/index.ts rename to packages/instrumentation-graphql/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts b/packages/instrumentation-graphql/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts rename to packages/instrumentation-graphql/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts b/packages/instrumentation-graphql/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts rename to packages/instrumentation-graphql/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/symbols.ts b/packages/instrumentation-graphql/src/symbols.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/symbols.ts rename to packages/instrumentation-graphql/src/symbols.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts b/packages/instrumentation-graphql/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/types.ts rename to packages/instrumentation-graphql/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts b/packages/instrumentation-graphql/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts rename to packages/instrumentation-graphql/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/test/graphql-adaptor.ts b/packages/instrumentation-graphql/test/graphql-adaptor.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/test/graphql-adaptor.ts rename to packages/instrumentation-graphql/test/graphql-adaptor.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts b/packages/instrumentation-graphql/test/graphql.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts rename to packages/instrumentation-graphql/test/graphql.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/test/helper.ts b/packages/instrumentation-graphql/test/helper.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/test/helper.ts rename to packages/instrumentation-graphql/test/helper.ts diff --git a/plugins/node/opentelemetry-instrumentation-graphql/test/schema.ts b/packages/instrumentation-graphql/test/schema.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/test/schema.ts rename to packages/instrumentation-graphql/test/schema.ts diff --git a/packages/instrumentation-graphql/tsconfig.json b/packages/instrumentation-graphql/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-graphql/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-fs/.eslintignore b/packages/instrumentation-hapi/.eslintignore similarity index 100% rename from plugins/node/instrumentation-fs/.eslintignore rename to packages/instrumentation-hapi/.eslintignore diff --git a/packages/instrumentation-hapi/.eslintrc.js b/packages/instrumentation-hapi/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-hapi/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-hapi/.tav.yml b/packages/instrumentation-hapi/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/.tav.yml rename to packages/instrumentation-hapi/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md b/packages/instrumentation-hapi/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md rename to packages/instrumentation-hapi/CHANGELOG.md diff --git a/plugins/node/instrumentation-mongoose/LICENSE b/packages/instrumentation-hapi/LICENSE similarity index 100% rename from plugins/node/instrumentation-mongoose/LICENSE rename to packages/instrumentation-hapi/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-hapi/README.md b/packages/instrumentation-hapi/README.md similarity index 96% rename from plugins/node/opentelemetry-instrumentation-hapi/README.md rename to packages/instrumentation-hapi/README.md index 967b9fb24d..2ff3ec4d2a 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/README.md +++ b/packages/instrumentation-hapi/README.md @@ -11,9 +11,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. ## Status -| Maturity | [Component Owner](../../../.github/component_owners.yml) | Compatibility | +| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility | | ----------------------------------------------------- | -------------------------------------------------------- | --------------------- | -| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | +| [Unmaintained](../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | ## Installation diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/packages/instrumentation-hapi/package.json similarity index 84% rename from plugins/node/opentelemetry-instrumentation-hapi/package.json rename to packages/instrumentation-hapi/package.json index 4ce832bde1..2fd0bfd825 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/packages/instrumentation-hapi/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `@hapi/hapi` http web application framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-hapi" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -12,8 +16,8 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-hapi", "compile": "tsc -p .", "prepublishOnly": "npm run compile" @@ -62,5 +66,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-hapi#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-hapi#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/enums/AttributeNames.ts b/packages/instrumentation-hapi/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/src/enums/AttributeNames.ts rename to packages/instrumentation-hapi/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/index.ts b/packages/instrumentation-hapi/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/src/index.ts rename to packages/instrumentation-hapi/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts b/packages/instrumentation-hapi/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts rename to packages/instrumentation-hapi/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts b/packages/instrumentation-hapi/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/src/internal-types.ts rename to packages/instrumentation-hapi/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/semconv.ts b/packages/instrumentation-hapi/src/semconv.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/src/semconv.ts rename to packages/instrumentation-hapi/src/semconv.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts b/packages/instrumentation-hapi/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts rename to packages/instrumentation-hapi/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/fixtures/use-hapi.js b/packages/instrumentation-hapi/test/fixtures/use-hapi.js similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/fixtures/use-hapi.js rename to packages/instrumentation-hapi/test/fixtures/use-hapi.js diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/fixtures/use-hapi.mjs b/packages/instrumentation-hapi/test/fixtures/use-hapi.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/fixtures/use-hapi.mjs rename to packages/instrumentation-hapi/test/fixtures/use-hapi.mjs diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/hapi-plugin.test.ts b/packages/instrumentation-hapi/test/hapi-plugin.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/hapi-plugin.test.ts rename to packages/instrumentation-hapi/test/hapi-plugin.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/hapi-server-ext.test.ts b/packages/instrumentation-hapi/test/hapi-server-ext.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/hapi-server-ext.test.ts rename to packages/instrumentation-hapi/test/hapi-server-ext.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/hapi.test.ts b/packages/instrumentation-hapi/test/hapi.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/hapi.test.ts rename to packages/instrumentation-hapi/test/hapi.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/plugin.ts b/packages/instrumentation-hapi/test/plugin.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/plugin.ts rename to packages/instrumentation-hapi/test/plugin.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/testPackage.json b/packages/instrumentation-hapi/test/testPackage.json similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/test/testPackage.json rename to packages/instrumentation-hapi/test/testPackage.json diff --git a/plugins/node/opentelemetry-instrumentation-koa/tsconfig.json b/packages/instrumentation-hapi/tsconfig.json similarity index 78% rename from plugins/node/opentelemetry-instrumentation-koa/tsconfig.json rename to packages/instrumentation-hapi/tsconfig.json index ec22e03b9e..1c7bff5997 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/tsconfig.json +++ b/packages/instrumentation-hapi/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/plugins/node/instrumentation-kafkajs/.eslintignore b/packages/instrumentation-ioredis/.eslintignore similarity index 100% rename from plugins/node/instrumentation-kafkajs/.eslintignore rename to packages/instrumentation-ioredis/.eslintignore diff --git a/packages/instrumentation-ioredis/.eslintrc.js b/packages/instrumentation-ioredis/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-ioredis/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml b/packages/instrumentation-ioredis/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml rename to packages/instrumentation-ioredis/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md b/packages/instrumentation-ioredis/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md rename to packages/instrumentation-ioredis/CHANGELOG.md diff --git a/plugins/node/instrumentation-runtime-node/LICENSE b/packages/instrumentation-ioredis/LICENSE similarity index 100% rename from plugins/node/instrumentation-runtime-node/LICENSE rename to packages/instrumentation-ioredis/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/README.md b/packages/instrumentation-ioredis/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/README.md rename to packages/instrumentation-ioredis/README.md diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/packages/instrumentation-ioredis/package.json similarity index 86% rename from plugins/node/opentelemetry-instrumentation-ioredis/package.json rename to packages/instrumentation-ioredis/package.json index d6682c8690..13365aeb1d 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/packages/instrumentation-ioredis/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `ioredis` database redis client for Redis", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-ioredis" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "test:debug": "cross-env RUN_REDIS_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", @@ -15,8 +19,8 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-ioredis", "compile": "tsc -p .", "prepublishOnly": "npm run compile" @@ -69,5 +73,5 @@ "@opentelemetry/redis-common": "^0.38.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-ioredis#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-ioredis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/index.ts b/packages/instrumentation-ioredis/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/src/index.ts rename to packages/instrumentation-ioredis/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/instrumentation.ts b/packages/instrumentation-ioredis/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/src/instrumentation.ts rename to packages/instrumentation-ioredis/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/internal-types.ts b/packages/instrumentation-ioredis/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/src/internal-types.ts rename to packages/instrumentation-ioredis/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts b/packages/instrumentation-ioredis/src/types.ts similarity index 96% rename from plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts rename to packages/instrumentation-ioredis/src/types.ts index f43849ec52..bdd5c5b435 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts +++ b/packages/instrumentation-ioredis/src/types.ts @@ -55,7 +55,7 @@ export interface RedisResponseCustomAttributeFunction { } /** - * Options available for the IORedis Instrumentation (see [documentation](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/opentelemetry-instrumentation-ioredis/README.md#ioredis-instrumentation-options)) + * Options available for the IORedis Instrumentation (see [documentation](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-ioredis/README.md#ioredis-instrumentation-options)) */ export interface IORedisInstrumentationConfig extends InstrumentationConfig { /** Custom serializer function for the db.statement tag */ diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts b/packages/instrumentation-ioredis/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts rename to packages/instrumentation-ioredis/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/test/fixtures/use-ioredis.mjs b/packages/instrumentation-ioredis/test/fixtures/use-ioredis.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/test/fixtures/use-ioredis.mjs rename to packages/instrumentation-ioredis/test/fixtures/use-ioredis.mjs diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts b/packages/instrumentation-ioredis/test/ioredis.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/test/ioredis.test.ts rename to packages/instrumentation-ioredis/test/ioredis.test.ts diff --git a/packages/instrumentation-ioredis/tsconfig.json b/packages/instrumentation-ioredis/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-ioredis/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-lru-memoizer/.eslintignore b/packages/instrumentation-kafkajs/.eslintignore similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/.eslintignore rename to packages/instrumentation-kafkajs/.eslintignore diff --git a/packages/instrumentation-kafkajs/.eslintrc.js b/packages/instrumentation-kafkajs/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-kafkajs/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-kafkajs/.tav.yml b/packages/instrumentation-kafkajs/.tav.yml similarity index 100% rename from plugins/node/instrumentation-kafkajs/.tav.yml rename to packages/instrumentation-kafkajs/.tav.yml diff --git a/plugins/node/instrumentation-kafkajs/CHANGELOG.md b/packages/instrumentation-kafkajs/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-kafkajs/CHANGELOG.md rename to packages/instrumentation-kafkajs/CHANGELOG.md diff --git a/plugins/node/instrumentation-socket.io/LICENSE b/packages/instrumentation-kafkajs/LICENSE similarity index 100% rename from plugins/node/instrumentation-socket.io/LICENSE rename to packages/instrumentation-kafkajs/LICENSE diff --git a/plugins/node/instrumentation-kafkajs/NOTICE b/packages/instrumentation-kafkajs/NOTICE similarity index 100% rename from plugins/node/instrumentation-kafkajs/NOTICE rename to packages/instrumentation-kafkajs/NOTICE diff --git a/plugins/node/instrumentation-kafkajs/README.md b/packages/instrumentation-kafkajs/README.md similarity index 100% rename from plugins/node/instrumentation-kafkajs/README.md rename to packages/instrumentation-kafkajs/README.md diff --git a/plugins/node/instrumentation-kafkajs/package.json b/packages/instrumentation-kafkajs/package.json similarity index 83% rename from plugins/node/instrumentation-kafkajs/package.json rename to packages/instrumentation-kafkajs/package.json index f958cb48c9..6045eb9d5e 100644 --- a/plugins/node/instrumentation-kafkajs/package.json +++ b/packages/instrumentation-kafkajs/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `kafkajs` messaging client for Apache Kafka", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-kafkajs" + }, "scripts": { "test": "nyc mocha --require @opentelemetry/contrib-test-utils 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -12,9 +16,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme", + "lint:readme": "node ../../scripts/lint-readme", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-kafkajs", "compile": "tsc -p ." }, @@ -60,5 +64,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.30.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-kafkajs#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-kafkajs#readme" } diff --git a/plugins/node/instrumentation-kafkajs/src/index.ts b/packages/instrumentation-kafkajs/src/index.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/src/index.ts rename to packages/instrumentation-kafkajs/src/index.ts diff --git a/plugins/node/instrumentation-kafkajs/src/instrumentation.ts b/packages/instrumentation-kafkajs/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/src/instrumentation.ts rename to packages/instrumentation-kafkajs/src/instrumentation.ts diff --git a/plugins/node/instrumentation-kafkajs/src/internal-types.ts b/packages/instrumentation-kafkajs/src/internal-types.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/src/internal-types.ts rename to packages/instrumentation-kafkajs/src/internal-types.ts diff --git a/plugins/node/instrumentation-kafkajs/src/propagator.ts b/packages/instrumentation-kafkajs/src/propagator.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/src/propagator.ts rename to packages/instrumentation-kafkajs/src/propagator.ts diff --git a/plugins/node/instrumentation-kafkajs/src/semconv.ts b/packages/instrumentation-kafkajs/src/semconv.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/src/semconv.ts rename to packages/instrumentation-kafkajs/src/semconv.ts diff --git a/plugins/node/instrumentation-kafkajs/src/types.ts b/packages/instrumentation-kafkajs/src/types.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/src/types.ts rename to packages/instrumentation-kafkajs/src/types.ts diff --git a/plugins/node/instrumentation-kafkajs/test/DummyPropagation.ts b/packages/instrumentation-kafkajs/test/DummyPropagation.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/test/DummyPropagation.ts rename to packages/instrumentation-kafkajs/test/DummyPropagation.ts diff --git a/plugins/node/instrumentation-kafkajs/test/kafkajs.test.ts b/packages/instrumentation-kafkajs/test/kafkajs.test.ts similarity index 100% rename from plugins/node/instrumentation-kafkajs/test/kafkajs.test.ts rename to packages/instrumentation-kafkajs/test/kafkajs.test.ts diff --git a/packages/instrumentation-kafkajs/tsconfig.json b/packages/instrumentation-kafkajs/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-kafkajs/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-mongoose/.eslintignore b/packages/instrumentation-knex/.eslintignore similarity index 100% rename from plugins/node/instrumentation-mongoose/.eslintignore rename to packages/instrumentation-knex/.eslintignore diff --git a/packages/instrumentation-knex/.eslintrc.js b/packages/instrumentation-knex/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-knex/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md b/packages/instrumentation-knex/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md rename to packages/instrumentation-knex/CHANGELOG.md diff --git a/plugins/node/instrumentation-tedious/LICENSE b/packages/instrumentation-knex/LICENSE similarity index 100% rename from plugins/node/instrumentation-tedious/LICENSE rename to packages/instrumentation-knex/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-knex/README.md b/packages/instrumentation-knex/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/README.md rename to packages/instrumentation-knex/README.md diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/packages/instrumentation-knex/package.json similarity index 83% rename from plugins/node/opentelemetry-instrumentation-knex/package.json rename to packages/instrumentation-knex/package.json index 909d4f16f4..e5fd15321a 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/packages/instrumentation-knex/package.json @@ -4,15 +4,19 @@ "description": "OpenTelemetry instrumentation for `knex` database SQL query builder", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-knex" + }, "scripts": { "test": "nyc mocha 'test/**/*.ts'", "tdd": "yarn test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "version:update": "node ../../../scripts/version-update.js", - "lint:readme": "node ../../../scripts/lint-readme", + "version:update": "node ../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-knex", "compile": "tsc -p .", "prepublishOnly": "npm run compile", @@ -59,5 +63,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.33.1" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-knex#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/constants.ts b/packages/instrumentation-knex/src/constants.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/src/constants.ts rename to packages/instrumentation-knex/src/constants.ts diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/index.ts b/packages/instrumentation-knex/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/src/index.ts rename to packages/instrumentation-knex/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts b/packages/instrumentation-knex/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts rename to packages/instrumentation-knex/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/semconv.ts b/packages/instrumentation-knex/src/semconv.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/src/semconv.ts rename to packages/instrumentation-knex/src/semconv.ts diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/types.ts b/packages/instrumentation-knex/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/src/types.ts rename to packages/instrumentation-knex/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/utils.ts b/packages/instrumentation-knex/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/src/utils.ts rename to packages/instrumentation-knex/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts b/packages/instrumentation-knex/test/index.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts rename to packages/instrumentation-knex/test/index.test.ts diff --git a/packages/instrumentation-knex/tsconfig.json b/packages/instrumentation-knex/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-knex/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-runtime-node/.eslintignore b/packages/instrumentation-koa/.eslintignore similarity index 100% rename from plugins/node/instrumentation-runtime-node/.eslintignore rename to packages/instrumentation-koa/.eslintignore diff --git a/packages/instrumentation-koa/.eslintrc.js b/packages/instrumentation-koa/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-koa/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-koa/.tav.yml b/packages/instrumentation-koa/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/.tav.yml rename to packages/instrumentation-koa/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md b/packages/instrumentation-koa/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md rename to packages/instrumentation-koa/CHANGELOG.md diff --git a/plugins/node/instrumentation-typeorm/LICENSE b/packages/instrumentation-koa/LICENSE similarity index 100% rename from plugins/node/instrumentation-typeorm/LICENSE rename to packages/instrumentation-koa/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-koa/README.md b/packages/instrumentation-koa/README.md similarity index 96% rename from plugins/node/opentelemetry-instrumentation-koa/README.md rename to packages/instrumentation-koa/README.md index 43e717a171..86e5a36484 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/README.md +++ b/packages/instrumentation-koa/README.md @@ -11,9 +11,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. ## Status -| Maturity | [Component Owner](../../../.github/component_owners.yml) | Compatibility | +| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility | | ----------------------------------------------------- | -------------------------------------------------------- | --------------------- | -| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | +| [Unmaintained](../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+
SDK 1.0+ | ## Installation diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/packages/instrumentation-koa/package.json similarity index 85% rename from plugins/node/opentelemetry-instrumentation-koa/package.json rename to packages/instrumentation-koa/package.json index 022c8684d2..989d34f3fa 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/packages/instrumentation-koa/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `koa` http web application framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-koa" + }, "scripts": { "test": "nyc mocha 'test/**/*.ts'", "test-all-versions": "tav", @@ -12,8 +16,8 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-koa", "compile": "tsc -p .", "prepublishOnly": "npm run compile", @@ -70,5 +74,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-koa#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-koa#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/enums/AttributeNames.ts b/packages/instrumentation-koa/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/src/enums/AttributeNames.ts rename to packages/instrumentation-koa/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/index.ts b/packages/instrumentation-koa/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/src/index.ts rename to packages/instrumentation-koa/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/instrumentation.ts b/packages/instrumentation-koa/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/src/instrumentation.ts rename to packages/instrumentation-koa/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/internal-types.ts b/packages/instrumentation-koa/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/src/internal-types.ts rename to packages/instrumentation-koa/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/types.ts b/packages/instrumentation-koa/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/src/types.ts rename to packages/instrumentation-koa/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/src/utils.ts b/packages/instrumentation-koa/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/src/utils.ts rename to packages/instrumentation-koa/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/test/fixtures/use-koa.mjs b/packages/instrumentation-koa/test/fixtures/use-koa.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/test/fixtures/use-koa.mjs rename to packages/instrumentation-koa/test/fixtures/use-koa.mjs diff --git a/plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts b/packages/instrumentation-koa/test/koa.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/test/koa.test.ts rename to packages/instrumentation-koa/test/koa.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-koa/test/utils.test.ts b/packages/instrumentation-koa/test/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/test/utils.test.ts rename to packages/instrumentation-koa/test/utils.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-hapi/tsconfig.json b/packages/instrumentation-koa/tsconfig.json similarity index 78% rename from plugins/node/opentelemetry-instrumentation-hapi/tsconfig.json rename to packages/instrumentation-koa/tsconfig.json index ec22e03b9e..1c7bff5997 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/tsconfig.json +++ b/packages/instrumentation-koa/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/plugins/node/instrumentation-socket.io/.eslintignore b/packages/instrumentation-long-task/.eslintignore similarity index 100% rename from plugins/node/instrumentation-socket.io/.eslintignore rename to packages/instrumentation-long-task/.eslintignore diff --git a/plugins/web/opentelemetry-instrumentation-long-task/.eslintrc.js b/packages/instrumentation-long-task/.eslintrc.js similarity index 75% rename from plugins/web/opentelemetry-instrumentation-long-task/.eslintrc.js rename to packages/instrumentation-long-task/.eslintrc.js index 6ad6c9f216..01b8d09740 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/.eslintrc.js +++ b/packages/instrumentation-long-task/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md b/packages/instrumentation-long-task/CHANGELOG.md similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/CHANGELOG.md rename to packages/instrumentation-long-task/CHANGELOG.md diff --git a/plugins/web/opentelemetry-instrumentation-long-task/README.md b/packages/instrumentation-long-task/README.md similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/README.md rename to packages/instrumentation-long-task/README.md diff --git a/plugins/web/opentelemetry-instrumentation-long-task/karma.conf.js b/packages/instrumentation-long-task/karma.conf.js similarity index 87% rename from plugins/web/opentelemetry-instrumentation-long-task/karma.conf.js rename to packages/instrumentation-long-task/karma.conf.js index 4a4bd49791..4bc502c46f 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/karma.conf.js +++ b/packages/instrumentation-long-task/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../karma.webpack'); +const karmaBaseConfig = require('../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/packages/instrumentation-long-task/package.json similarity index 87% rename from plugins/web/opentelemetry-instrumentation-long-task/package.json rename to packages/instrumentation-long-task/package.json index 13b9de09e3..2cb4d2d1cf 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/packages/instrumentation-long-task/package.json @@ -6,13 +6,17 @@ "module": "build/esm/index.js", "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-long-task" + }, "scripts": { "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-long-task", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "prepublishOnly": "npm run compile", @@ -84,5 +88,5 @@ "@opentelemetry/api": "^1.3.0" }, "sideEffects": false, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-long-task#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-long-task#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-long-task/src/index.ts b/packages/instrumentation-long-task/src/index.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/src/index.ts rename to packages/instrumentation-long-task/src/index.ts diff --git a/plugins/web/opentelemetry-instrumentation-long-task/src/instrumentation.ts b/packages/instrumentation-long-task/src/instrumentation.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/src/instrumentation.ts rename to packages/instrumentation-long-task/src/instrumentation.ts diff --git a/plugins/web/opentelemetry-instrumentation-long-task/src/types.ts b/packages/instrumentation-long-task/src/types.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/src/types.ts rename to packages/instrumentation-long-task/src/types.ts diff --git a/plugins/web/opentelemetry-instrumentation-long-task/test/compatibility.test.ts b/packages/instrumentation-long-task/test/compatibility.test.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/test/compatibility.test.ts rename to packages/instrumentation-long-task/test/compatibility.test.ts diff --git a/plugins/web/opentelemetry-instrumentation-long-task/test/index-webpack.ts b/packages/instrumentation-long-task/test/index-webpack.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/test/index-webpack.ts rename to packages/instrumentation-long-task/test/index-webpack.ts diff --git a/plugins/web/opentelemetry-instrumentation-long-task/test/longTask.test.ts b/packages/instrumentation-long-task/test/longTask.test.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/test/longTask.test.ts rename to packages/instrumentation-long-task/test/longTask.test.ts diff --git a/plugins/web/opentelemetry-instrumentation-long-task/test/util.ts b/packages/instrumentation-long-task/test/util.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/test/util.ts rename to packages/instrumentation-long-task/test/util.ts diff --git a/propagators/opentelemetry-propagator-instana/tsconfig.esm.json b/packages/instrumentation-long-task/tsconfig.esm.json similarity index 100% rename from propagators/opentelemetry-propagator-instana/tsconfig.esm.json rename to packages/instrumentation-long-task/tsconfig.esm.json diff --git a/propagators/propagator-aws-xray/tsconfig.esnext.json b/packages/instrumentation-long-task/tsconfig.esnext.json similarity index 100% rename from propagators/propagator-aws-xray/tsconfig.esnext.json rename to packages/instrumentation-long-task/tsconfig.esnext.json diff --git a/packages/instrumentation-long-task/tsconfig.json b/packages/instrumentation-long-task/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-long-task/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-tedious/.eslintignore b/packages/instrumentation-lru-memoizer/.eslintignore similarity index 100% rename from plugins/node/instrumentation-tedious/.eslintignore rename to packages/instrumentation-lru-memoizer/.eslintignore diff --git a/packages/instrumentation-lru-memoizer/.eslintrc.js b/packages/instrumentation-lru-memoizer/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-lru-memoizer/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-lru-memoizer/.tav.yml b/packages/instrumentation-lru-memoizer/.tav.yml similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/.tav.yml rename to packages/instrumentation-lru-memoizer/.tav.yml diff --git a/plugins/node/instrumentation-lru-memoizer/CHANGELOG.md b/packages/instrumentation-lru-memoizer/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/CHANGELOG.md rename to packages/instrumentation-lru-memoizer/CHANGELOG.md diff --git a/plugins/node/instrumentation-undici/LICENSE b/packages/instrumentation-lru-memoizer/LICENSE similarity index 100% rename from plugins/node/instrumentation-undici/LICENSE rename to packages/instrumentation-lru-memoizer/LICENSE diff --git a/plugins/node/instrumentation-lru-memoizer/README.md b/packages/instrumentation-lru-memoizer/README.md similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/README.md rename to packages/instrumentation-lru-memoizer/README.md diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/packages/instrumentation-lru-memoizer/package.json similarity index 82% rename from plugins/node/instrumentation-lru-memoizer/package.json rename to packages/instrumentation-lru-memoizer/package.json index 3cbafd4a1c..52e7daf112 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/packages/instrumentation-lru-memoizer/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `lru-memoizer` function memoization using lru-cache", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-lru-memoizer" + }, "scripts": { "test": "mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -12,9 +16,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-lru-memoizer", "compile": "tsc -p ." }, @@ -57,5 +61,5 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-lru-memoizer#readme" } diff --git a/plugins/node/instrumentation-lru-memoizer/src/index.ts b/packages/instrumentation-lru-memoizer/src/index.ts similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/src/index.ts rename to packages/instrumentation-lru-memoizer/src/index.ts diff --git a/plugins/node/instrumentation-lru-memoizer/src/instrumentation.ts b/packages/instrumentation-lru-memoizer/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/src/instrumentation.ts rename to packages/instrumentation-lru-memoizer/src/instrumentation.ts diff --git a/plugins/node/instrumentation-lru-memoizer/test/index.test.ts b/packages/instrumentation-lru-memoizer/test/index.test.ts similarity index 100% rename from plugins/node/instrumentation-lru-memoizer/test/index.test.ts rename to packages/instrumentation-lru-memoizer/test/index.test.ts diff --git a/plugins/node/instrumentation-lru-memoizer/tsconfig.json b/packages/instrumentation-lru-memoizer/tsconfig.json similarity index 80% rename from plugins/node/instrumentation-lru-memoizer/tsconfig.json rename to packages/instrumentation-lru-memoizer/tsconfig.json index 5c3680dd33..e1baf4c16d 100644 --- a/plugins/node/instrumentation-lru-memoizer/tsconfig.json +++ b/packages/instrumentation-lru-memoizer/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/plugins/node/instrumentation-typeorm/.eslintignore b/packages/instrumentation-memcached/.eslintignore similarity index 100% rename from plugins/node/instrumentation-typeorm/.eslintignore rename to packages/instrumentation-memcached/.eslintignore diff --git a/packages/instrumentation-memcached/.eslintrc.js b/packages/instrumentation-memcached/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-memcached/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md b/packages/instrumentation-memcached/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md rename to packages/instrumentation-memcached/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/LICENSE b/packages/instrumentation-memcached/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/LICENSE rename to packages/instrumentation-memcached/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-memcached/README.md b/packages/instrumentation-memcached/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/README.md rename to packages/instrumentation-memcached/README.md diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/packages/instrumentation-memcached/package.json similarity index 86% rename from plugins/node/opentelemetry-instrumentation-memcached/package.json rename to packages/instrumentation-memcached/package.json index 5c203fde8d..dc72d27d4a 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/packages/instrumentation-memcached/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `memcached` database client for memcached", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-memcached" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-memcached", @@ -16,7 +20,7 @@ "test": "nyc mocha 'test/**/*.test.ts'", "test:debug": "cross-env RUN_MEMCACHED_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", "test:local": "cross-env RUN_MEMCACHED_TESTS_LOCAL=true npm run test", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "instrumentation", @@ -61,5 +65,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@types/memcached": "^2.2.6" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-memcached#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-memcached#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-memcached/src/index.ts b/packages/instrumentation-memcached/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/src/index.ts rename to packages/instrumentation-memcached/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-memcached/src/instrumentation.ts b/packages/instrumentation-memcached/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/src/instrumentation.ts rename to packages/instrumentation-memcached/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-memcached/src/types.ts b/packages/instrumentation-memcached/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/src/types.ts rename to packages/instrumentation-memcached/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-memcached/src/utils.ts b/packages/instrumentation-memcached/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/src/utils.ts rename to packages/instrumentation-memcached/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-memcached/test/index.test.ts b/packages/instrumentation-memcached/test/index.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/test/index.test.ts rename to packages/instrumentation-memcached/test/index.test.ts diff --git a/packages/instrumentation-memcached/tsconfig.json b/packages/instrumentation-memcached/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-memcached/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/instrumentation-undici/.eslintignore b/packages/instrumentation-mongodb/.eslintignore similarity index 100% rename from plugins/node/instrumentation-undici/.eslintignore rename to packages/instrumentation-mongodb/.eslintignore diff --git a/packages/instrumentation-mongodb/.eslintrc.js b/packages/instrumentation-mongodb/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-mongodb/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml b/packages/instrumentation-mongodb/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml rename to packages/instrumentation-mongodb/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md b/packages/instrumentation-mongodb/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md rename to packages/instrumentation-mongodb/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/LICENSE b/packages/instrumentation-mongodb/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/LICENSE rename to packages/instrumentation-mongodb/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/README.md b/packages/instrumentation-mongodb/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/README.md rename to packages/instrumentation-mongodb/README.md diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/packages/instrumentation-mongodb/package.json similarity index 88% rename from plugins/node/opentelemetry-instrumentation-mongodb/package.json rename to packages/instrumentation-mongodb/package.json index f8e1fa5b9c..ec3ad51398 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/packages/instrumentation-mongodb/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `mongodb` database client for MongoDB", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-mongodb" + }, "scripts": { "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", "test": "npm run test-v4 && npm run test-v5-v6", @@ -19,8 +23,8 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-mongodb", "compile": "tsc -p .", "prepublishOnly": "npm run compile", @@ -70,5 +74,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mongodb#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/index.ts b/packages/instrumentation-mongodb/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/src/index.ts rename to packages/instrumentation-mongodb/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts b/packages/instrumentation-mongodb/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/src/instrumentation.ts rename to packages/instrumentation-mongodb/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/internal-types.ts b/packages/instrumentation-mongodb/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/src/internal-types.ts rename to packages/instrumentation-mongodb/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/types.ts b/packages/instrumentation-mongodb/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/src/types.ts rename to packages/instrumentation-mongodb/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v3.test.ts b/packages/instrumentation-mongodb/test/mongodb-v3.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v3.test.ts rename to packages/instrumentation-mongodb/test/mongodb-v3.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5-v6.metrics.test.ts b/packages/instrumentation-mongodb/test/mongodb-v4-v5-v6.metrics.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4-v5-v6.metrics.test.ts rename to packages/instrumentation-mongodb/test/mongodb-v4-v5-v6.metrics.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.test.ts b/packages/instrumentation-mongodb/test/mongodb-v4.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v4.test.ts rename to packages/instrumentation-mongodb/test/mongodb-v4.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5-v6.test.ts b/packages/instrumentation-mongodb/test/mongodb-v5-v6.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/test/mongodb-v5-v6.test.ts rename to packages/instrumentation-mongodb/test/mongodb-v5-v6.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/test/utils.ts b/packages/instrumentation-mongodb/test/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/test/utils.ts rename to packages/instrumentation-mongodb/test/utils.ts diff --git a/packages/instrumentation-mongodb/tsconfig.json b/packages/instrumentation-mongodb/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-mongodb/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/.eslintignore b/packages/instrumentation-mongoose/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-lambda/.eslintignore rename to packages/instrumentation-mongoose/.eslintignore diff --git a/packages/instrumentation-mongoose/.eslintrc.js b/packages/instrumentation-mongoose/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-mongoose/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-mongoose/.tav.yml b/packages/instrumentation-mongoose/.tav.yml similarity index 100% rename from plugins/node/instrumentation-mongoose/.tav.yml rename to packages/instrumentation-mongoose/.tav.yml diff --git a/plugins/node/instrumentation-mongoose/CHANGELOG.md b/packages/instrumentation-mongoose/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-mongoose/CHANGELOG.md rename to packages/instrumentation-mongoose/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/LICENSE b/packages/instrumentation-mongoose/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/LICENSE rename to packages/instrumentation-mongoose/LICENSE diff --git a/plugins/node/instrumentation-mongoose/README.md b/packages/instrumentation-mongoose/README.md similarity index 100% rename from plugins/node/instrumentation-mongoose/README.md rename to packages/instrumentation-mongoose/README.md diff --git a/plugins/node/instrumentation-mongoose/package.json b/packages/instrumentation-mongoose/package.json similarity index 86% rename from plugins/node/instrumentation-mongoose/package.json rename to packages/instrumentation-mongoose/package.json index 179cee60fa..609d35d9dc 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/packages/instrumentation-mongoose/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `mongoose` database object data modeling (ODM) library for MongoDB", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-mongoose" + }, "scripts": { "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", "test": "npm run test-v5-v6", @@ -15,9 +19,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-mongoose", "compile": "tsc -p ." }, @@ -64,5 +68,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mongoose#readme" } diff --git a/plugins/node/instrumentation-mongoose/src/index.ts b/packages/instrumentation-mongoose/src/index.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/src/index.ts rename to packages/instrumentation-mongoose/src/index.ts diff --git a/plugins/node/instrumentation-mongoose/src/mongoose.ts b/packages/instrumentation-mongoose/src/mongoose.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/src/mongoose.ts rename to packages/instrumentation-mongoose/src/mongoose.ts diff --git a/plugins/node/instrumentation-mongoose/src/types.ts b/packages/instrumentation-mongoose/src/types.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/src/types.ts rename to packages/instrumentation-mongoose/src/types.ts diff --git a/plugins/node/instrumentation-mongoose/src/utils.ts b/packages/instrumentation-mongoose/src/utils.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/src/utils.ts rename to packages/instrumentation-mongoose/src/utils.ts diff --git a/plugins/node/instrumentation-mongoose/test/asserts.ts b/packages/instrumentation-mongoose/test/asserts.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/test/asserts.ts rename to packages/instrumentation-mongoose/test/asserts.ts diff --git a/plugins/node/instrumentation-mongoose/test/config.ts b/packages/instrumentation-mongoose/test/config.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/test/config.ts rename to packages/instrumentation-mongoose/test/config.ts diff --git a/plugins/node/instrumentation-mongoose/test/fixtures/use-mongoose.mjs b/packages/instrumentation-mongoose/test/fixtures/use-mongoose.mjs similarity index 100% rename from plugins/node/instrumentation-mongoose/test/fixtures/use-mongoose.mjs rename to packages/instrumentation-mongoose/test/fixtures/use-mongoose.mjs diff --git a/plugins/node/instrumentation-mongoose/test/mongoose-common.test.ts b/packages/instrumentation-mongoose/test/mongoose-common.test.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/test/mongoose-common.test.ts rename to packages/instrumentation-mongoose/test/mongoose-common.test.ts diff --git a/plugins/node/instrumentation-mongoose/test/mongoose-v5-v6.test.ts b/packages/instrumentation-mongoose/test/mongoose-v5-v6.test.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/test/mongoose-v5-v6.test.ts rename to packages/instrumentation-mongoose/test/mongoose-v5-v6.test.ts diff --git a/plugins/node/instrumentation-mongoose/test/mongoose-v7-v8.test.ts b/packages/instrumentation-mongoose/test/mongoose-v7-v8.test.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/test/mongoose-v7-v8.test.ts rename to packages/instrumentation-mongoose/test/mongoose-v7-v8.test.ts diff --git a/plugins/node/instrumentation-mongoose/test/user.ts b/packages/instrumentation-mongoose/test/user.ts similarity index 100% rename from plugins/node/instrumentation-mongoose/test/user.ts rename to packages/instrumentation-mongoose/test/user.ts diff --git a/packages/instrumentation-mongoose/tsconfig.json b/packages/instrumentation-mongoose/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-mongoose/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/.eslintignore b/packages/instrumentation-mysql/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-aws-sdk/.eslintignore rename to packages/instrumentation-mysql/.eslintignore diff --git a/packages/instrumentation-mysql/.eslintrc.js b/packages/instrumentation-mysql/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-mysql/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md b/packages/instrumentation-mysql/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md rename to packages/instrumentation-mysql/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/LICENSE b/packages/instrumentation-mysql/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/LICENSE rename to packages/instrumentation-mysql/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-mysql/README.md b/packages/instrumentation-mysql/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/README.md rename to packages/instrumentation-mysql/README.md diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/packages/instrumentation-mysql/package.json similarity index 85% rename from plugins/node/opentelemetry-instrumentation-mysql/package.json rename to packages/instrumentation-mysql/package.json index 9dc758b40b..bb641a239e 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/packages/instrumentation-mysql/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `mysql` database client for MySQL", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-mysql" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-mysql", @@ -14,7 +18,7 @@ "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "instrumentation", @@ -60,5 +64,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@types/mysql": "2.15.27" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mysql#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/AttributeNames.ts b/packages/instrumentation-mysql/src/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/src/AttributeNames.ts rename to packages/instrumentation-mysql/src/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/index.ts b/packages/instrumentation-mysql/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/src/index.ts rename to packages/instrumentation-mysql/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts b/packages/instrumentation-mysql/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts rename to packages/instrumentation-mysql/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/types.ts b/packages/instrumentation-mysql/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/src/types.ts rename to packages/instrumentation-mysql/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts b/packages/instrumentation-mysql/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/src/utils.ts rename to packages/instrumentation-mysql/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/test/index.metrics.test.ts b/packages/instrumentation-mysql/test/index.metrics.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/test/index.metrics.test.ts rename to packages/instrumentation-mysql/test/index.metrics.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/test/index.test.ts b/packages/instrumentation-mysql/test/index.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/test/index.test.ts rename to packages/instrumentation-mysql/test/index.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql/test/utils.test.ts b/packages/instrumentation-mysql/test/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/test/utils.test.ts rename to packages/instrumentation-mysql/test/utils.test.ts diff --git a/packages/instrumentation-mysql/tsconfig.json b/packages/instrumentation-mysql/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-mysql/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/.eslintignore b/packages/instrumentation-mysql2/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-bunyan/.eslintignore rename to packages/instrumentation-mysql2/.eslintignore diff --git a/packages/instrumentation-mysql2/.eslintrc.js b/packages/instrumentation-mysql2/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-mysql2/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml b/packages/instrumentation-mysql2/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml rename to packages/instrumentation-mysql2/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md b/packages/instrumentation-mysql2/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md rename to packages/instrumentation-mysql2/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-connect/LICENSE b/packages/instrumentation-mysql2/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-connect/LICENSE rename to packages/instrumentation-mysql2/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/README.md b/packages/instrumentation-mysql2/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/README.md rename to packages/instrumentation-mysql2/README.md diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/env b/packages/instrumentation-mysql2/env similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/env rename to packages/instrumentation-mysql2/env diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/packages/instrumentation-mysql2/package.json similarity index 86% rename from plugins/node/opentelemetry-instrumentation-mysql2/package.json rename to packages/instrumentation-mysql2/package.json index aa226fa108..ab3ba8d541 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/packages/instrumentation-mysql2/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `mysql2` database client for MySQL", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-mysql2" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-mysql2", @@ -15,7 +19,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "instrumentation", @@ -62,5 +66,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@opentelemetry/sql-common": "^0.41.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-mysql2#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/index.ts b/packages/instrumentation-mysql2/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/src/index.ts rename to packages/instrumentation-mysql2/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts b/packages/instrumentation-mysql2/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts rename to packages/instrumentation-mysql2/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/types.ts b/packages/instrumentation-mysql2/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/src/types.ts rename to packages/instrumentation-mysql2/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts b/packages/instrumentation-mysql2/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts rename to packages/instrumentation-mysql2/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts b/packages/instrumentation-mysql2/test/mysql.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts rename to packages/instrumentation-mysql2/test/mysql.test.ts diff --git a/packages/instrumentation-mysql2/tsconfig.json b/packages/instrumentation-mysql2/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-mysql2/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/.eslintignore b/packages/instrumentation-nestjs-core/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-cassandra/.eslintignore rename to packages/instrumentation-nestjs-core/.eslintignore diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/.eslintrc.js b/packages/instrumentation-nestjs-core/.eslintrc.js similarity index 64% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/.eslintrc.js rename to packages/instrumentation-nestjs-core/.eslintrc.js index 5054f4d287..224df6c2dc 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/.eslintrc.js +++ b/packages/instrumentation-nestjs-core/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { mocha: true, node: true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') }; diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/.tav.yml b/packages/instrumentation-nestjs-core/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/.tav.yml rename to packages/instrumentation-nestjs-core/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md b/packages/instrumentation-nestjs-core/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md rename to packages/instrumentation-nestjs-core/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-dns/LICENSE b/packages/instrumentation-nestjs-core/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/LICENSE rename to packages/instrumentation-nestjs-core/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/README.md b/packages/instrumentation-nestjs-core/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/README.md rename to packages/instrumentation-nestjs-core/README.md diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/packages/instrumentation-nestjs-core/package.json similarity index 88% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/package.json rename to packages/instrumentation-nestjs-core/package.json index 01d7516245..de97cea3f9 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/packages/instrumentation-nestjs-core/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for NestJS server side applications framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-nestjs-core" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-nestjs-core", @@ -17,7 +21,7 @@ "test": "npm run test-required-node-version && nyc mocha --timeout 5000 'test/**/*.test.ts' || echo 'Node version is not supported for testing'", "test-required-node-version": "node -e \"process.exit(parseInt(process.versions.node.split('.')[0], 10) >= 15 ? 0 : 1)\"", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "instrumentation", @@ -69,5 +73,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.30.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-nestjs-core#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-nestjs-core#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/enums/AttributeNames.ts b/packages/instrumentation-nestjs-core/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/src/enums/AttributeNames.ts rename to packages/instrumentation-nestjs-core/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/enums/NestType.ts b/packages/instrumentation-nestjs-core/src/enums/NestType.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/src/enums/NestType.ts rename to packages/instrumentation-nestjs-core/src/enums/NestType.ts diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/enums/index.ts b/packages/instrumentation-nestjs-core/src/enums/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/src/enums/index.ts rename to packages/instrumentation-nestjs-core/src/enums/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/index.ts b/packages/instrumentation-nestjs-core/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/src/index.ts rename to packages/instrumentation-nestjs-core/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/src/instrumentation.ts b/packages/instrumentation-nestjs-core/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/src/instrumentation.ts rename to packages/instrumentation-nestjs-core/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/test/index.test.ts b/packages/instrumentation-nestjs-core/test/index.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/test/index.test.ts rename to packages/instrumentation-nestjs-core/test/index.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/test/setup.ts b/packages/instrumentation-nestjs-core/test/setup.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/test/setup.ts rename to packages/instrumentation-nestjs-core/test/setup.ts diff --git a/packages/instrumentation-nestjs-core/tsconfig.json b/packages/instrumentation-nestjs-core/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-nestjs-core/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-dns/.eslintignore b/packages/instrumentation-net/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-dns/.eslintignore rename to packages/instrumentation-net/.eslintignore diff --git a/packages/instrumentation-net/.eslintrc.js b/packages/instrumentation-net/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-net/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md b/packages/instrumentation-net/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md rename to packages/instrumentation-net/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-express/LICENSE b/packages/instrumentation-net/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/LICENSE rename to packages/instrumentation-net/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-net/README.md b/packages/instrumentation-net/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/README.md rename to packages/instrumentation-net/README.md diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/packages/instrumentation-net/package.json similarity index 82% rename from plugins/node/opentelemetry-instrumentation-net/package.json rename to packages/instrumentation-net/package.json index 8e94be3681..fae95d9d93 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/packages/instrumentation-net/package.json @@ -4,16 +4,20 @@ "description": "OpenTelemetry instrumentation for `node:net` network API module", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-net" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-net", "compile": "tsc -p ." }, @@ -59,5 +63,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-net#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-net#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-net/src/index.ts b/packages/instrumentation-net/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/src/index.ts rename to packages/instrumentation-net/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/src/instrumentation.ts b/packages/instrumentation-net/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/src/instrumentation.ts rename to packages/instrumentation-net/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/src/internal-types.ts b/packages/instrumentation-net/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/src/internal-types.ts rename to packages/instrumentation-net/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/src/types.ts b/packages/instrumentation-net/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/src/types.ts rename to packages/instrumentation-net/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/src/utils.ts b/packages/instrumentation-net/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/src/utils.ts rename to packages/instrumentation-net/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/test/connect.test.ts b/packages/instrumentation-net/test/connect.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/test/connect.test.ts rename to packages/instrumentation-net/test/connect.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/test/fixtures/tls.crt b/packages/instrumentation-net/test/fixtures/tls.crt similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/test/fixtures/tls.crt rename to packages/instrumentation-net/test/fixtures/tls.crt diff --git a/plugins/node/opentelemetry-instrumentation-net/test/fixtures/tls.key b/packages/instrumentation-net/test/fixtures/tls.key similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/test/fixtures/tls.key rename to packages/instrumentation-net/test/fixtures/tls.key diff --git a/plugins/node/opentelemetry-instrumentation-net/test/instrument.test.ts b/packages/instrumentation-net/test/instrument.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/test/instrument.test.ts rename to packages/instrumentation-net/test/instrument.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/test/tls.test.ts b/packages/instrumentation-net/test/tls.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/test/tls.test.ts rename to packages/instrumentation-net/test/tls.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-net/test/utils.ts b/packages/instrumentation-net/test/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/test/utils.ts rename to packages/instrumentation-net/test/utils.ts diff --git a/packages/instrumentation-net/tsconfig.json b/packages/instrumentation-net/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-net/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-express/.eslintignore b/packages/instrumentation-oracledb/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-express/.eslintignore rename to packages/instrumentation-oracledb/.eslintignore diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/.eslintrc.js b/packages/instrumentation-oracledb/.eslintrc.js similarity index 93% rename from plugins/node/opentelemetry-instrumentation-oracledb/.eslintrc.js rename to packages/instrumentation-oracledb/.eslintrc.js index 0116c0c123..af8a1ac3ee 100644 --- a/plugins/node/opentelemetry-instrumentation-oracledb/.eslintrc.js +++ b/packages/instrumentation-oracledb/.eslintrc.js @@ -1,7 +1,7 @@ -const parentConfig = require('../../../eslint.config.js'); +const parentConfig = require('../../eslint.config.js'); module.exports = { - extends: '../../../eslint.config.js', // Extends the top-level config + extends: '../../eslint.config.js', // Extends the top-level config ignorePatterns: [ ...(parentConfig.ignorePatterns || []), // Retain parent's ignorePatterns array 'src/version.ts', // ignore this file diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/.tav.yml b/packages/instrumentation-oracledb/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/.tav.yml rename to packages/instrumentation-oracledb/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/CHANGELOG.md b/packages/instrumentation-oracledb/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/CHANGELOG.md rename to packages/instrumentation-oracledb/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-fastify/LICENSE b/packages/instrumentation-oracledb/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-fastify/LICENSE rename to packages/instrumentation-oracledb/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/NOTICE.txt b/packages/instrumentation-oracledb/NOTICE.txt similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/NOTICE.txt rename to packages/instrumentation-oracledb/NOTICE.txt diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/README.md b/packages/instrumentation-oracledb/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/README.md rename to packages/instrumentation-oracledb/README.md diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/package.json b/packages/instrumentation-oracledb/package.json similarity index 86% rename from plugins/node/opentelemetry-instrumentation-oracledb/package.json rename to packages/instrumentation-oracledb/package.json index f0eb5a0b1d..b273d3b163 100644 --- a/plugins/node/opentelemetry-instrumentation-oracledb/package.json +++ b/packages/instrumentation-oracledb/package.json @@ -4,14 +4,18 @@ "description": "OpenTelemetry instrumentation for `oracledb` database client for Oracle DB", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-oracledb" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-oracledb", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", @@ -20,7 +24,7 @@ "test-all-versions:local": "cross-env RUN_ORACLEDB_TESTS_LOCAL=true npm run test-all-versions", "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", "test:local": "cross-env RUN_ORACLEDB_TESTS_LOCAL=true npm run test", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -71,5 +75,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@types/oracledb": "6.5.2" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-oracledb#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-oracledb#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/OracleTelemetryTraceHandler.ts b/packages/instrumentation-oracledb/src/OracleTelemetryTraceHandler.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/OracleTelemetryTraceHandler.ts rename to packages/instrumentation-oracledb/src/OracleTelemetryTraceHandler.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/constants.ts b/packages/instrumentation-oracledb/src/constants.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/constants.ts rename to packages/instrumentation-oracledb/src/constants.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/index.ts b/packages/instrumentation-oracledb/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/index.ts rename to packages/instrumentation-oracledb/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/instrumentation.ts b/packages/instrumentation-oracledb/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/instrumentation.ts rename to packages/instrumentation-oracledb/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/internal-types.ts b/packages/instrumentation-oracledb/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/internal-types.ts rename to packages/instrumentation-oracledb/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/semconv.ts b/packages/instrumentation-oracledb/src/semconv.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/semconv.ts rename to packages/instrumentation-oracledb/src/semconv.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/src/types.ts b/packages/instrumentation-oracledb/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/src/types.ts rename to packages/instrumentation-oracledb/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/test/oracle.test.ts b/packages/instrumentation-oracledb/test/oracle.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/test/oracle.test.ts rename to packages/instrumentation-oracledb/test/oracle.test.ts diff --git a/packages/instrumentation-oracledb/tsconfig.json b/packages/instrumentation-oracledb/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-oracledb/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/.eslintignore b/packages/instrumentation-pg/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/.eslintignore rename to packages/instrumentation-pg/.eslintignore diff --git a/packages/instrumentation-pg/.eslintrc.js b/packages/instrumentation-pg/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-pg/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-pg/.tav.yml b/packages/instrumentation-pg/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/.tav.yml rename to packages/instrumentation-pg/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md b/packages/instrumentation-pg/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md rename to packages/instrumentation-pg/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/LICENSE b/packages/instrumentation-pg/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-generic-pool/LICENSE rename to packages/instrumentation-pg/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-pg/README.md b/packages/instrumentation-pg/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/README.md rename to packages/instrumentation-pg/README.md diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/packages/instrumentation-pg/package.json similarity index 87% rename from plugins/node/opentelemetry-instrumentation-pg/package.json rename to packages/instrumentation-pg/package.json index be73f6f284..43d319a176 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/packages/instrumentation-pg/package.json @@ -4,14 +4,18 @@ "description": "OpenTelemetry instrumentation for `pg` and `pg-pool` database client for PostgreSQL", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-pg" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-pg", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", @@ -19,7 +23,7 @@ "test-all-versions:local": "cross-env RUN_POSTGRES_TESTS_LOCAL=true npm run test-all-versions", "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", "test:local": "cross-env RUN_POSTGRES_TESTS_LOCAL=true npm run test", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -76,5 +80,5 @@ "@types/pg": "8.15.4", "@types/pg-pool": "2.0.6" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pg#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-pg#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/enums/AttributeNames.ts b/packages/instrumentation-pg/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/enums/AttributeNames.ts rename to packages/instrumentation-pg/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/enums/SpanNames.ts b/packages/instrumentation-pg/src/enums/SpanNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/enums/SpanNames.ts rename to packages/instrumentation-pg/src/enums/SpanNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/index.ts b/packages/instrumentation-pg/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/index.ts rename to packages/instrumentation-pg/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts b/packages/instrumentation-pg/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts rename to packages/instrumentation-pg/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/internal-types.ts b/packages/instrumentation-pg/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/internal-types.ts rename to packages/instrumentation-pg/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/semconv.ts b/packages/instrumentation-pg/src/semconv.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/semconv.ts rename to packages/instrumentation-pg/src/semconv.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/types.ts b/packages/instrumentation-pg/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/types.ts rename to packages/instrumentation-pg/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/utils.ts b/packages/instrumentation-pg/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/src/utils.ts rename to packages/instrumentation-pg/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/fixtures/use-pg-pool.mjs b/packages/instrumentation-pg/test/fixtures/use-pg-pool.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/test/fixtures/use-pg-pool.mjs rename to packages/instrumentation-pg/test/fixtures/use-pg-pool.mjs diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/fixtures/use-pg.mjs b/packages/instrumentation-pg/test/fixtures/use-pg.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/test/fixtures/use-pg.mjs rename to packages/instrumentation-pg/test/fixtures/use-pg.mjs diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts b/packages/instrumentation-pg/test/pg-pool.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts rename to packages/instrumentation-pg/test/pg-pool.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts b/packages/instrumentation-pg/test/pg.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/test/pg.test.ts rename to packages/instrumentation-pg/test/pg.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/types.ts b/packages/instrumentation-pg/test/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/test/types.ts rename to packages/instrumentation-pg/test/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts b/packages/instrumentation-pg/test/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts rename to packages/instrumentation-pg/test/utils.test.ts diff --git a/packages/instrumentation-pg/tsconfig.json b/packages/instrumentation-pg/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-pg/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-graphql/.eslintignore b/packages/instrumentation-pino/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/.eslintignore rename to packages/instrumentation-pino/.eslintignore diff --git a/packages/instrumentation-pino/.eslintrc.js b/packages/instrumentation-pino/.eslintrc.js new file mode 100644 index 0000000000..d9630e1c33 --- /dev/null +++ b/packages/instrumentation-pino/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js'), +} diff --git a/plugins/node/opentelemetry-instrumentation-pino/.tav.yml b/packages/instrumentation-pino/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/.tav.yml rename to packages/instrumentation-pino/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md b/packages/instrumentation-pino/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md rename to packages/instrumentation-pino/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-graphql/LICENSE b/packages/instrumentation-pino/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-graphql/LICENSE rename to packages/instrumentation-pino/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-pino/README.md b/packages/instrumentation-pino/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/README.md rename to packages/instrumentation-pino/README.md diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/packages/instrumentation-pino/package.json similarity index 84% rename from plugins/node/opentelemetry-instrumentation-pino/package.json rename to packages/instrumentation-pino/package.json index 7fcae0dafe..e0eba8753a 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/packages/instrumentation-pino/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `pino` logger", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-pino" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -12,9 +16,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-pino", "compile": "tsc -p ." }, @@ -66,5 +70,5 @@ "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-pino#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-pino/src/index.ts b/packages/instrumentation-pino/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/src/index.ts rename to packages/instrumentation-pino/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts b/packages/instrumentation-pino/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts rename to packages/instrumentation-pino/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-pino/src/log-sending-utils.ts b/packages/instrumentation-pino/src/log-sending-utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/src/log-sending-utils.ts rename to packages/instrumentation-pino/src/log-sending-utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-pino/src/types.ts b/packages/instrumentation-pino/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/src/types.ts rename to packages/instrumentation-pino/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-default-import.mjs b/packages/instrumentation-pino/test/fixtures/use-pino-default-import.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-default-import.mjs rename to packages/instrumentation-pino/test/fixtures/use-pino-default-import.mjs diff --git a/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-named-import.mjs b/packages/instrumentation-pino/test/fixtures/use-pino-named-import.mjs similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-named-import.mjs rename to packages/instrumentation-pino/test/fixtures/use-pino-named-import.mjs diff --git a/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts b/packages/instrumentation-pino/test/pino.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts rename to packages/instrumentation-pino/test/pino.test.ts diff --git a/packages/instrumentation-pino/tsconfig.json b/packages/instrumentation-pino/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-pino/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/instrumentation-redis-4/README.md b/packages/instrumentation-redis-4/README.md new file mode 100644 index 0000000000..775d53c8ea --- /dev/null +++ b/packages/instrumentation-redis-4/README.md @@ -0,0 +1,6 @@ +# OpenTelemetry redis v4 Instrumentation for Node.js + +> ⚠️ **DEPRECATED**: The `@opentelemetry/instrumentation-redis-4` (note the "-4" suffix) instrumentation is deprecated. The support for `redis@4` instrumentation is now part of `@opentelemetry/instrumentation-redis` (as of v0.50.0). Please use it instead. + +The source code for this instrumentation has been moved to the ["instrumentation-redis" package](../instrumentation-redis). Use [the "instrumentation-redis-4-v0.49.0" git tag to see the package source code for the last release (v0.49.0)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/instrumentation-redis-4-v0.49.0/plugins/node/opentelemetry-instrumentation-redis-4). + diff --git a/plugins/node/opentelemetry-instrumentation-hapi/.eslintignore b/packages/instrumentation-redis/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/.eslintignore rename to packages/instrumentation-redis/.eslintignore diff --git a/packages/instrumentation-redis/.eslintrc.js b/packages/instrumentation-redis/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-redis/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-redis/.tav.yml b/packages/instrumentation-redis/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/.tav.yml rename to packages/instrumentation-redis/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md b/packages/instrumentation-redis/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md rename to packages/instrumentation-redis/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-hapi/LICENSE b/packages/instrumentation-redis/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-hapi/LICENSE rename to packages/instrumentation-redis/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-redis/README.md b/packages/instrumentation-redis/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/README.md rename to packages/instrumentation-redis/README.md diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/packages/instrumentation-redis/package.json similarity index 87% rename from plugins/node/opentelemetry-instrumentation-redis/package.json rename to packages/instrumentation-redis/package.json index 27da00bf29..78757f9249 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/packages/instrumentation-redis/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `redis` database client for Redis", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-redis" + }, "scripts": { "test-v2-v3": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v2-v3/*.test.ts'", "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v4/*.test.ts'", @@ -18,8 +22,8 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-redis", "compile": "tsc -p .", "prepublishOnly": "npm run compile" @@ -68,5 +72,5 @@ "@opentelemetry/redis-common": "^0.38.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-redis#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/index.ts b/packages/instrumentation-redis/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/index.ts rename to packages/instrumentation-redis/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/redis.ts b/packages/instrumentation-redis/src/redis.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/redis.ts rename to packages/instrumentation-redis/src/redis.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/types.ts b/packages/instrumentation-redis/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/types.ts rename to packages/instrumentation-redis/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/instrumentation.ts b/packages/instrumentation-redis/src/v2-v3/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/instrumentation.ts rename to packages/instrumentation-redis/src/v2-v3/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/internal-types.ts b/packages/instrumentation-redis/src/v2-v3/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/internal-types.ts rename to packages/instrumentation-redis/src/v2-v3/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/utils.ts b/packages/instrumentation-redis/src/v2-v3/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/v2-v3/utils.ts rename to packages/instrumentation-redis/src/v2-v3/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/v4/instrumentation.ts b/packages/instrumentation-redis/src/v4/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/v4/instrumentation.ts rename to packages/instrumentation-redis/src/v4/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/v4/internal-types.ts b/packages/instrumentation-redis/src/v4/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/v4/internal-types.ts rename to packages/instrumentation-redis/src/v4/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/v4/utils.ts b/packages/instrumentation-redis/src/v4/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/src/v4/utils.ts rename to packages/instrumentation-redis/src/v4/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/test/v2-v3/redis.test.ts b/packages/instrumentation-redis/test/v2-v3/redis.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/test/v2-v3/redis.test.ts rename to packages/instrumentation-redis/test/v2-v3/redis.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/test/v4/redis.test.ts b/packages/instrumentation-redis/test/v4/redis.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/test/v4/redis.test.ts rename to packages/instrumentation-redis/test/v4/redis.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-redis/test/v4/utils.ts b/packages/instrumentation-redis/test/v4/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/test/v4/utils.ts rename to packages/instrumentation-redis/test/v4/utils.ts diff --git a/packages/instrumentation-redis/tsconfig.json b/packages/instrumentation-redis/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-redis/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/.eslintignore b/packages/instrumentation-restify/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/.eslintignore rename to packages/instrumentation-restify/.eslintignore diff --git a/packages/instrumentation-restify/.eslintrc.js b/packages/instrumentation-restify/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-restify/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-restify/.tav.yml b/packages/instrumentation-restify/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/.tav.yml rename to packages/instrumentation-restify/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md b/packages/instrumentation-restify/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md rename to packages/instrumentation-restify/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/LICENSE b/packages/instrumentation-restify/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-ioredis/LICENSE rename to packages/instrumentation-restify/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-restify/README.md b/packages/instrumentation-restify/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/README.md rename to packages/instrumentation-restify/README.md diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/packages/instrumentation-restify/package.json similarity index 83% rename from plugins/node/opentelemetry-instrumentation-restify/package.json rename to packages/instrumentation-restify/package.json index 2936cc4171..ad0cb20f2a 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/packages/instrumentation-restify/package.json @@ -4,19 +4,23 @@ "description": "OpenTelemetry instrumentation for `restify` http web application framework", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-restify" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-restify", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", "tdd": "yarn test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -63,5 +67,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-restify#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/constants.ts b/packages/instrumentation-restify/src/constants.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/constants.ts rename to packages/instrumentation-restify/src/constants.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/enums/AttributeNames.ts b/packages/instrumentation-restify/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/enums/AttributeNames.ts rename to packages/instrumentation-restify/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/index.ts b/packages/instrumentation-restify/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/index.ts rename to packages/instrumentation-restify/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts b/packages/instrumentation-restify/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts rename to packages/instrumentation-restify/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/internal-types.ts b/packages/instrumentation-restify/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/internal-types.ts rename to packages/instrumentation-restify/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/types.ts b/packages/instrumentation-restify/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/types.ts rename to packages/instrumentation-restify/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/src/utils.ts b/packages/instrumentation-restify/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/src/utils.ts rename to packages/instrumentation-restify/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts b/packages/instrumentation-restify/test/restify.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts rename to packages/instrumentation-restify/test/restify.test.ts diff --git a/plugins/node/opentelemetry-instrumentation-restify/test/utils.test.ts b/packages/instrumentation-restify/test/utils.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/test/utils.test.ts rename to packages/instrumentation-restify/test/utils.test.ts diff --git a/packages/instrumentation-restify/tsconfig.json b/packages/instrumentation-restify/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-restify/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-knex/.eslintignore b/packages/instrumentation-router/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/.eslintignore rename to packages/instrumentation-router/.eslintignore diff --git a/packages/instrumentation-router/.eslintrc.js b/packages/instrumentation-router/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-router/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md b/packages/instrumentation-router/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md rename to packages/instrumentation-router/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-knex/LICENSE b/packages/instrumentation-router/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-knex/LICENSE rename to packages/instrumentation-router/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-router/README.md b/packages/instrumentation-router/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/README.md rename to packages/instrumentation-router/README.md diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/packages/instrumentation-router/package.json similarity index 82% rename from plugins/node/opentelemetry-instrumentation-router/package.json rename to packages/instrumentation-router/package.json index 6d4ff112d8..9fb73a25db 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/packages/instrumentation-router/package.json @@ -4,15 +4,19 @@ "description": "OpenTelemetry instrumentation for `router` http middleware router", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-router" + }, "scripts": { "test": "nyc mocha 'test/**/*.ts'", "tdd": "yarn test -- --watch-extensions ts --watch", "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-router", "compile": "tsc -p .", "prepublishOnly": "npm run compile", @@ -57,5 +61,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-router#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-router#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-router/src/constants.ts b/packages/instrumentation-router/src/constants.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/constants.ts rename to packages/instrumentation-router/src/constants.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/enums/AttributeNames.ts b/packages/instrumentation-router/src/enums/AttributeNames.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/enums/AttributeNames.ts rename to packages/instrumentation-router/src/enums/AttributeNames.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/enums/LayerType.ts b/packages/instrumentation-router/src/enums/LayerType.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/enums/LayerType.ts rename to packages/instrumentation-router/src/enums/LayerType.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/index.ts b/packages/instrumentation-router/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/index.ts rename to packages/instrumentation-router/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/instrumentation.ts b/packages/instrumentation-router/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/instrumentation.ts rename to packages/instrumentation-router/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/internal-types.ts b/packages/instrumentation-router/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/internal-types.ts rename to packages/instrumentation-router/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/router.d.ts b/packages/instrumentation-router/src/router.d.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/router.d.ts rename to packages/instrumentation-router/src/router.d.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/src/utils.ts b/packages/instrumentation-router/src/utils.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/src/utils.ts rename to packages/instrumentation-router/src/utils.ts diff --git a/plugins/node/opentelemetry-instrumentation-router/test/index.test.ts b/packages/instrumentation-router/test/index.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/test/index.test.ts rename to packages/instrumentation-router/test/index.test.ts diff --git a/packages/instrumentation-router/tsconfig.json b/packages/instrumentation-router/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-router/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-koa/.eslintignore b/packages/instrumentation-runtime-node/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/.eslintignore rename to packages/instrumentation-runtime-node/.eslintignore diff --git a/packages/opentelemetry-sql-common/.eslintrc.js b/packages/instrumentation-runtime-node/.eslintrc.js similarity index 100% rename from packages/opentelemetry-sql-common/.eslintrc.js rename to packages/instrumentation-runtime-node/.eslintrc.js diff --git a/plugins/node/instrumentation-runtime-node/CHANGELOG.md b/packages/instrumentation-runtime-node/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-runtime-node/CHANGELOG.md rename to packages/instrumentation-runtime-node/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-koa/LICENSE b/packages/instrumentation-runtime-node/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-koa/LICENSE rename to packages/instrumentation-runtime-node/LICENSE diff --git a/plugins/node/instrumentation-runtime-node/README.md b/packages/instrumentation-runtime-node/README.md similarity index 100% rename from plugins/node/instrumentation-runtime-node/README.md rename to packages/instrumentation-runtime-node/README.md diff --git a/plugins/node/instrumentation-runtime-node/package.json b/packages/instrumentation-runtime-node/package.json similarity index 82% rename from plugins/node/instrumentation-runtime-node/package.json rename to packages/instrumentation-runtime-node/package.json index de6ad9c646..d1d367f8de 100644 --- a/plugins/node/instrumentation-runtime-node/package.json +++ b/packages/instrumentation-runtime-node/package.json @@ -4,8 +4,12 @@ "description": "OpenTelemetry instrumentation for Node.js Performance measurement API", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-runtime-node", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-runtime-node" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-runtime-node#readme", "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-runtime-node", @@ -14,7 +18,7 @@ "lint:fix": "eslint . --ext .ts --fix", "prepublishOnly": "npm run compile", "test": "nyc mocha 'test/**/*.test.ts'", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0", diff --git a/plugins/node/instrumentation-runtime-node/src/consts/attributes.ts b/packages/instrumentation-runtime-node/src/consts/attributes.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/consts/attributes.ts rename to packages/instrumentation-runtime-node/src/consts/attributes.ts diff --git a/plugins/node/instrumentation-runtime-node/src/global.d.ts b/packages/instrumentation-runtime-node/src/global.d.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/global.d.ts rename to packages/instrumentation-runtime-node/src/global.d.ts diff --git a/plugins/node/instrumentation-runtime-node/src/index.ts b/packages/instrumentation-runtime-node/src/index.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/index.ts rename to packages/instrumentation-runtime-node/src/index.ts diff --git a/plugins/node/instrumentation-runtime-node/src/instrumentation.ts b/packages/instrumentation-runtime-node/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/instrumentation.ts rename to packages/instrumentation-runtime-node/src/instrumentation.ts diff --git a/plugins/node/instrumentation-runtime-node/src/metrics/baseCollector.ts b/packages/instrumentation-runtime-node/src/metrics/baseCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/metrics/baseCollector.ts rename to packages/instrumentation-runtime-node/src/metrics/baseCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/src/metrics/eventLoopDelayCollector.ts b/packages/instrumentation-runtime-node/src/metrics/eventLoopDelayCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/metrics/eventLoopDelayCollector.ts rename to packages/instrumentation-runtime-node/src/metrics/eventLoopDelayCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/src/metrics/eventLoopTimeCollector.ts b/packages/instrumentation-runtime-node/src/metrics/eventLoopTimeCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/metrics/eventLoopTimeCollector.ts rename to packages/instrumentation-runtime-node/src/metrics/eventLoopTimeCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/src/metrics/eventLoopUtilizationCollector.ts b/packages/instrumentation-runtime-node/src/metrics/eventLoopUtilizationCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/metrics/eventLoopUtilizationCollector.ts rename to packages/instrumentation-runtime-node/src/metrics/eventLoopUtilizationCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/src/metrics/gcCollector.ts b/packages/instrumentation-runtime-node/src/metrics/gcCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/metrics/gcCollector.ts rename to packages/instrumentation-runtime-node/src/metrics/gcCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/src/metrics/heapSpacesSizeAndUsedCollector.ts b/packages/instrumentation-runtime-node/src/metrics/heapSpacesSizeAndUsedCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/metrics/heapSpacesSizeAndUsedCollector.ts rename to packages/instrumentation-runtime-node/src/metrics/heapSpacesSizeAndUsedCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/src/types.ts b/packages/instrumentation-runtime-node/src/types.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/types.ts rename to packages/instrumentation-runtime-node/src/types.ts diff --git a/plugins/node/instrumentation-runtime-node/src/types/ConventionalNamePrefix.ts b/packages/instrumentation-runtime-node/src/types/ConventionalNamePrefix.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/types/ConventionalNamePrefix.ts rename to packages/instrumentation-runtime-node/src/types/ConventionalNamePrefix.ts diff --git a/plugins/node/instrumentation-runtime-node/src/types/metricCollector.ts b/packages/instrumentation-runtime-node/src/types/metricCollector.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/src/types/metricCollector.ts rename to packages/instrumentation-runtime-node/src/types/metricCollector.ts diff --git a/plugins/node/instrumentation-runtime-node/test/event_loop_delay.test.ts b/packages/instrumentation-runtime-node/test/event_loop_delay.test.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/test/event_loop_delay.test.ts rename to packages/instrumentation-runtime-node/test/event_loop_delay.test.ts diff --git a/plugins/node/instrumentation-runtime-node/test/event_loop_time.test.ts b/packages/instrumentation-runtime-node/test/event_loop_time.test.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/test/event_loop_time.test.ts rename to packages/instrumentation-runtime-node/test/event_loop_time.test.ts diff --git a/plugins/node/instrumentation-runtime-node/test/event_loop_utilization.test.ts b/packages/instrumentation-runtime-node/test/event_loop_utilization.test.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/test/event_loop_utilization.test.ts rename to packages/instrumentation-runtime-node/test/event_loop_utilization.test.ts diff --git a/plugins/node/instrumentation-runtime-node/test/heap_space_and_used.test.ts b/packages/instrumentation-runtime-node/test/heap_space_and_used.test.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/test/heap_space_and_used.test.ts rename to packages/instrumentation-runtime-node/test/heap_space_and_used.test.ts diff --git a/plugins/node/instrumentation-runtime-node/test/instrumentation.test.ts b/packages/instrumentation-runtime-node/test/instrumentation.test.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/test/instrumentation.test.ts rename to packages/instrumentation-runtime-node/test/instrumentation.test.ts diff --git a/plugins/node/instrumentation-runtime-node/test/testMetricsReader.ts b/packages/instrumentation-runtime-node/test/testMetricsReader.ts similarity index 100% rename from plugins/node/instrumentation-runtime-node/test/testMetricsReader.ts rename to packages/instrumentation-runtime-node/test/testMetricsReader.ts diff --git a/packages/instrumentation-runtime-node/tsconfig.json b/packages/instrumentation-runtime-node/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-runtime-node/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-memcached/.eslintignore b/packages/instrumentation-socket.io/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/.eslintignore rename to packages/instrumentation-socket.io/.eslintignore diff --git a/packages/instrumentation-socket.io/.eslintrc.js b/packages/instrumentation-socket.io/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-socket.io/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-socket.io/.tav.yml b/packages/instrumentation-socket.io/.tav.yml similarity index 100% rename from plugins/node/instrumentation-socket.io/.tav.yml rename to packages/instrumentation-socket.io/.tav.yml diff --git a/plugins/node/instrumentation-socket.io/CHANGELOG.md b/packages/instrumentation-socket.io/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-socket.io/CHANGELOG.md rename to packages/instrumentation-socket.io/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-memcached/LICENSE b/packages/instrumentation-socket.io/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-memcached/LICENSE rename to packages/instrumentation-socket.io/LICENSE diff --git a/plugins/node/instrumentation-socket.io/README.md b/packages/instrumentation-socket.io/README.md similarity index 100% rename from plugins/node/instrumentation-socket.io/README.md rename to packages/instrumentation-socket.io/README.md diff --git a/plugins/node/instrumentation-socket.io/package.json b/packages/instrumentation-socket.io/package.json similarity index 83% rename from plugins/node/instrumentation-socket.io/package.json rename to packages/instrumentation-socket.io/package.json index 1d916bd4cf..0ce7a14540 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/packages/instrumentation-socket.io/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `socket.io` messaging server implementation for Socket.IO communication", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-socket.io" + }, "scripts": { "test": "mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -12,9 +16,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-socket.io", "compile": "tsc -p ." }, @@ -59,5 +63,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-socket.io#readme" } diff --git a/plugins/node/instrumentation-socket.io/src/AttributeNames.ts b/packages/instrumentation-socket.io/src/AttributeNames.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/src/AttributeNames.ts rename to packages/instrumentation-socket.io/src/AttributeNames.ts diff --git a/plugins/node/instrumentation-socket.io/src/index.ts b/packages/instrumentation-socket.io/src/index.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/src/index.ts rename to packages/instrumentation-socket.io/src/index.ts diff --git a/plugins/node/instrumentation-socket.io/src/socket.io.ts b/packages/instrumentation-socket.io/src/socket.io.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/src/socket.io.ts rename to packages/instrumentation-socket.io/src/socket.io.ts diff --git a/plugins/node/instrumentation-socket.io/src/types.ts b/packages/instrumentation-socket.io/src/types.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/src/types.ts rename to packages/instrumentation-socket.io/src/types.ts diff --git a/plugins/node/instrumentation-socket.io/src/utils.ts b/packages/instrumentation-socket.io/src/utils.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/src/utils.ts rename to packages/instrumentation-socket.io/src/utils.ts diff --git a/plugins/node/instrumentation-socket.io/test/config.test.ts b/packages/instrumentation-socket.io/test/config.test.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/test/config.test.ts rename to packages/instrumentation-socket.io/test/config.test.ts diff --git a/plugins/node/instrumentation-socket.io/test/socket.io.test.ts b/packages/instrumentation-socket.io/test/socket.io.test.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/test/socket.io.test.ts rename to packages/instrumentation-socket.io/test/socket.io.test.ts diff --git a/plugins/node/instrumentation-socket.io/test/utils.ts b/packages/instrumentation-socket.io/test/utils.ts similarity index 100% rename from plugins/node/instrumentation-socket.io/test/utils.ts rename to packages/instrumentation-socket.io/test/utils.ts diff --git a/plugins/node/instrumentation-socket.io/tsconfig.json b/packages/instrumentation-socket.io/tsconfig.json similarity index 77% rename from plugins/node/instrumentation-socket.io/tsconfig.json rename to packages/instrumentation-socket.io/tsconfig.json index 3feff66260..569e38e289 100644 --- a/plugins/node/instrumentation-socket.io/tsconfig.json +++ b/packages/instrumentation-socket.io/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/.eslintignore b/packages/instrumentation-tedious/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/.eslintignore rename to packages/instrumentation-tedious/.eslintignore diff --git a/packages/instrumentation-tedious/.eslintrc.js b/packages/instrumentation-tedious/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-tedious/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-tedious/.tav.yml b/packages/instrumentation-tedious/.tav.yml similarity index 100% rename from plugins/node/instrumentation-tedious/.tav.yml rename to packages/instrumentation-tedious/.tav.yml diff --git a/plugins/node/instrumentation-tedious/CHANGELOG.md b/packages/instrumentation-tedious/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-tedious/CHANGELOG.md rename to packages/instrumentation-tedious/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/LICENSE b/packages/instrumentation-tedious/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mongodb/LICENSE rename to packages/instrumentation-tedious/LICENSE diff --git a/plugins/node/instrumentation-tedious/README.md b/packages/instrumentation-tedious/README.md similarity index 100% rename from plugins/node/instrumentation-tedious/README.md rename to packages/instrumentation-tedious/README.md diff --git a/plugins/node/instrumentation-tedious/package.json b/packages/instrumentation-tedious/package.json similarity index 86% rename from plugins/node/instrumentation-tedious/package.json rename to packages/instrumentation-tedious/package.json index 11037bb4ad..67dc2cfaf6 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/packages/instrumentation-tedious/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `tedious` database client for Microsoft SQL Server", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-tedious" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-tedious", @@ -15,7 +19,7 @@ "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha 'test/**/*.test.ts'", "test-all-versions": "tav", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "instrumentation", @@ -64,5 +68,5 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "@types/tedious": "^4.0.14" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-tedious#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-tedious#readme" } diff --git a/plugins/node/instrumentation-tedious/src/index.ts b/packages/instrumentation-tedious/src/index.ts similarity index 100% rename from plugins/node/instrumentation-tedious/src/index.ts rename to packages/instrumentation-tedious/src/index.ts diff --git a/plugins/node/instrumentation-tedious/src/instrumentation.ts b/packages/instrumentation-tedious/src/instrumentation.ts similarity index 100% rename from plugins/node/instrumentation-tedious/src/instrumentation.ts rename to packages/instrumentation-tedious/src/instrumentation.ts diff --git a/plugins/node/instrumentation-tedious/src/types.ts b/packages/instrumentation-tedious/src/types.ts similarity index 100% rename from plugins/node/instrumentation-tedious/src/types.ts rename to packages/instrumentation-tedious/src/types.ts diff --git a/plugins/node/instrumentation-tedious/src/utils.ts b/packages/instrumentation-tedious/src/utils.ts similarity index 100% rename from plugins/node/instrumentation-tedious/src/utils.ts rename to packages/instrumentation-tedious/src/utils.ts diff --git a/plugins/node/instrumentation-tedious/test/api.ts b/packages/instrumentation-tedious/test/api.ts similarity index 100% rename from plugins/node/instrumentation-tedious/test/api.ts rename to packages/instrumentation-tedious/test/api.ts diff --git a/plugins/node/instrumentation-tedious/test/instrumentation.test.ts b/packages/instrumentation-tedious/test/instrumentation.test.ts similarity index 100% rename from plugins/node/instrumentation-tedious/test/instrumentation.test.ts rename to packages/instrumentation-tedious/test/instrumentation.test.ts diff --git a/packages/instrumentation-tedious/tsconfig.json b/packages/instrumentation-tedious/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-tedious/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-mysql/.eslintignore b/packages/instrumentation-typeorm/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/.eslintignore rename to packages/instrumentation-typeorm/.eslintignore diff --git a/packages/instrumentation-typeorm/.eslintrc.js b/packages/instrumentation-typeorm/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-typeorm/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-typeorm/.tav.yml b/packages/instrumentation-typeorm/.tav.yml similarity index 100% rename from plugins/node/instrumentation-typeorm/.tav.yml rename to packages/instrumentation-typeorm/.tav.yml diff --git a/plugins/node/instrumentation-typeorm/CHANGELOG.md b/packages/instrumentation-typeorm/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-typeorm/CHANGELOG.md rename to packages/instrumentation-typeorm/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-mysql/LICENSE b/packages/instrumentation-typeorm/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql/LICENSE rename to packages/instrumentation-typeorm/LICENSE diff --git a/plugins/node/instrumentation-typeorm/NOTICE b/packages/instrumentation-typeorm/NOTICE similarity index 100% rename from plugins/node/instrumentation-typeorm/NOTICE rename to packages/instrumentation-typeorm/NOTICE diff --git a/plugins/node/instrumentation-typeorm/README.md b/packages/instrumentation-typeorm/README.md similarity index 100% rename from plugins/node/instrumentation-typeorm/README.md rename to packages/instrumentation-typeorm/README.md diff --git a/plugins/node/instrumentation-typeorm/package.json b/packages/instrumentation-typeorm/package.json similarity index 83% rename from plugins/node/instrumentation-typeorm/package.json rename to packages/instrumentation-typeorm/package.json index 1de69531e6..5935399a02 100644 --- a/plugins/node/instrumentation-typeorm/package.json +++ b/packages/instrumentation-typeorm/package.json @@ -4,21 +4,25 @@ "description": "OpenTelemetry instrumentation for `typeorm` database data-mapper ORM", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-typeorm" + }, "scripts": { "clean": "rimraf build/*", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-typeorm", "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", "test:debug": "mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc -w" }, "keywords": [ @@ -60,5 +64,5 @@ "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-typeorm#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-typeorm#readme" } diff --git a/plugins/node/instrumentation-typeorm/src/index.ts b/packages/instrumentation-typeorm/src/index.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/index.ts rename to packages/instrumentation-typeorm/src/index.ts diff --git a/plugins/node/instrumentation-typeorm/src/semconv.ts b/packages/instrumentation-typeorm/src/semconv.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/semconv.ts rename to packages/instrumentation-typeorm/src/semconv.ts diff --git a/plugins/node/instrumentation-typeorm/src/typeorm.ts b/packages/instrumentation-typeorm/src/typeorm.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/typeorm.ts rename to packages/instrumentation-typeorm/src/typeorm.ts diff --git a/plugins/node/instrumentation-typeorm/src/types.ts b/packages/instrumentation-typeorm/src/types.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/types.ts rename to packages/instrumentation-typeorm/src/types.ts diff --git a/plugins/node/instrumentation-typeorm/src/utils/get-func-param-names.ts b/packages/instrumentation-typeorm/src/utils/get-func-param-names.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/utils/get-func-param-names.ts rename to packages/instrumentation-typeorm/src/utils/get-func-param-names.ts diff --git a/plugins/node/instrumentation-typeorm/src/utils/index.ts b/packages/instrumentation-typeorm/src/utils/index.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/utils/index.ts rename to packages/instrumentation-typeorm/src/utils/index.ts diff --git a/plugins/node/instrumentation-typeorm/src/utils/suppressTracing.ts b/packages/instrumentation-typeorm/src/utils/suppressTracing.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/src/utils/suppressTracing.ts rename to packages/instrumentation-typeorm/src/utils/suppressTracing.ts diff --git a/plugins/node/instrumentation-typeorm/test/Connection.test.ts b/packages/instrumentation-typeorm/test/Connection.test.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/test/Connection.test.ts rename to packages/instrumentation-typeorm/test/Connection.test.ts diff --git a/plugins/node/instrumentation-typeorm/test/EntityManager.test.ts b/packages/instrumentation-typeorm/test/EntityManager.test.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/test/EntityManager.test.ts rename to packages/instrumentation-typeorm/test/EntityManager.test.ts diff --git a/plugins/node/instrumentation-typeorm/test/QueryBuilder.test.ts b/packages/instrumentation-typeorm/test/QueryBuilder.test.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/test/QueryBuilder.test.ts rename to packages/instrumentation-typeorm/test/QueryBuilder.test.ts diff --git a/plugins/node/instrumentation-typeorm/test/Repository.test.ts b/packages/instrumentation-typeorm/test/Repository.test.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/test/Repository.test.ts rename to packages/instrumentation-typeorm/test/Repository.test.ts diff --git a/plugins/node/instrumentation-typeorm/test/config.test.ts b/packages/instrumentation-typeorm/test/config.test.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/test/config.test.ts rename to packages/instrumentation-typeorm/test/config.test.ts diff --git a/plugins/node/instrumentation-typeorm/test/utils.ts b/packages/instrumentation-typeorm/test/utils.ts similarity index 100% rename from plugins/node/instrumentation-typeorm/test/utils.ts rename to packages/instrumentation-typeorm/test/utils.ts diff --git a/plugins/node/instrumentation-typeorm/tsconfig.json b/packages/instrumentation-typeorm/tsconfig.json similarity index 83% rename from plugins/node/instrumentation-typeorm/tsconfig.json rename to packages/instrumentation-typeorm/tsconfig.json index 9078465762..28e0864594 100644 --- a/plugins/node/instrumentation-typeorm/tsconfig.json +++ b/packages/instrumentation-typeorm/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/.eslintignore b/packages/instrumentation-undici/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/.eslintignore rename to packages/instrumentation-undici/.eslintignore diff --git a/packages/instrumentation-undici/.eslintrc.js b/packages/instrumentation-undici/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/instrumentation-undici/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/plugins/node/instrumentation-undici/.tav.yml b/packages/instrumentation-undici/.tav.yml similarity index 100% rename from plugins/node/instrumentation-undici/.tav.yml rename to packages/instrumentation-undici/.tav.yml diff --git a/plugins/node/instrumentation-undici/CHANGELOG.md b/packages/instrumentation-undici/CHANGELOG.md similarity index 100% rename from plugins/node/instrumentation-undici/CHANGELOG.md rename to packages/instrumentation-undici/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/LICENSE b/packages/instrumentation-undici/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-mysql2/LICENSE rename to packages/instrumentation-undici/LICENSE diff --git a/plugins/node/instrumentation-undici/README.md b/packages/instrumentation-undici/README.md similarity index 81% rename from plugins/node/instrumentation-undici/README.md rename to packages/instrumentation-undici/README.md index 154a915b63..cdb30de28b 100644 --- a/plugins/node/instrumentation-undici/README.md +++ b/packages/instrumentation-undici/README.md @@ -54,12 +54,12 @@ Undici instrumentation has few options available to choose from. You can set the | Options | Type | Description | | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| [`ignoreRequestHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/instrumentation-undici/src/types.ts#L73) | `IgnoreRequestFunction` | Undici instrumentation will not trace all incoming requests that matched with custom function. | -| [`requestHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/instrumentation-undici/src/types.ts#L75) | `RequestHookFunction` | Function for adding custom attributes before request is handled. | -| [`responseHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/instrumentation-undici/src/types.ts#L77) | `ResponseHookFunction` | Function for adding custom attributes after the response headers are received. | -| [`startSpanHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/instrumentation-undici/src/types.ts#L79) | `StartSpanHookFunction` | Function for adding custom attributes before a span is started. | -| [`requireParentforSpans`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/instrumentation-undici/src/types.ts#L81) | `Boolean` | Require a parent span is present to create new span for outgoing requests. | -| [`headersToSpanAttributes`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/instrumentation-undici/src/types.ts#L83) | `Object` | List of case insensitive HTTP headers to convert to span attributes. Headers will be converted to span attributes in the form of `http.{request\|response}.header.header-name` where the name is only lowercased, e.g. `http.response.header.content-length` | +| [`ignoreRequestHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-undici/src/types.ts#L73) | `IgnoreRequestFunction` | Undici instrumentation will not trace all incoming requests that matched with custom function. | +| [`requestHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-undici/src/types.ts#L75) | `RequestHookFunction` | Function for adding custom attributes before request is handled. | +| [`responseHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-undici/src/types.ts#L77) | `ResponseHookFunction` | Function for adding custom attributes after the response headers are received. | +| [`startSpanHook`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-undici/src/types.ts#L79) | `StartSpanHookFunction` | Function for adding custom attributes before a span is started. | +| [`requireParentforSpans`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-undici/src/types.ts#L81) | `Boolean` | Require a parent span is present to create new span for outgoing requests. | +| [`headersToSpanAttributes`](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-undici/src/types.ts#L83) | `Object` | List of case insensitive HTTP headers to convert to span attributes. Headers will be converted to span attributes in the form of `http.{request\|response}.header.header-name` where the name is only lowercased, e.g. `http.response.header.content-length` | ### Observations diff --git a/plugins/node/instrumentation-undici/package.json b/packages/instrumentation-undici/package.json similarity index 85% rename from plugins/node/instrumentation-undici/package.json rename to packages/instrumentation-undici/package.json index 41bf4dd98e..9e2775b968 100644 --- a/plugins/node/instrumentation-undici/package.json +++ b/packages/instrumentation-undici/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `undici` http client and Node.js fetch()", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-undici" + }, "scripts": { "prepublishOnly": "npm run compile", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-undici", @@ -16,7 +20,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "watch": "tsc -w", - "version:update": "node ../../../scripts/version-update.js" + "version:update": "node ../../scripts/version-update.js" }, "keywords": [ "opentelemetry", @@ -60,6 +64,6 @@ "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-undici", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-undici#readme", "sideEffects": false } diff --git a/plugins/node/instrumentation-undici/src/enums/SemanticAttributes.ts b/packages/instrumentation-undici/src/enums/SemanticAttributes.ts similarity index 100% rename from plugins/node/instrumentation-undici/src/enums/SemanticAttributes.ts rename to packages/instrumentation-undici/src/enums/SemanticAttributes.ts diff --git a/plugins/node/instrumentation-undici/src/index.ts b/packages/instrumentation-undici/src/index.ts similarity index 100% rename from plugins/node/instrumentation-undici/src/index.ts rename to packages/instrumentation-undici/src/index.ts diff --git a/plugins/node/instrumentation-undici/src/internal-types.ts b/packages/instrumentation-undici/src/internal-types.ts similarity index 100% rename from plugins/node/instrumentation-undici/src/internal-types.ts rename to packages/instrumentation-undici/src/internal-types.ts diff --git a/plugins/node/instrumentation-undici/src/types.ts b/packages/instrumentation-undici/src/types.ts similarity index 100% rename from plugins/node/instrumentation-undici/src/types.ts rename to packages/instrumentation-undici/src/types.ts diff --git a/plugins/node/instrumentation-undici/src/undici.ts b/packages/instrumentation-undici/src/undici.ts similarity index 100% rename from plugins/node/instrumentation-undici/src/undici.ts rename to packages/instrumentation-undici/src/undici.ts diff --git a/plugins/node/instrumentation-undici/test/fetch.test.ts b/packages/instrumentation-undici/test/fetch.test.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/fetch.test.ts rename to packages/instrumentation-undici/test/fetch.test.ts diff --git a/plugins/node/instrumentation-undici/test/metrics.test.ts b/packages/instrumentation-undici/test/metrics.test.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/metrics.test.ts rename to packages/instrumentation-undici/test/metrics.test.ts diff --git a/plugins/node/instrumentation-undici/test/undici.test.ts b/packages/instrumentation-undici/test/undici.test.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/undici.test.ts rename to packages/instrumentation-undici/test/undici.test.ts diff --git a/plugins/node/instrumentation-undici/test/utils/assertSpan.ts b/packages/instrumentation-undici/test/utils/assertSpan.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/utils/assertSpan.ts rename to packages/instrumentation-undici/test/utils/assertSpan.ts diff --git a/plugins/node/instrumentation-undici/test/utils/mock-metrics-reader.ts b/packages/instrumentation-undici/test/utils/mock-metrics-reader.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/utils/mock-metrics-reader.ts rename to packages/instrumentation-undici/test/utils/mock-metrics-reader.ts diff --git a/plugins/node/instrumentation-undici/test/utils/mock-propagation.ts b/packages/instrumentation-undici/test/utils/mock-propagation.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/utils/mock-propagation.ts rename to packages/instrumentation-undici/test/utils/mock-propagation.ts diff --git a/plugins/node/instrumentation-undici/test/utils/mock-server.ts b/packages/instrumentation-undici/test/utils/mock-server.ts similarity index 100% rename from plugins/node/instrumentation-undici/test/utils/mock-server.ts rename to packages/instrumentation-undici/test/utils/mock-server.ts diff --git a/packages/instrumentation-undici/tsconfig.json b/packages/instrumentation-undici/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-undici/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/.eslintignore b/packages/instrumentation-user-interaction/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/.eslintignore rename to packages/instrumentation-user-interaction/.eslintignore diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintrc.js b/packages/instrumentation-user-interaction/.eslintrc.js similarity index 81% rename from plugins/web/opentelemetry-instrumentation-user-interaction/.eslintrc.js rename to packages/instrumentation-user-interaction/.eslintrc.js index ea4d42f5ec..0587e2b9e4 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintrc.js +++ b/packages/instrumentation-user-interaction/.eslintrc.js @@ -8,5 +8,5 @@ module.exports = { "globals": { "Zone": "readonly" }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md b/packages/instrumentation-user-interaction/CHANGELOG.md similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md rename to packages/instrumentation-user-interaction/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/LICENSE b/packages/instrumentation-user-interaction/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-nestjs-core/LICENSE rename to packages/instrumentation-user-interaction/LICENSE diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/README.md b/packages/instrumentation-user-interaction/README.md similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/README.md rename to packages/instrumentation-user-interaction/README.md diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/images/click-sync.jpg b/packages/instrumentation-user-interaction/images/click-sync.jpg similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/images/click-sync.jpg rename to packages/instrumentation-user-interaction/images/click-sync.jpg diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/images/click.jpg b/packages/instrumentation-user-interaction/images/click.jpg similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/images/click.jpg rename to packages/instrumentation-user-interaction/images/click.jpg diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/images/main-sync.jpg b/packages/instrumentation-user-interaction/images/main-sync.jpg similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/images/main-sync.jpg rename to packages/instrumentation-user-interaction/images/main-sync.jpg diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/images/main.jpg b/packages/instrumentation-user-interaction/images/main.jpg similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/images/main.jpg rename to packages/instrumentation-user-interaction/images/main.jpg diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/karma.conf.js b/packages/instrumentation-user-interaction/karma.conf.js similarity index 87% rename from plugins/web/opentelemetry-instrumentation-user-interaction/karma.conf.js rename to packages/instrumentation-user-interaction/karma.conf.js index 4a4bd49791..4bc502c46f 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/karma.conf.js +++ b/packages/instrumentation-user-interaction/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../karma.webpack'); +const karmaBaseConfig = require('../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/packages/instrumentation-user-interaction/package.json similarity index 88% rename from plugins/web/opentelemetry-instrumentation-user-interaction/package.json rename to packages/instrumentation-user-interaction/package.json index ee6c128c55..759e89263e 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/packages/instrumentation-user-interaction/package.json @@ -6,13 +6,17 @@ "module": "build/esm/index.js", "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-user-interaction" + }, "scripts": { "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-user-interaction", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "prepublishOnly": "npm run compile", @@ -88,5 +92,5 @@ "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "sideEffects": false, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-user-interaction#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-user-interaction#readme" } diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/enums/AttributeNames.ts b/packages/instrumentation-user-interaction/src/enums/AttributeNames.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/src/enums/AttributeNames.ts rename to packages/instrumentation-user-interaction/src/enums/AttributeNames.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/index.ts b/packages/instrumentation-user-interaction/src/index.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/src/index.ts rename to packages/instrumentation-user-interaction/src/index.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts b/packages/instrumentation-user-interaction/src/instrumentation.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts rename to packages/instrumentation-user-interaction/src/instrumentation.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts b/packages/instrumentation-user-interaction/src/internal-types.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts rename to packages/instrumentation-user-interaction/src/internal-types.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/types.ts b/packages/instrumentation-user-interaction/src/types.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/src/types.ts rename to packages/instrumentation-user-interaction/src/types.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/test/helper.test.ts b/packages/instrumentation-user-interaction/test/helper.test.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/test/helper.test.ts rename to packages/instrumentation-user-interaction/test/helper.test.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/test/index-webpack.ts b/packages/instrumentation-user-interaction/test/index-webpack.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/test/index-webpack.ts rename to packages/instrumentation-user-interaction/test/index-webpack.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts b/packages/instrumentation-user-interaction/test/userInteraction.nozone.test.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts rename to packages/instrumentation-user-interaction/test/userInteraction.nozone.test.ts diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.test.ts b/packages/instrumentation-user-interaction/test/userInteraction.test.ts similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.test.ts rename to packages/instrumentation-user-interaction/test/userInteraction.test.ts diff --git a/propagators/opentelemetry-propagator-ot-trace/tsconfig.esm.json b/packages/instrumentation-user-interaction/tsconfig.esm.json similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/tsconfig.esm.json rename to packages/instrumentation-user-interaction/tsconfig.esm.json diff --git a/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esnext.json b/packages/instrumentation-user-interaction/tsconfig.esnext.json similarity index 78% rename from plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esnext.json rename to packages/instrumentation-user-interaction/tsconfig.esnext.json index cb78dd6ff3..65a918cf6b 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esnext.json +++ b/packages/instrumentation-user-interaction/tsconfig.esnext.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esnext.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esnext", diff --git a/packages/instrumentation-user-interaction/tsconfig.json b/packages/instrumentation-user-interaction/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-user-interaction/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-net/.eslintignore b/packages/instrumentation-winston/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/.eslintignore rename to packages/instrumentation-winston/.eslintignore diff --git a/packages/instrumentation-winston/.eslintrc.js b/packages/instrumentation-winston/.eslintrc.js new file mode 100644 index 0000000000..d9630e1c33 --- /dev/null +++ b/packages/instrumentation-winston/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js'), +} diff --git a/plugins/node/opentelemetry-instrumentation-winston/.tav.yml b/packages/instrumentation-winston/.tav.yml similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/.tav.yml rename to packages/instrumentation-winston/.tav.yml diff --git a/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md b/packages/instrumentation-winston/CHANGELOG.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md rename to packages/instrumentation-winston/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-net/LICENSE b/packages/instrumentation-winston/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-net/LICENSE rename to packages/instrumentation-winston/LICENSE diff --git a/plugins/node/opentelemetry-instrumentation-winston/README.md b/packages/instrumentation-winston/README.md similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/README.md rename to packages/instrumentation-winston/README.md diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/packages/instrumentation-winston/package.json similarity index 85% rename from plugins/node/opentelemetry-instrumentation-winston/package.json rename to packages/instrumentation-winston/package.json index c52d757cf9..0ca7304216 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/packages/instrumentation-winston/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry instrumentation for `winston` logger", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/instrumentation-winston" + }, "scripts": { "test": "npm run test-v1-v2 && npm run test-v3 && nyc merge .nyc_output ./coverage/coverage-final.json", "test-v1-v2": "tav winston 2.4.7 npm run test-run", @@ -15,9 +19,9 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", + "lint:readme": "node ../../scripts/lint-readme.js", "prepublishOnly": "npm run compile", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/instrumentation-winston", "compile": "tsc -p ." }, @@ -68,5 +72,5 @@ "@opentelemetry/api-logs": "^0.202.0", "@opentelemetry/instrumentation": "^0.202.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-winston#readme" } diff --git a/plugins/node/opentelemetry-instrumentation-winston/src/index.ts b/packages/instrumentation-winston/src/index.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/src/index.ts rename to packages/instrumentation-winston/src/index.ts diff --git a/plugins/node/opentelemetry-instrumentation-winston/src/instrumentation.ts b/packages/instrumentation-winston/src/instrumentation.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/src/instrumentation.ts rename to packages/instrumentation-winston/src/instrumentation.ts diff --git a/plugins/node/opentelemetry-instrumentation-winston/src/internal-types.ts b/packages/instrumentation-winston/src/internal-types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/src/internal-types.ts rename to packages/instrumentation-winston/src/internal-types.ts diff --git a/plugins/node/opentelemetry-instrumentation-winston/src/types.ts b/packages/instrumentation-winston/src/types.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/src/types.ts rename to packages/instrumentation-winston/src/types.ts diff --git a/plugins/node/opentelemetry-instrumentation-winston/test/winston.test.ts b/packages/instrumentation-winston/test/winston.test.ts similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/test/winston.test.ts rename to packages/instrumentation-winston/test/winston.test.ts diff --git a/packages/instrumentation-winston/tsconfig.json b/packages/instrumentation-winston/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/instrumentation-winston/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/.eslintignore b/packages/plugin-react-load/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/.eslintignore rename to packages/plugin-react-load/.eslintignore diff --git a/plugins/web/opentelemetry-plugin-react-load/.eslintrc.js b/packages/plugin-react-load/.eslintrc.js similarity index 75% rename from plugins/web/opentelemetry-plugin-react-load/.eslintrc.js rename to packages/plugin-react-load/.eslintrc.js index 6ad6c9f216..01b8d09740 100644 --- a/plugins/web/opentelemetry-plugin-react-load/.eslintrc.js +++ b/packages/plugin-react-load/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md b/packages/plugin-react-load/CHANGELOG.md similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/CHANGELOG.md rename to packages/plugin-react-load/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/LICENSE b/packages/plugin-react-load/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-oracledb/LICENSE rename to packages/plugin-react-load/LICENSE diff --git a/plugins/web/opentelemetry-plugin-react-load/README.md b/packages/plugin-react-load/README.md similarity index 92% rename from plugins/web/opentelemetry-plugin-react-load/README.md rename to packages/plugin-react-load/README.md index ab822d1955..71fdd29ae0 100644 --- a/plugins/web/opentelemetry-plugin-react-load/README.md +++ b/packages/plugin-react-load/README.md @@ -11,9 +11,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. ## Status -| Maturity | [Component Owner](../../../.github/component_owners.yml) | Compatibility | +| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility | | ---------------------------------------- | -------------------------------------------------------- | --------------------- | -| [Unmaintained](../../../CONTRIBUTING.md) | N/A | API 1.0+
SDK 1.0+ | +| [Unmaintained](../../CONTRIBUTING.md) | N/A | API 1.0+
SDK 1.0+ | ## Installation diff --git a/plugins/web/opentelemetry-plugin-react-load/karma.conf.js b/packages/plugin-react-load/karma.conf.js similarity index 86% rename from plugins/web/opentelemetry-plugin-react-load/karma.conf.js rename to packages/plugin-react-load/karma.conf.js index 6174839d65..3019564a15 100644 --- a/plugins/web/opentelemetry-plugin-react-load/karma.conf.js +++ b/packages/plugin-react-load/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../../karma.webpack'); -const karmaBaseConfig = require('../../../karma.base'); +const karmaWebpackConfig = require('../../karma.webpack'); +const karmaBaseConfig = require('../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/packages/plugin-react-load/package.json similarity index 88% rename from plugins/web/opentelemetry-plugin-react-load/package.json rename to packages/plugin-react-load/package.json index 2476ed1169..d2fff37328 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/packages/plugin-react-load/package.json @@ -6,13 +6,17 @@ "module": "build/esm/index.js", "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/plugin-react-load" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "lint:readme": "node ../../../scripts/lint-readme.js", - "version:update": "node ../../../scripts/version-update.js", + "lint:readme": "node ../../scripts/lint-readme.js", + "version:update": "node ../../scripts/version-update.js", "setup:dev": "nx run-many -t compile -p @opentelemetry/plugin-react-load", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "prepublishOnly": "npm run compile", @@ -90,5 +94,5 @@ "@opentelemetry/instrumentation": "^0.202.0", "shimmer": "^1.2.1" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-plugin-react-load#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/plugin-react-load#readme" } diff --git a/plugins/web/opentelemetry-plugin-react-load/src/BaseOpenTelemetryComponent.ts b/packages/plugin-react-load/src/BaseOpenTelemetryComponent.ts similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/src/BaseOpenTelemetryComponent.ts rename to packages/plugin-react-load/src/BaseOpenTelemetryComponent.ts diff --git a/plugins/web/opentelemetry-plugin-react-load/src/enums/AttributeNames.ts b/packages/plugin-react-load/src/enums/AttributeNames.ts similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/src/enums/AttributeNames.ts rename to packages/plugin-react-load/src/enums/AttributeNames.ts diff --git a/plugins/web/opentelemetry-plugin-react-load/src/index.ts b/packages/plugin-react-load/src/index.ts similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/src/index.ts rename to packages/plugin-react-load/src/index.ts diff --git a/plugins/web/opentelemetry-plugin-react-load/src/internal-types.ts b/packages/plugin-react-load/src/internal-types.ts similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/src/internal-types.ts rename to packages/plugin-react-load/src/internal-types.ts diff --git a/plugins/web/opentelemetry-plugin-react-load/test/BaseOpenTelemetryComponent.test.ts b/packages/plugin-react-load/test/BaseOpenTelemetryComponent.test.ts similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/BaseOpenTelemetryComponent.test.ts rename to packages/plugin-react-load/test/BaseOpenTelemetryComponent.test.ts diff --git a/plugins/web/opentelemetry-plugin-react-load/test/index-webpack.ts b/packages/plugin-react-load/test/index-webpack.ts similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/index-webpack.ts rename to packages/plugin-react-load/test/index-webpack.ts diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/AllLifecycles.tsx b/packages/plugin-react-load/test/test-react-components/AllLifecycles.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/AllLifecycles.tsx rename to packages/plugin-react-load/test/test-react-components/AllLifecycles.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx b/packages/plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx rename to packages/plugin-react-load/test/test-react-components/MissingComponentDidMount.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx b/packages/plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx rename to packages/plugin-react-load/test/test-react-components/MissingComponentDidUpdate.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx b/packages/plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx rename to packages/plugin-react-load/test/test-react-components/MissingGetSnapshotBeforeUpdate.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingRender.tsx b/packages/plugin-react-load/test/test-react-components/MissingRender.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingRender.tsx rename to packages/plugin-react-load/test/test-react-components/MissingRender.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx b/packages/plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx rename to packages/plugin-react-load/test/test-react-components/MissingShouldComponentUpdate.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx b/packages/plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx rename to packages/plugin-react-load/test/test-react-components/ShouldComponentUpdateFalse.tsx diff --git a/plugins/web/opentelemetry-plugin-react-load/tsconfig.esm.json b/packages/plugin-react-load/tsconfig.esm.json similarity index 80% rename from plugins/web/opentelemetry-plugin-react-load/tsconfig.esm.json rename to packages/plugin-react-load/tsconfig.esm.json index c7913fa6a2..b1a4816d01 100644 --- a/plugins/web/opentelemetry-plugin-react-load/tsconfig.esm.json +++ b/packages/plugin-react-load/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json b/packages/plugin-react-load/tsconfig.esnext.json similarity index 80% rename from plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json rename to packages/plugin-react-load/tsconfig.esnext.json index 96f396167e..509e5c0ea2 100644 --- a/plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json +++ b/packages/plugin-react-load/tsconfig.esnext.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esnext.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esnext", diff --git a/plugins/web/opentelemetry-plugin-react-load/tsconfig.json b/packages/plugin-react-load/tsconfig.json similarity index 79% rename from plugins/web/opentelemetry-plugin-react-load/tsconfig.json rename to packages/plugin-react-load/tsconfig.json index 74e0a2ef99..8248731c1a 100644 --- a/plugins/web/opentelemetry-plugin-react-load/tsconfig.json +++ b/packages/plugin-react-load/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build", diff --git a/plugins/node/opentelemetry-instrumentation-pg/.eslintignore b/packages/propagation-utils/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/.eslintignore rename to packages/propagation-utils/.eslintignore diff --git a/packages/propagation-utils/.eslintrc.js b/packages/propagation-utils/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/propagation-utils/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/packages/opentelemetry-propagation-utils/CHANGELOG.md b/packages/propagation-utils/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-propagation-utils/CHANGELOG.md rename to packages/propagation-utils/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-pg/LICENSE b/packages/propagation-utils/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pg/LICENSE rename to packages/propagation-utils/LICENSE diff --git a/packages/opentelemetry-propagation-utils/README.md b/packages/propagation-utils/README.md similarity index 100% rename from packages/opentelemetry-propagation-utils/README.md rename to packages/propagation-utils/README.md diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/propagation-utils/package.json similarity index 87% rename from packages/opentelemetry-propagation-utils/package.json rename to packages/propagation-utils/package.json index 5a33c5ee76..43251d6e12 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/propagation-utils/package.json @@ -18,7 +18,11 @@ "test": "nyc mocha 'test/**/*.test.ts'", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/propagation-utils" + }, "keywords": [ "tracing", "instrumentation" @@ -36,7 +40,7 @@ "bugs": { "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-propagation-utils#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagation-utils#readme", "peerDependencies": { "@opentelemetry/api": "^1.0.0" }, diff --git a/packages/opentelemetry-propagation-utils/src/index.ts b/packages/propagation-utils/src/index.ts similarity index 100% rename from packages/opentelemetry-propagation-utils/src/index.ts rename to packages/propagation-utils/src/index.ts diff --git a/packages/opentelemetry-propagation-utils/src/pubsub-propagation.ts b/packages/propagation-utils/src/pubsub-propagation.ts similarity index 100% rename from packages/opentelemetry-propagation-utils/src/pubsub-propagation.ts rename to packages/propagation-utils/src/pubsub-propagation.ts diff --git a/packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts b/packages/propagation-utils/test/pubsub-propagation.test.ts similarity index 100% rename from packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts rename to packages/propagation-utils/test/pubsub-propagation.test.ts diff --git a/propagators/propagator-aws-xray-lambda/tsconfig.esm.json b/packages/propagation-utils/tsconfig.esm.json similarity index 100% rename from propagators/propagator-aws-xray-lambda/tsconfig.esm.json rename to packages/propagation-utils/tsconfig.esm.json diff --git a/packages/propagation-utils/tsconfig.json b/packages/propagation-utils/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/propagation-utils/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-pino/.eslintignore b/packages/propagator-aws-xray-lambda/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/.eslintignore rename to packages/propagator-aws-xray-lambda/.eslintignore diff --git a/propagators/propagator-aws-xray-lambda/.eslintrc.js b/packages/propagator-aws-xray-lambda/.eslintrc.js similarity index 100% rename from propagators/propagator-aws-xray-lambda/.eslintrc.js rename to packages/propagator-aws-xray-lambda/.eslintrc.js diff --git a/propagators/propagator-aws-xray-lambda/.npmignore b/packages/propagator-aws-xray-lambda/.npmignore similarity index 100% rename from propagators/propagator-aws-xray-lambda/.npmignore rename to packages/propagator-aws-xray-lambda/.npmignore diff --git a/propagators/propagator-aws-xray-lambda/CHANGELOG.md b/packages/propagator-aws-xray-lambda/CHANGELOG.md similarity index 100% rename from propagators/propagator-aws-xray-lambda/CHANGELOG.md rename to packages/propagator-aws-xray-lambda/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-pino/LICENSE b/packages/propagator-aws-xray-lambda/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-pino/LICENSE rename to packages/propagator-aws-xray-lambda/LICENSE diff --git a/propagators/propagator-aws-xray-lambda/README.md b/packages/propagator-aws-xray-lambda/README.md similarity index 100% rename from propagators/propagator-aws-xray-lambda/README.md rename to packages/propagator-aws-xray-lambda/README.md diff --git a/propagators/propagator-aws-xray-lambda/package.json b/packages/propagator-aws-xray-lambda/package.json similarity index 88% rename from propagators/propagator-aws-xray-lambda/package.json rename to packages/propagator-aws-xray-lambda/package.json index 8b7272dde1..c9a5b7cc7d 100644 --- a/propagators/propagator-aws-xray-lambda/package.json +++ b/packages/propagator-aws-xray-lambda/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/propagator-aws-xray-lambda" + }, "scripts": { "setup:dev": "nx run-many -t compile -p @opentelemetry/propagator-aws-xray-lambda", "compile": "tsc --build tsconfig.json tsconfig.esm.json", @@ -58,5 +62,5 @@ "dependencies": { "@opentelemetry/propagator-aws-xray": "^2.1.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/propagators/propagator-aws-xray-lambda#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray-lambda#readme" } diff --git a/propagators/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts b/packages/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts similarity index 100% rename from propagators/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts rename to packages/propagator-aws-xray-lambda/src/AWSXRayLambdaPropagator.ts diff --git a/propagators/propagator-aws-xray-lambda/src/index.ts b/packages/propagator-aws-xray-lambda/src/index.ts similarity index 100% rename from propagators/propagator-aws-xray-lambda/src/index.ts rename to packages/propagator-aws-xray-lambda/src/index.ts diff --git a/propagators/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts b/packages/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts similarity index 100% rename from propagators/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts rename to packages/propagator-aws-xray-lambda/test/AWSXRayLambdaPropagator.test.ts diff --git a/propagators/opentelemetry-propagator-instana/test/index-webpack.ts b/packages/propagator-aws-xray-lambda/test/index-webpack.ts similarity index 100% rename from propagators/opentelemetry-propagator-instana/test/index-webpack.ts rename to packages/propagator-aws-xray-lambda/test/index-webpack.ts diff --git a/propagators/propagator-aws-xray/tsconfig.esm.json b/packages/propagator-aws-xray-lambda/tsconfig.esm.json similarity index 100% rename from propagators/propagator-aws-xray/tsconfig.esm.json rename to packages/propagator-aws-xray-lambda/tsconfig.esm.json diff --git a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esnext.json b/packages/propagator-aws-xray-lambda/tsconfig.esnext.json similarity index 78% rename from plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esnext.json rename to packages/propagator-aws-xray-lambda/tsconfig.esnext.json index cb78dd6ff3..65a918cf6b 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esnext.json +++ b/packages/propagator-aws-xray-lambda/tsconfig.esnext.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esnext.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esnext", diff --git a/packages/propagator-aws-xray-lambda/tsconfig.json b/packages/propagator-aws-xray-lambda/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/propagator-aws-xray-lambda/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-redis/.eslintignore b/packages/propagator-aws-xray/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/.eslintignore rename to packages/propagator-aws-xray/.eslintignore diff --git a/propagators/propagator-aws-xray/.eslintrc.js b/packages/propagator-aws-xray/.eslintrc.js similarity index 100% rename from propagators/propagator-aws-xray/.eslintrc.js rename to packages/propagator-aws-xray/.eslintrc.js diff --git a/propagators/propagator-aws-xray/CHANGELOG.md b/packages/propagator-aws-xray/CHANGELOG.md similarity index 100% rename from propagators/propagator-aws-xray/CHANGELOG.md rename to packages/propagator-aws-xray/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-redis/LICENSE b/packages/propagator-aws-xray/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-redis/LICENSE rename to packages/propagator-aws-xray/LICENSE diff --git a/propagators/propagator-aws-xray/README.md b/packages/propagator-aws-xray/README.md similarity index 100% rename from propagators/propagator-aws-xray/README.md rename to packages/propagator-aws-xray/README.md diff --git a/propagators/opentelemetry-propagator-instana/karma.conf.js b/packages/propagator-aws-xray/karma.conf.js similarity index 100% rename from propagators/opentelemetry-propagator-instana/karma.conf.js rename to packages/propagator-aws-xray/karma.conf.js diff --git a/propagators/propagator-aws-xray/package.json b/packages/propagator-aws-xray/package.json similarity index 91% rename from propagators/propagator-aws-xray/package.json rename to packages/propagator-aws-xray/package.json index 7c9874abbf..6fd169cd57 100644 --- a/propagators/propagator-aws-xray/package.json +++ b/packages/propagator-aws-xray/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/propagator-aws-xray" + }, "scripts": { "prepublishOnly": "npm run compile", "setup:dev": "nx run-many -t compile -p @opentelemetry/propagator-aws-xray", @@ -74,5 +78,5 @@ "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-aws-xray#readme" } diff --git a/propagators/propagator-aws-xray/src/AWSXRayPropagator.ts b/packages/propagator-aws-xray/src/AWSXRayPropagator.ts similarity index 100% rename from propagators/propagator-aws-xray/src/AWSXRayPropagator.ts rename to packages/propagator-aws-xray/src/AWSXRayPropagator.ts diff --git a/propagators/propagator-aws-xray/src/index.ts b/packages/propagator-aws-xray/src/index.ts similarity index 100% rename from propagators/propagator-aws-xray/src/index.ts rename to packages/propagator-aws-xray/src/index.ts diff --git a/propagators/propagator-aws-xray/test/AWSXRayPropagator.test.ts b/packages/propagator-aws-xray/test/AWSXRayPropagator.test.ts similarity index 100% rename from propagators/propagator-aws-xray/test/AWSXRayPropagator.test.ts rename to packages/propagator-aws-xray/test/AWSXRayPropagator.test.ts diff --git a/propagators/opentelemetry-propagator-ot-trace/test/index-webpack.ts b/packages/propagator-aws-xray/test/index-webpack.ts similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/test/index-webpack.ts rename to packages/propagator-aws-xray/test/index-webpack.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/tsconfig.esm.json b/packages/propagator-aws-xray/tsconfig.esm.json similarity index 78% rename from detectors/node/opentelemetry-resource-detector-aws/tsconfig.esm.json rename to packages/propagator-aws-xray/tsconfig.esm.json index 379f547a46..a94adff6aa 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/tsconfig.esm.json +++ b/packages/propagator-aws-xray/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esnext.json b/packages/propagator-aws-xray/tsconfig.esnext.json similarity index 78% rename from plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esnext.json rename to packages/propagator-aws-xray/tsconfig.esnext.json index cb78dd6ff3..65a918cf6b 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esnext.json +++ b/packages/propagator-aws-xray/tsconfig.esnext.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esnext.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esnext", diff --git a/packages/propagator-aws-xray/tsconfig.json b/packages/propagator-aws-xray/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/propagator-aws-xray/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-restify/.eslintignore b/packages/propagator-instana/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/.eslintignore rename to packages/propagator-instana/.eslintignore diff --git a/packages/propagator-instana/.eslintrc.js b/packages/propagator-instana/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/propagator-instana/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/propagators/opentelemetry-propagator-instana/CHANGELOG.md b/packages/propagator-instana/CHANGELOG.md similarity index 100% rename from propagators/opentelemetry-propagator-instana/CHANGELOG.md rename to packages/propagator-instana/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-restify/LICENSE b/packages/propagator-instana/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-restify/LICENSE rename to packages/propagator-instana/LICENSE diff --git a/propagators/opentelemetry-propagator-instana/README.md b/packages/propagator-instana/README.md similarity index 100% rename from propagators/opentelemetry-propagator-instana/README.md rename to packages/propagator-instana/README.md diff --git a/propagators/propagator-aws-xray/karma.conf.js b/packages/propagator-instana/karma.conf.js similarity index 100% rename from propagators/propagator-aws-xray/karma.conf.js rename to packages/propagator-instana/karma.conf.js diff --git a/propagators/opentelemetry-propagator-instana/package.json b/packages/propagator-instana/package.json similarity index 90% rename from propagators/opentelemetry-propagator-instana/package.json rename to packages/propagator-instana/package.json index 987faa08d9..b8fc731d4c 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/packages/propagator-instana/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/propagator-instana" + }, "scripts": { "setup:dev": "nx run-many -t compile -p @opentelemetry/propagator-instana", "compile": "tsc --build tsconfig.json tsconfig.esm.json", @@ -70,5 +74,5 @@ "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-instana#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-instana#readme" } diff --git a/propagators/opentelemetry-propagator-instana/src/InstanaPropagator.ts b/packages/propagator-instana/src/InstanaPropagator.ts similarity index 100% rename from propagators/opentelemetry-propagator-instana/src/InstanaPropagator.ts rename to packages/propagator-instana/src/InstanaPropagator.ts diff --git a/propagators/opentelemetry-propagator-instana/src/index.ts b/packages/propagator-instana/src/index.ts similarity index 100% rename from propagators/opentelemetry-propagator-instana/src/index.ts rename to packages/propagator-instana/src/index.ts diff --git a/propagators/opentelemetry-propagator-instana/test/InstanaPropagator.test.ts b/packages/propagator-instana/test/InstanaPropagator.test.ts similarity index 100% rename from propagators/opentelemetry-propagator-instana/test/InstanaPropagator.test.ts rename to packages/propagator-instana/test/InstanaPropagator.test.ts diff --git a/propagators/propagator-aws-xray-lambda/test/index-webpack.ts b/packages/propagator-instana/test/index-webpack.ts similarity index 100% rename from propagators/propagator-aws-xray-lambda/test/index-webpack.ts rename to packages/propagator-instana/test/index-webpack.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/tsconfig.esm.json b/packages/propagator-instana/tsconfig.esm.json similarity index 78% rename from detectors/node/opentelemetry-resource-detector-azure/tsconfig.esm.json rename to packages/propagator-instana/tsconfig.esm.json index 379f547a46..a94adff6aa 100644 --- a/detectors/node/opentelemetry-resource-detector-azure/tsconfig.esm.json +++ b/packages/propagator-instana/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/packages/propagator-instana/tsconfig.json b/packages/propagator-instana/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/propagator-instana/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-router/.eslintignore b/packages/propagator-ot-trace/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/.eslintignore rename to packages/propagator-ot-trace/.eslintignore diff --git a/propagators/opentelemetry-propagator-ot-trace/.eslintrc.js b/packages/propagator-ot-trace/.eslintrc.js similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/.eslintrc.js rename to packages/propagator-ot-trace/.eslintrc.js diff --git a/propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md b/packages/propagator-ot-trace/CHANGELOG.md similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/CHANGELOG.md rename to packages/propagator-ot-trace/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-router/LICENSE b/packages/propagator-ot-trace/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-router/LICENSE rename to packages/propagator-ot-trace/LICENSE diff --git a/propagators/opentelemetry-propagator-ot-trace/README.md b/packages/propagator-ot-trace/README.md similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/README.md rename to packages/propagator-ot-trace/README.md diff --git a/propagators/opentelemetry-propagator-ot-trace/karma.conf.js b/packages/propagator-ot-trace/karma.conf.js similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/karma.conf.js rename to packages/propagator-ot-trace/karma.conf.js diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/packages/propagator-ot-trace/package.json similarity index 90% rename from propagators/opentelemetry-propagator-ot-trace/package.json rename to packages/propagator-ot-trace/package.json index 8d367b7900..32feece7bc 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/packages/propagator-ot-trace/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/propagator-ot-trace" + }, "scripts": { "setup:dev": "nx run-many -t compile -p @opentelemetry/propagator-ot-trace", "compile": "tsc --build tsconfig.json tsconfig.esm.json", @@ -70,5 +74,5 @@ "webpack-cli": "5.1.4", "webpack-merge": "5.10.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace#readme" + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/propagator-ot-trace#readme" } diff --git a/propagators/opentelemetry-propagator-ot-trace/src/OTTracePropagator.ts b/packages/propagator-ot-trace/src/OTTracePropagator.ts similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/src/OTTracePropagator.ts rename to packages/propagator-ot-trace/src/OTTracePropagator.ts diff --git a/propagators/opentelemetry-propagator-ot-trace/src/index.ts b/packages/propagator-ot-trace/src/index.ts similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/src/index.ts rename to packages/propagator-ot-trace/src/index.ts diff --git a/propagators/opentelemetry-propagator-ot-trace/test/OTTracePropagator.test.ts b/packages/propagator-ot-trace/test/OTTracePropagator.test.ts similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/test/OTTracePropagator.test.ts rename to packages/propagator-ot-trace/test/OTTracePropagator.test.ts diff --git a/propagators/propagator-aws-xray/test/index-webpack.ts b/packages/propagator-ot-trace/test/index-webpack.ts similarity index 100% rename from propagators/propagator-aws-xray/test/index-webpack.ts rename to packages/propagator-ot-trace/test/index-webpack.ts diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/tsconfig.esm.json b/packages/propagator-ot-trace/tsconfig.esm.json similarity index 78% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/tsconfig.esm.json rename to packages/propagator-ot-trace/tsconfig.esm.json index 379f547a46..a94adff6aa 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/tsconfig.esm.json +++ b/packages/propagator-ot-trace/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/packages/propagator-ot-trace/tsconfig.json b/packages/propagator-ot-trace/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/propagator-ot-trace/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/node/opentelemetry-instrumentation-winston/.eslintignore b/packages/redis-common/.eslintignore similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/.eslintignore rename to packages/redis-common/.eslintignore diff --git a/packages/redis-common/.eslintrc.js b/packages/redis-common/.eslintrc.js new file mode 100644 index 0000000000..f726f3becb --- /dev/null +++ b/packages/redis-common/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/packages/opentelemetry-redis-common/CHANGELOG.md b/packages/redis-common/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-redis-common/CHANGELOG.md rename to packages/redis-common/CHANGELOG.md diff --git a/plugins/node/opentelemetry-instrumentation-winston/LICENSE b/packages/redis-common/LICENSE similarity index 100% rename from plugins/node/opentelemetry-instrumentation-winston/LICENSE rename to packages/redis-common/LICENSE diff --git a/packages/opentelemetry-redis-common/README.md b/packages/redis-common/README.md similarity index 100% rename from packages/opentelemetry-redis-common/README.md rename to packages/redis-common/README.md diff --git a/packages/opentelemetry-redis-common/package.json b/packages/redis-common/package.json similarity index 88% rename from packages/opentelemetry-redis-common/package.json rename to packages/redis-common/package.json index 7bb9d4620d..f4a41cbcfa 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/redis-common/package.json @@ -16,7 +16,11 @@ "test": "nyc mocha 'test/**/*.test.ts'", "watch": "tsc -w" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/redis-common" + }, "keywords": [ "opentelemetry", "redis-common" diff --git a/packages/opentelemetry-redis-common/src/index.ts b/packages/redis-common/src/index.ts similarity index 100% rename from packages/opentelemetry-redis-common/src/index.ts rename to packages/redis-common/src/index.ts diff --git a/packages/opentelemetry-redis-common/test/redis-common.test.ts b/packages/redis-common/test/redis-common.test.ts similarity index 100% rename from packages/opentelemetry-redis-common/test/redis-common.test.ts rename to packages/redis-common/test/redis-common.test.ts diff --git a/packages/redis-common/tsconfig.json b/packages/redis-common/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/redis-common/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/web/opentelemetry-instrumentation-document-load/.eslintignore b/packages/resource-detector-alibaba-cloud/.eslintignore similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/.eslintignore rename to packages/resource-detector-alibaba-cloud/.eslintignore diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.eslintrc.js b/packages/resource-detector-alibaba-cloud/.eslintrc.js similarity index 64% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/.eslintrc.js rename to packages/resource-detector-alibaba-cloud/.eslintrc.js index 7b832129ab..7927fa0c36 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.eslintrc.js +++ b/packages/resource-detector-alibaba-cloud/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/packages/resource-detector-alibaba-cloud/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md rename to packages/resource-detector-alibaba-cloud/CHANGELOG.md diff --git a/plugins/web/opentelemetry-instrumentation-document-load/LICENSE b/packages/resource-detector-alibaba-cloud/LICENSE similarity index 100% rename from plugins/web/opentelemetry-instrumentation-document-load/LICENSE rename to packages/resource-detector-alibaba-cloud/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/README.md b/packages/resource-detector-alibaba-cloud/README.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/README.md rename to packages/resource-detector-alibaba-cloud/README.md diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/packages/resource-detector-alibaba-cloud/package.json similarity index 88% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json rename to packages/resource-detector-alibaba-cloud/package.json index 676f9de524..1ade566fcb 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/packages/resource-detector-alibaba-cloud/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-alibaba-cloud" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-alibaba-cloud", @@ -62,6 +66,6 @@ "@opentelemetry/resources": "^2.0.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-alibaba-cloud#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts b/packages/resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts rename to packages/resource-detector-alibaba-cloud/src/detectors/AlibabaCloudEcsDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/index.ts b/packages/resource-detector-alibaba-cloud/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/detectors/index.ts rename to packages/resource-detector-alibaba-cloud/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/index.ts b/packages/resource-detector-alibaba-cloud/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/src/index.ts rename to packages/resource-detector-alibaba-cloud/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts b/packages/resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts rename to packages/resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetectorIntegration.test.ts b/packages/resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetectorIntegration.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetectorIntegration.test.ts rename to packages/resource-detector-alibaba-cloud/test/detectors/AlibabaCloudEcsDetectorIntegration.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/tsconfig.esm.json b/packages/resource-detector-alibaba-cloud/tsconfig.esm.json similarity index 78% rename from detectors/node/opentelemetry-resource-detector-container/tsconfig.esm.json rename to packages/resource-detector-alibaba-cloud/tsconfig.esm.json index 379f547a46..a94adff6aa 100644 --- a/detectors/node/opentelemetry-resource-detector-container/tsconfig.esm.json +++ b/packages/resource-detector-alibaba-cloud/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/packages/resource-detector-alibaba-cloud/tsconfig.json b/packages/resource-detector-alibaba-cloud/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/resource-detector-alibaba-cloud/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/web/opentelemetry-instrumentation-long-task/.eslintignore b/packages/resource-detector-aws/.eslintignore similarity index 100% rename from plugins/web/opentelemetry-instrumentation-long-task/.eslintignore rename to packages/resource-detector-aws/.eslintignore diff --git a/detectors/node/opentelemetry-resource-detector-aws/.eslintrc.js b/packages/resource-detector-aws/.eslintrc.js similarity index 64% rename from detectors/node/opentelemetry-resource-detector-aws/.eslintrc.js rename to packages/resource-detector-aws/.eslintrc.js index 7b832129ab..7927fa0c36 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/.eslintrc.js +++ b/packages/resource-detector-aws/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/packages/resource-detector-aws/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md rename to packages/resource-detector-aws/CHANGELOG.md diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/LICENSE b/packages/resource-detector-aws/LICENSE similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/LICENSE rename to packages/resource-detector-aws/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-aws/README.md b/packages/resource-detector-aws/README.md similarity index 98% rename from detectors/node/opentelemetry-resource-detector-aws/README.md rename to packages/resource-detector-aws/README.md index d60dc68f5d..3e66e69e1a 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/README.md +++ b/packages/resource-detector-aws/README.md @@ -11,7 +11,7 @@ Resource detector for Amazon Web Services. | Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility | | ----------------------------------------- | ----------------------------------------------------- | --------------------- | -| [Stable](../../../CONTRIBUTING.md#stable) | @jj22ee | API 1.0+
SDK 1.0+ | +| [Stable](../../CONTRIBUTING.md#stable) | @jj22ee | API 1.0+
SDK 1.0+ | ## Installation diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/packages/resource-detector-aws/package.json similarity index 89% rename from detectors/node/opentelemetry-resource-detector-aws/package.json rename to packages/resource-detector-aws/package.json index 82931b0a35..e1258cb975 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/packages/resource-detector-aws/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-aws" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-aws", @@ -63,6 +67,6 @@ "@opentelemetry/resources": "^2.0.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-aws#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts b/packages/resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts rename to packages/resource-detector-aws/src/detectors/AwsBeanstalkDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEc2Detector.ts b/packages/resource-detector-aws/src/detectors/AwsEc2Detector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEc2Detector.ts rename to packages/resource-detector-aws/src/detectors/AwsEc2Detector.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts b/packages/resource-detector-aws/src/detectors/AwsEcsDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetector.ts rename to packages/resource-detector-aws/src/detectors/AwsEcsDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts b/packages/resource-detector-aws/src/detectors/AwsEksDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts rename to packages/resource-detector-aws/src/detectors/AwsEksDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsLambdaDetector.ts b/packages/resource-detector-aws/src/detectors/AwsLambdaDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsLambdaDetector.ts rename to packages/resource-detector-aws/src/detectors/AwsLambdaDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/detectors/index.ts b/packages/resource-detector-aws/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/detectors/index.ts rename to packages/resource-detector-aws/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/index.ts b/packages/resource-detector-aws/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/index.ts rename to packages/resource-detector-aws/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/src/semconv.ts b/packages/resource-detector-aws/src/semconv.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/src/semconv.ts rename to packages/resource-detector-aws/src/semconv.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts b/packages/resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts rename to packages/resource-detector-aws/test/detectors/AwsBeanstalkDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts b/packages/resource-detector-aws/test/detectors/AwsEc2Detector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEc2Detector.test.ts rename to packages/resource-detector-aws/test/detectors/AwsEc2Detector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts b/packages/resource-detector-aws/test/detectors/AwsEcsDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts rename to packages/resource-detector-aws/test/detectors/AwsEcsDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts b/packages/resource-detector-aws/test/detectors/AwsEksDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts rename to packages/resource-detector-aws/test/detectors/AwsEksDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts b/packages/resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts rename to packages/resource-detector-aws/test/detectors/AwsLambdaDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts b/packages/resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts rename to packages/resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-ec2.json b/packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-ec2.json similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-ec2.json rename to packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-ec2.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate-logsfirelens.json b/packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate-logsfirelens.json similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate-logsfirelens.json rename to packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate-logsfirelens.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate.json b/packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate.json similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate.json rename to packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-container-fargate.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-ec2.json b/packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-ec2.json similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-ec2.json rename to packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-ec2.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate-logsfirelens.json b/packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate-logsfirelens.json similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate-logsfirelens.json rename to packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate-logsfirelens.json diff --git a/detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate.json b/packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate.json similarity index 100% rename from detectors/node/opentelemetry-resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate.json rename to packages/resource-detector-aws/test/detectors/test-resources/metadatav4-response-task-fargate.json diff --git a/packages/resource-detector-aws/tsconfig.esm.json b/packages/resource-detector-aws/tsconfig.esm.json new file mode 100644 index 0000000000..a94adff6aa --- /dev/null +++ b/packages/resource-detector-aws/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/resource-detector-aws/tsconfig.json b/packages/resource-detector-aws/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/resource-detector-aws/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/.eslintignore b/packages/resource-detector-azure/.eslintignore similarity index 100% rename from plugins/web/opentelemetry-instrumentation-user-interaction/.eslintignore rename to packages/resource-detector-azure/.eslintignore diff --git a/plugins/node/instrumentation-runtime-node/.eslintrc.js b/packages/resource-detector-azure/.eslintrc.js similarity index 61% rename from plugins/node/instrumentation-runtime-node/.eslintrc.js rename to packages/resource-detector-azure/.eslintrc.js index 0c986a856c..6201ba71c1 100644 --- a/plugins/node/instrumentation-runtime-node/.eslintrc.js +++ b/packages/resource-detector-azure/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { mocha: true, node: true, }, - ...require('../../../eslint.config.js'), + ...require("../../eslint.config.js"), }; diff --git a/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md b/packages/resource-detector-azure/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md rename to packages/resource-detector-azure/CHANGELOG.md diff --git a/detectors/node/opentelemetry-resource-detector-azure/LICENSE b/packages/resource-detector-azure/LICENSE similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/LICENSE rename to packages/resource-detector-azure/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-azure/README.md b/packages/resource-detector-azure/README.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/README.md rename to packages/resource-detector-azure/README.md diff --git a/detectors/node/opentelemetry-resource-detector-azure/package.json b/packages/resource-detector-azure/package.json similarity index 88% rename from detectors/node/opentelemetry-resource-detector-azure/package.json rename to packages/resource-detector-azure/package.json index a5bc5c3206..ce7aefd2a4 100644 --- a/detectors/node/opentelemetry-resource-detector-azure/package.json +++ b/packages/resource-detector-azure/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-azure" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-azure", @@ -54,6 +58,6 @@ "@opentelemetry/resources": "^2.0.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-azure#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-azure#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureAppServiceDetector.ts b/packages/resource-detector-azure/src/detectors/AzureAppServiceDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureAppServiceDetector.ts rename to packages/resource-detector-azure/src/detectors/AzureAppServiceDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureFunctionsDetector.ts b/packages/resource-detector-azure/src/detectors/AzureFunctionsDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureFunctionsDetector.ts rename to packages/resource-detector-azure/src/detectors/AzureFunctionsDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureVmDetector.ts b/packages/resource-detector-azure/src/detectors/AzureVmDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureVmDetector.ts rename to packages/resource-detector-azure/src/detectors/AzureVmDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/detectors/index.ts b/packages/resource-detector-azure/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/detectors/index.ts rename to packages/resource-detector-azure/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/index.ts b/packages/resource-detector-azure/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/index.ts rename to packages/resource-detector-azure/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/types.ts b/packages/resource-detector-azure/src/types.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/types.ts rename to packages/resource-detector-azure/src/types.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/src/utils.ts b/packages/resource-detector-azure/src/utils.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/src/utils.ts rename to packages/resource-detector-azure/src/utils.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureAppServiceDetector.test.ts b/packages/resource-detector-azure/test/detectors/AzureAppServiceDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureAppServiceDetector.test.ts rename to packages/resource-detector-azure/test/detectors/AzureAppServiceDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureFunctionsDetector.test.ts b/packages/resource-detector-azure/test/detectors/AzureFunctionsDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureFunctionsDetector.test.ts rename to packages/resource-detector-azure/test/detectors/AzureFunctionsDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureVmDetector.test.ts b/packages/resource-detector-azure/test/detectors/AzureVmDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureVmDetector.test.ts rename to packages/resource-detector-azure/test/detectors/AzureVmDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureVmDetectorIntegration.test.ts b/packages/resource-detector-azure/test/detectors/AzureVmDetectorIntegration.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-azure/test/detectors/AzureVmDetectorIntegration.test.ts rename to packages/resource-detector-azure/test/detectors/AzureVmDetectorIntegration.test.ts diff --git a/packages/resource-detector-azure/tsconfig.esm.json b/packages/resource-detector-azure/tsconfig.esm.json new file mode 100644 index 0000000000..a94adff6aa --- /dev/null +++ b/packages/resource-detector-azure/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/detectors/node/opentelemetry-resource-detector-azure/tsconfig.json b/packages/resource-detector-azure/tsconfig.json similarity index 78% rename from detectors/node/opentelemetry-resource-detector-azure/tsconfig.json rename to packages/resource-detector-azure/tsconfig.json index 3f6ea3378e..f7a33fc8b2 100644 --- a/detectors/node/opentelemetry-resource-detector-azure/tsconfig.json +++ b/packages/resource-detector-azure/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/plugins/web/opentelemetry-plugin-react-load/.eslintignore b/packages/resource-detector-container/.eslintignore similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/.eslintignore rename to packages/resource-detector-container/.eslintignore diff --git a/detectors/node/opentelemetry-resource-detector-azure/.eslintrc.js b/packages/resource-detector-container/.eslintrc.js similarity index 61% rename from detectors/node/opentelemetry-resource-detector-azure/.eslintrc.js rename to packages/resource-detector-container/.eslintrc.js index 029ade4634..6201ba71c1 100644 --- a/detectors/node/opentelemetry-resource-detector-azure/.eslintrc.js +++ b/packages/resource-detector-container/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { mocha: true, node: true, }, - ...require("../../../eslint.config.js"), + ...require("../../eslint.config.js"), }; diff --git a/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md b/packages/resource-detector-container/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md rename to packages/resource-detector-container/CHANGELOG.md diff --git a/plugins/web/opentelemetry-plugin-react-load/LICENSE b/packages/resource-detector-container/LICENSE similarity index 100% rename from plugins/web/opentelemetry-plugin-react-load/LICENSE rename to packages/resource-detector-container/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-container/README.md b/packages/resource-detector-container/README.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/README.md rename to packages/resource-detector-container/README.md diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/packages/resource-detector-container/package.json similarity index 86% rename from detectors/node/opentelemetry-resource-detector-container/package.json rename to packages/resource-detector-container/package.json index 1642765051..7679764b04 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/packages/resource-detector-container/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-container" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-container", @@ -15,7 +19,7 @@ "prepublishOnly": "npm run compile", "test": "nyc mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", - "version:update": "node ../../../scripts/version-update.js", + "version:update": "node ../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "author": "OpenTelemetry Authors", @@ -57,6 +61,6 @@ "@opentelemetry/resources": "^2.0.0", "@opentelemetry/semantic-conventions": "^1.27.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-container#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-container/src/detectors/ContainerDetector.ts b/packages/resource-detector-container/src/detectors/ContainerDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/src/detectors/ContainerDetector.ts rename to packages/resource-detector-container/src/detectors/ContainerDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/src/detectors/index.ts b/packages/resource-detector-container/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/src/detectors/index.ts rename to packages/resource-detector-container/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/src/detectors/utils.ts b/packages/resource-detector-container/src/detectors/utils.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/src/detectors/utils.ts rename to packages/resource-detector-container/src/detectors/utils.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/src/index.ts b/packages/resource-detector-container/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/src/index.ts rename to packages/resource-detector-container/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/test/ContainerDetector.test.ts b/packages/resource-detector-container/test/ContainerDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/test/ContainerDetector.test.ts rename to packages/resource-detector-container/test/ContainerDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/test/ContainerDetectorIntegration.test.ts b/packages/resource-detector-container/test/ContainerDetectorIntegration.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/test/ContainerDetectorIntegration.test.ts rename to packages/resource-detector-container/test/ContainerDetectorIntegration.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-container/test/utils.test.ts b/packages/resource-detector-container/test/utils.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-container/test/utils.test.ts rename to packages/resource-detector-container/test/utils.test.ts diff --git a/packages/resource-detector-container/tsconfig.esm.json b/packages/resource-detector-container/tsconfig.esm.json new file mode 100644 index 0000000000..a94adff6aa --- /dev/null +++ b/packages/resource-detector-container/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/detectors/node/opentelemetry-resource-detector-container/tsconfig.json b/packages/resource-detector-container/tsconfig.json similarity index 78% rename from detectors/node/opentelemetry-resource-detector-container/tsconfig.json rename to packages/resource-detector-container/tsconfig.json index 505b67a248..134a5b57c6 100644 --- a/detectors/node/opentelemetry-resource-detector-container/tsconfig.json +++ b/packages/resource-detector-container/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/propagators/opentelemetry-propagator-instana/.eslintignore b/packages/resource-detector-gcp/.eslintignore similarity index 100% rename from propagators/opentelemetry-propagator-instana/.eslintignore rename to packages/resource-detector-gcp/.eslintignore diff --git a/detectors/node/opentelemetry-resource-detector-gcp/.eslintrc.js b/packages/resource-detector-gcp/.eslintrc.js similarity index 64% rename from detectors/node/opentelemetry-resource-detector-gcp/.eslintrc.js rename to packages/resource-detector-gcp/.eslintrc.js index 7b832129ab..7927fa0c36 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/.eslintrc.js +++ b/packages/resource-detector-gcp/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md b/packages/resource-detector-gcp/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md rename to packages/resource-detector-gcp/CHANGELOG.md diff --git a/propagators/opentelemetry-propagator-instana/LICENSE b/packages/resource-detector-gcp/LICENSE similarity index 100% rename from propagators/opentelemetry-propagator-instana/LICENSE rename to packages/resource-detector-gcp/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-gcp/README.md b/packages/resource-detector-gcp/README.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/README.md rename to packages/resource-detector-gcp/README.md diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/packages/resource-detector-gcp/package.json similarity index 89% rename from detectors/node/opentelemetry-resource-detector-gcp/package.json rename to packages/resource-detector-gcp/package.json index a297989c2b..2477e64da8 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/packages/resource-detector-gcp/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-gcp" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-gcp", @@ -62,6 +66,6 @@ "@opentelemetry/semantic-conventions": "^1.27.0", "gcp-metadata": "^6.0.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-gcp#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-gcp#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-gcp/src/detectors/GcpDetector.ts b/packages/resource-detector-gcp/src/detectors/GcpDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/src/detectors/GcpDetector.ts rename to packages/resource-detector-gcp/src/detectors/GcpDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-gcp/src/detectors/index.ts b/packages/resource-detector-gcp/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/src/detectors/index.ts rename to packages/resource-detector-gcp/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-gcp/src/index.ts b/packages/resource-detector-gcp/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/src/index.ts rename to packages/resource-detector-gcp/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts b/packages/resource-detector-gcp/test/detectors/GcpDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts rename to packages/resource-detector-gcp/test/detectors/GcpDetector.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetectorIntegration.test.ts b/packages/resource-detector-gcp/test/detectors/GcpDetectorIntegration.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-gcp/test/detectors/GcpDetectorIntegration.test.ts rename to packages/resource-detector-gcp/test/detectors/GcpDetectorIntegration.test.ts diff --git a/packages/resource-detector-gcp/tsconfig.esm.json b/packages/resource-detector-gcp/tsconfig.esm.json new file mode 100644 index 0000000000..a94adff6aa --- /dev/null +++ b/packages/resource-detector-gcp/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/resource-detector-gcp/tsconfig.json b/packages/resource-detector-gcp/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/resource-detector-gcp/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/propagators/opentelemetry-propagator-ot-trace/.eslintignore b/packages/resource-detector-github/.eslintignore similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/.eslintignore rename to packages/resource-detector-github/.eslintignore diff --git a/detectors/node/opentelemetry-resource-detector-github/.eslintrc.js b/packages/resource-detector-github/.eslintrc.js similarity index 64% rename from detectors/node/opentelemetry-resource-detector-github/.eslintrc.js rename to packages/resource-detector-github/.eslintrc.js index 7b832129ab..7927fa0c36 100644 --- a/detectors/node/opentelemetry-resource-detector-github/.eslintrc.js +++ b/packages/resource-detector-github/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../eslint.config.js') } diff --git a/detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md b/packages/resource-detector-github/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/CHANGELOG.md rename to packages/resource-detector-github/CHANGELOG.md diff --git a/propagators/opentelemetry-propagator-ot-trace/LICENSE b/packages/resource-detector-github/LICENSE similarity index 100% rename from propagators/opentelemetry-propagator-ot-trace/LICENSE rename to packages/resource-detector-github/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-github/README.md b/packages/resource-detector-github/README.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/README.md rename to packages/resource-detector-github/README.md diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/packages/resource-detector-github/package.json similarity index 87% rename from detectors/node/opentelemetry-resource-detector-github/package.json rename to packages/resource-detector-github/package.json index 35ef05f292..761e9ec10c 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/packages/resource-detector-github/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-github" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-github", @@ -57,6 +61,6 @@ "dependencies": { "@opentelemetry/resources": "^2.0.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-github#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-github#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-github/src/detectors/GitHubDetector.ts b/packages/resource-detector-github/src/detectors/GitHubDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/src/detectors/GitHubDetector.ts rename to packages/resource-detector-github/src/detectors/GitHubDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-github/src/detectors/index.ts b/packages/resource-detector-github/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/src/detectors/index.ts rename to packages/resource-detector-github/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-github/src/index.ts b/packages/resource-detector-github/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/src/index.ts rename to packages/resource-detector-github/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-github/test/detectors/GitHubDetector.test.ts b/packages/resource-detector-github/test/detectors/GitHubDetector.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-github/test/detectors/GitHubDetector.test.ts rename to packages/resource-detector-github/test/detectors/GitHubDetector.test.ts diff --git a/packages/resource-detector-github/tsconfig.esm.json b/packages/resource-detector-github/tsconfig.esm.json new file mode 100644 index 0000000000..a94adff6aa --- /dev/null +++ b/packages/resource-detector-github/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/resource-detector-github/tsconfig.json b/packages/resource-detector-github/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/resource-detector-github/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/propagators/propagator-aws-xray-lambda/.eslintignore b/packages/resource-detector-instana/.eslintignore similarity index 100% rename from propagators/propagator-aws-xray-lambda/.eslintignore rename to packages/resource-detector-instana/.eslintignore diff --git a/packages/resource-detector-instana/.eslintrc.js b/packages/resource-detector-instana/.eslintrc.js new file mode 100644 index 0000000000..7927fa0c36 --- /dev/null +++ b/packages/resource-detector-instana/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + "env": { + "mocha": true, + "node": true + }, + ...require('../../eslint.config.js') +} diff --git a/detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md b/packages/resource-detector-instana/CHANGELOG.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/CHANGELOG.md rename to packages/resource-detector-instana/CHANGELOG.md diff --git a/propagators/propagator-aws-xray-lambda/LICENSE b/packages/resource-detector-instana/LICENSE similarity index 100% rename from propagators/propagator-aws-xray-lambda/LICENSE rename to packages/resource-detector-instana/LICENSE diff --git a/detectors/node/opentelemetry-resource-detector-instana/README.md b/packages/resource-detector-instana/README.md similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/README.md rename to packages/resource-detector-instana/README.md diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/packages/resource-detector-instana/package.json similarity index 88% rename from detectors/node/opentelemetry-resource-detector-instana/package.json rename to packages/resource-detector-instana/package.json index 39dd99fae2..14b98c9ad5 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/packages/resource-detector-instana/package.json @@ -5,7 +5,11 @@ "main": "build/src/index.js", "module": "build/esm/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/resource-detector-instana" + }, "scripts": { "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-instana", @@ -58,6 +62,6 @@ "peerDependencies": { "@opentelemetry/api": "^1.3.0" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-instana#readme", + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-instana#readme", "sideEffects": false } diff --git a/detectors/node/opentelemetry-resource-detector-instana/src/detectors/InstanaAgentDetector.ts b/packages/resource-detector-instana/src/detectors/InstanaAgentDetector.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/src/detectors/InstanaAgentDetector.ts rename to packages/resource-detector-instana/src/detectors/InstanaAgentDetector.ts diff --git a/detectors/node/opentelemetry-resource-detector-instana/src/detectors/index.ts b/packages/resource-detector-instana/src/detectors/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/src/detectors/index.ts rename to packages/resource-detector-instana/src/detectors/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-instana/src/index.ts b/packages/resource-detector-instana/src/index.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/src/index.ts rename to packages/resource-detector-instana/src/index.ts diff --git a/detectors/node/opentelemetry-resource-detector-instana/src/semconv.ts b/packages/resource-detector-instana/src/semconv.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/src/semconv.ts rename to packages/resource-detector-instana/src/semconv.ts diff --git a/detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorIntegrationTest.test.ts b/packages/resource-detector-instana/test/InstanaAgentDetectorIntegrationTest.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorIntegrationTest.test.ts rename to packages/resource-detector-instana/test/InstanaAgentDetectorIntegrationTest.test.ts diff --git a/detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts b/packages/resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts similarity index 100% rename from detectors/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts rename to packages/resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts diff --git a/packages/resource-detector-instana/tsconfig.esm.json b/packages/resource-detector-instana/tsconfig.esm.json new file mode 100644 index 0000000000..a94adff6aa --- /dev/null +++ b/packages/resource-detector-instana/tsconfig.esm.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/detectors/node/opentelemetry-resource-detector-instana/tsconfig.json b/packages/resource-detector-instana/tsconfig.json similarity index 75% rename from detectors/node/opentelemetry-resource-detector-instana/tsconfig.json rename to packages/resource-detector-instana/tsconfig.json index c87523782b..8f29202a96 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/tsconfig.json +++ b/packages/resource-detector-instana/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/propagators/propagator-aws-xray/.eslintignore b/packages/sql-common/.eslintignore similarity index 100% rename from propagators/propagator-aws-xray/.eslintignore rename to packages/sql-common/.eslintignore diff --git a/detectors/node/opentelemetry-resource-detector-container/.eslintrc.js b/packages/sql-common/.eslintrc.js similarity index 61% rename from detectors/node/opentelemetry-resource-detector-container/.eslintrc.js rename to packages/sql-common/.eslintrc.js index 029ade4634..15096b6658 100644 --- a/detectors/node/opentelemetry-resource-detector-container/.eslintrc.js +++ b/packages/sql-common/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { mocha: true, node: true, }, - ...require("../../../eslint.config.js"), + ...require('../../eslint.config.js'), }; diff --git a/packages/opentelemetry-sql-common/CHANGELOG.md b/packages/sql-common/CHANGELOG.md similarity index 100% rename from packages/opentelemetry-sql-common/CHANGELOG.md rename to packages/sql-common/CHANGELOG.md diff --git a/propagators/propagator-aws-xray/LICENSE b/packages/sql-common/LICENSE similarity index 100% rename from propagators/propagator-aws-xray/LICENSE rename to packages/sql-common/LICENSE diff --git a/packages/opentelemetry-sql-common/README.md b/packages/sql-common/README.md similarity index 100% rename from packages/opentelemetry-sql-common/README.md rename to packages/sql-common/README.md diff --git a/packages/opentelemetry-sql-common/package.json b/packages/sql-common/package.json similarity index 89% rename from packages/opentelemetry-sql-common/package.json rename to packages/sql-common/package.json index 1d040ec93f..1ec2097b6d 100644 --- a/packages/opentelemetry-sql-common/package.json +++ b/packages/sql-common/package.json @@ -16,7 +16,11 @@ "test": "nyc mocha 'test/**/*.test.ts'", "watch": "tsc -w" }, - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/sql-common" + }, "keywords": [ "opentelemetry", "contrib", diff --git a/packages/opentelemetry-sql-common/src/index.ts b/packages/sql-common/src/index.ts similarity index 100% rename from packages/opentelemetry-sql-common/src/index.ts rename to packages/sql-common/src/index.ts diff --git a/packages/opentelemetry-sql-common/test/sql-common.test.ts b/packages/sql-common/test/sql-common.test.ts similarity index 100% rename from packages/opentelemetry-sql-common/test/sql-common.test.ts rename to packages/sql-common/test/sql-common.test.ts diff --git a/plugins/node/instrumentation-cucumber/tsconfig.json b/packages/sql-common/tsconfig.json similarity index 75% rename from plugins/node/instrumentation-cucumber/tsconfig.json rename to packages/sql-common/tsconfig.json index c87523782b..8f29202a96 100644 --- a/plugins/node/instrumentation-cucumber/tsconfig.json +++ b/packages/sql-common/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/packages/winston-transport/README.md b/packages/winston-transport/README.md index 64b0f40c50..19397e923e 100644 --- a/packages/winston-transport/README.md +++ b/packages/winston-transport/README.md @@ -17,7 +17,7 @@ npm install --save @opentelemetry/winston-transport This package exports the Winston transport class that is used to send records to the OpenTelemetry Logs SDK. It can be used directly when configuring a Winston logger. If using -[`@opentelemetry/instrumenation-winston`](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston) +[`@opentelemetry/instrumenation-winston`](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-winston) package there is no need to instantiate the transport as the instrumentation will take care of that. For example: diff --git a/packages/winston-transport/package.json b/packages/winston-transport/package.json index 206360f3cd..c98f26576c 100644 --- a/packages/winston-transport/package.json +++ b/packages/winston-transport/package.json @@ -4,7 +4,11 @@ "description": "OpenTelemetry Transport for winston", "main": "build/src/index.js", "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js-contrib", + "repository": { + "type": "git", + "url": "https://github.com/open-telemetry/opentelemetry-js-contrib.git", + "directory": "packages/winston-transport" + }, "scripts": { "test": "nyc mocha 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/plugins/node/instrumentation-amqplib/tsconfig.json b/plugins/node/instrumentation-amqplib/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-amqplib/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-dataloader/.eslintrc.js b/plugins/node/instrumentation-dataloader/.eslintrc.js deleted file mode 100644 index 6aeb0710ef..0000000000 --- a/plugins/node/instrumentation-dataloader/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js'), -} diff --git a/plugins/node/instrumentation-dataloader/tsconfig.json b/plugins/node/instrumentation-dataloader/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-dataloader/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-fs/tsconfig.json b/plugins/node/instrumentation-fs/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-fs/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-kafkajs/tsconfig.json b/plugins/node/instrumentation-kafkajs/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-kafkajs/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-lru-memoizer/.eslintrc.js b/plugins/node/instrumentation-lru-memoizer/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/instrumentation-lru-memoizer/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/instrumentation-mongoose/.eslintrc.js b/plugins/node/instrumentation-mongoose/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/instrumentation-mongoose/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/instrumentation-mongoose/tsconfig.json b/plugins/node/instrumentation-mongoose/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-mongoose/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-runtime-node/tsconfig.json b/plugins/node/instrumentation-runtime-node/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-runtime-node/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-socket.io/.eslintrc.js b/plugins/node/instrumentation-socket.io/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/instrumentation-socket.io/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/instrumentation-tedious/.eslintrc.js b/plugins/node/instrumentation-tedious/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/instrumentation-tedious/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/instrumentation-tedious/tsconfig.json b/plugins/node/instrumentation-tedious/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-tedious/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/instrumentation-typeorm/.eslintrc.js b/plugins/node/instrumentation-typeorm/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/instrumentation-typeorm/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/instrumentation-undici/.eslintrc.js b/plugins/node/instrumentation-undici/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/instrumentation-undici/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/instrumentation-undici/tsconfig.json b/plugins/node/instrumentation-undici/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/instrumentation-undici/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-aws-lambda/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/tsconfig.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-aws-sdk/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-bunyan/.eslintrc.js deleted file mode 100644 index 6aeb0710ef..0000000000 --- a/plugins/node/opentelemetry-instrumentation-bunyan/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js'), -} diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/tsconfig.json b/plugins/node/opentelemetry-instrumentation-bunyan/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-bunyan/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-cassandra/.eslintrc.js deleted file mode 100644 index 6aeb0710ef..0000000000 --- a/plugins/node/opentelemetry-instrumentation-cassandra/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js'), -} diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/tsconfig.json b/plugins/node/opentelemetry-instrumentation-cassandra/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-cassandra/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-connect/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-connect/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-connect/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-connect/tsconfig.json b/plugins/node/opentelemetry-instrumentation-connect/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-connect/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-dns/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-dns/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-dns/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-dns/tsconfig.json b/plugins/node/opentelemetry-instrumentation-dns/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-dns/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-express/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-express/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-express/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-express/tsconfig.json b/plugins/node/opentelemetry-instrumentation-express/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-express/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-fastify/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-fastify/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-fastify/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-fastify/tsconfig.json b/plugins/node/opentelemetry-instrumentation-fastify/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-fastify/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-generic-pool/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/tsconfig.json b/plugins/node/opentelemetry-instrumentation-generic-pool/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-graphql/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-graphql/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-graphql/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-graphql/tsconfig.json b/plugins/node/opentelemetry-instrumentation-graphql/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-graphql/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-hapi/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-hapi/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-hapi/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-ioredis/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-ioredis/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/tsconfig.json b/plugins/node/opentelemetry-instrumentation-ioredis/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-ioredis/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-knex/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-knex/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-knex/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-knex/tsconfig.json b/plugins/node/opentelemetry-instrumentation-knex/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-knex/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-koa/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-koa/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-koa/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-memcached/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-memcached/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-memcached/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-memcached/tsconfig.json b/plugins/node/opentelemetry-instrumentation-memcached/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-memcached/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-mongodb/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-mongodb/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/tsconfig.json b/plugins/node/opentelemetry-instrumentation-mongodb/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-mongodb/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-mysql/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-mysql/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-mysql/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-mysql/tsconfig.json b/plugins/node/opentelemetry-instrumentation-mysql/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-mysql/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-mysql2/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-mysql2/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/tsconfig.json b/plugins/node/opentelemetry-instrumentation-mysql2/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-mysql2/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/tsconfig.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-net/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-net/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-net/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-net/tsconfig.json b/plugins/node/opentelemetry-instrumentation-net/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-net/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-oracledb/tsconfig.json b/plugins/node/opentelemetry-instrumentation-oracledb/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-oracledb/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-pg/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-pg/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-pg/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-pg/tsconfig.json b/plugins/node/opentelemetry-instrumentation-pg/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-pg/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-pino/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-pino/.eslintrc.js deleted file mode 100644 index 6aeb0710ef..0000000000 --- a/plugins/node/opentelemetry-instrumentation-pino/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js'), -} diff --git a/plugins/node/opentelemetry-instrumentation-pino/tsconfig.json b/plugins/node/opentelemetry-instrumentation-pino/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-pino/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/README.md b/plugins/node/opentelemetry-instrumentation-redis-4/README.md deleted file mode 100644 index 80407ca373..0000000000 --- a/plugins/node/opentelemetry-instrumentation-redis-4/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# OpenTelemetry redis v4 Instrumentation for Node.js - -> ⚠️ **DEPRECATED**: The `@opentelemetry/instrumentation-redis-4` (note the "-4" suffix) instrumentation is deprecated. The support for `redis@4` instrumentation is now part of `@opentelemetry/instrumentation-redis` (as of v0.50.0). Please use it instead. - -The source code for this instrumentation has been moved to the "../opentelemetry-instrumentation-redis/" package. Use [the "instrumentation-redis-4-v0.49.0" git tag to see the package source code for the last release (v0.49.0)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/instrumentation-redis-4-v0.49.0/plugins/node/opentelemetry-instrumentation-redis-4). - diff --git a/plugins/node/opentelemetry-instrumentation-redis/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-redis/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-redis/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-redis/tsconfig.json b/plugins/node/opentelemetry-instrumentation-redis/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-redis/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-restify/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-restify/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-restify/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-restify/tsconfig.json b/plugins/node/opentelemetry-instrumentation-restify/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-restify/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-router/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-router/.eslintrc.js deleted file mode 100644 index f756f4488b..0000000000 --- a/plugins/node/opentelemetry-instrumentation-router/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js') -} diff --git a/plugins/node/opentelemetry-instrumentation-router/tsconfig.json b/plugins/node/opentelemetry-instrumentation-router/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-router/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/node/opentelemetry-instrumentation-winston/.eslintrc.js b/plugins/node/opentelemetry-instrumentation-winston/.eslintrc.js deleted file mode 100644 index 6aeb0710ef..0000000000 --- a/plugins/node/opentelemetry-instrumentation-winston/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "env": { - "mocha": true, - "node": true - }, - ...require('../../../eslint.config.js'), -} diff --git a/plugins/node/opentelemetry-instrumentation-winston/tsconfig.json b/plugins/node/opentelemetry-instrumentation-winston/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/node/opentelemetry-instrumentation-winston/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json b/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json deleted file mode 100644 index 379f547a46..0000000000 --- a/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json b/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json b/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json deleted file mode 100644 index 379f547a46..0000000000 --- a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json b/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json b/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json deleted file mode 100644 index 379f547a46..0000000000 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json b/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json deleted file mode 100644 index 28be80d266..0000000000 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/release-please-config.json b/release-please-config.json index c876839294..49902e8fb1 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -6,71 +6,71 @@ "bump-minor-pre-major": true, "sequential-calls": true, "packages": { - "detectors/node/opentelemetry-resource-detector-alibaba-cloud": {}, - "detectors/node/opentelemetry-resource-detector-aws": {}, - "detectors/node/opentelemetry-resource-detector-azure": {}, - "detectors/node/opentelemetry-resource-detector-container": {}, - "detectors/node/opentelemetry-resource-detector-gcp": {}, - "detectors/node/opentelemetry-resource-detector-github": {}, - "detectors/node/opentelemetry-resource-detector-instana": {}, - "metapackages/auto-configuration-propagators": {}, - "metapackages/auto-instrumentations-node": {}, - "metapackages/auto-instrumentations-web": {}, + "packages/resource-detector-alibaba-cloud": {}, + "packages/resource-detector-aws": {}, + "packages/resource-detector-azure": {}, + "packages/resource-detector-container": {}, + "packages/resource-detector-gcp": {}, + "packages/resource-detector-github": {}, + "packages/resource-detector-instana": {}, + "packages/auto-configuration-propagators": {}, + "packages/auto-instrumentations-node": {}, + "packages/auto-instrumentations-web": {}, "packages/baggage-span-processor": {}, "packages/baggage-log-record-processor": {}, - "packages/opentelemetry-host-metrics": {}, - "packages/opentelemetry-id-generator-aws-xray": {}, - "packages/opentelemetry-propagation-utils": {}, - "packages/opentelemetry-redis-common": {}, - "packages/opentelemetry-sql-common": {}, - "packages/opentelemetry-test-utils": {}, + "packages/host-metrics": {}, + "packages/id-generator-aws-xray": {}, + "packages/propagation-utils": {}, + "packages/redis-common": {}, + "packages/sql-common": {}, + "packages/contrib-test-utils": {}, "packages/winston-transport": {}, - "plugins/node/instrumentation-amqplib": {}, - "plugins/node/instrumentation-cucumber": {}, - "plugins/node/instrumentation-dataloader": {}, - "plugins/node/instrumentation-fs": {}, - "plugins/node/instrumentation-kafkajs": {}, - "plugins/node/instrumentation-lru-memoizer": {}, - "plugins/node/instrumentation-mongoose": {}, - "plugins/node/instrumentation-runtime-node": {}, - "plugins/node/instrumentation-socket.io": {}, - "plugins/node/instrumentation-tedious": {}, - "plugins/node/instrumentation-typeorm": {}, - "plugins/node/instrumentation-undici": {}, - "plugins/node/opentelemetry-instrumentation-aws-lambda": {}, - "plugins/node/opentelemetry-instrumentation-aws-sdk": {}, - "plugins/node/opentelemetry-instrumentation-bunyan": {}, - "plugins/node/opentelemetry-instrumentation-cassandra": {}, - "plugins/node/opentelemetry-instrumentation-connect": {}, - "plugins/node/opentelemetry-instrumentation-dns": {}, - "plugins/node/opentelemetry-instrumentation-express": {}, - "plugins/node/opentelemetry-instrumentation-fastify": {}, - "plugins/node/opentelemetry-instrumentation-generic-pool": {}, - "plugins/node/opentelemetry-instrumentation-graphql": {}, - "plugins/node/opentelemetry-instrumentation-hapi": {}, - "plugins/node/opentelemetry-instrumentation-ioredis": {}, - "plugins/node/opentelemetry-instrumentation-knex": {}, - "plugins/node/opentelemetry-instrumentation-koa": {}, - "plugins/node/opentelemetry-instrumentation-memcached": {}, - "plugins/node/opentelemetry-instrumentation-mongodb": {}, - "plugins/node/opentelemetry-instrumentation-mysql": {}, - "plugins/node/opentelemetry-instrumentation-mysql2": {}, - "plugins/node/opentelemetry-instrumentation-nestjs-core": {}, - "plugins/node/opentelemetry-instrumentation-net": {}, - "plugins/node/opentelemetry-instrumentation-oracledb": {}, - "plugins/node/opentelemetry-instrumentation-pg": {}, - "plugins/node/opentelemetry-instrumentation-pino": {}, - "plugins/node/opentelemetry-instrumentation-redis": {}, - "plugins/node/opentelemetry-instrumentation-restify": {}, - "plugins/node/opentelemetry-instrumentation-router": {}, - "plugins/node/opentelemetry-instrumentation-winston": {}, - "plugins/web/opentelemetry-instrumentation-document-load": {}, - "plugins/web/opentelemetry-instrumentation-long-task": {}, - "plugins/web/opentelemetry-instrumentation-user-interaction": {}, - "plugins/web/opentelemetry-plugin-react-load": {}, - "propagators/opentelemetry-propagator-instana": {}, - "propagators/opentelemetry-propagator-ot-trace": {}, - "propagators/propagator-aws-xray": {}, - "propagators/propagator-aws-xray-lambda": {} + "packages/instrumentation-amqplib": {}, + "packages/instrumentation-cucumber": {}, + "packages/instrumentation-dataloader": {}, + "packages/instrumentation-fs": {}, + "packages/instrumentation-kafkajs": {}, + "packages/instrumentation-lru-memoizer": {}, + "packages/instrumentation-mongoose": {}, + "packages/instrumentation-runtime-node": {}, + "packages/instrumentation-socket.io": {}, + "packages/instrumentation-tedious": {}, + "packages/instrumentation-typeorm": {}, + "packages/instrumentation-undici": {}, + "packages/instrumentation-aws-lambda": {}, + "packages/instrumentation-aws-sdk": {}, + "packages/instrumentation-bunyan": {}, + "packages/instrumentation-cassandra-driver": {}, + "packages/instrumentation-connect": {}, + "packages/instrumentation-dns": {}, + "packages/instrumentation-express": {}, + "packages/instrumentation-fastify": {}, + "packages/instrumentation-generic-pool": {}, + "packages/instrumentation-graphql": {}, + "packages/instrumentation-hapi": {}, + "packages/instrumentation-ioredis": {}, + "packages/instrumentation-knex": {}, + "packages/instrumentation-koa": {}, + "packages/instrumentation-memcached": {}, + "packages/instrumentation-mongodb": {}, + "packages/instrumentation-mysql": {}, + "packages/instrumentation-mysql2": {}, + "packages/instrumentation-nestjs-core": {}, + "packages/instrumentation-net": {}, + "packages/instrumentation-oracledb": {}, + "packages/instrumentation-pg": {}, + "packages/instrumentation-pino": {}, + "packages/instrumentation-redis": {}, + "packages/instrumentation-restify": {}, + "packages/instrumentation-router": {}, + "packages/instrumentation-winston": {}, + "packages/instrumentation-document-load": {}, + "packages/instrumentation-long-task": {}, + "packages/instrumentation-user-interaction": {}, + "packages/plugin-react-load": {}, + "packages/propagator-instana": {}, + "packages/propagator-ot-trace": {}, + "packages/propagator-aws-xray": {}, + "packages/propagator-aws-xray-lambda": {} } } diff --git a/scripts/lint-readme.js b/scripts/lint-readme.js index 428cbfa31e..799793d23b 100644 --- a/scripts/lint-readme.js +++ b/scripts/lint-readme.js @@ -4,8 +4,8 @@ const path = require('path'); const packageRoot = process.cwd(); const monorepoRoot = path.resolve(__dirname, '..'); -const autoInstrumentationNodeDeps = require(`${monorepoRoot}/metapackages/auto-instrumentations-node/package.json`).dependencies; -const autoInstrumentationWebDeps = require(`${monorepoRoot}/metapackages/auto-instrumentations-web/package.json`).dependencies; +const autoInstrumentationNodeDeps = require(`${monorepoRoot}/packages/auto-instrumentations-node/package.json`).dependencies; +const autoInstrumentationWebDeps = require(`${monorepoRoot}/packages/auto-instrumentations-web/package.json`).dependencies; // remove exempt instrumentations delete autoInstrumentationNodeDeps['@opentelemetry/instrumentation-fastify'];