Merge branch 'main' into sqs-batch-receive

Author: trentm

.github/ISSUE_TEMPLATE/bug_report.md

@@ -31,3 +31,4 @@ If possible, provide a recipe for reproducing the error.
 Add any other context about the problem here.
 -->
 
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/discussion.md

@@ -11,3 +11,5 @@ labels: discussion
 - [ ] This only affects the JavaScript OpenTelemetry library
 - [ ] This may affect other libraries, but I would like to get opinions here first
 
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -31,3 +31,5 @@ A clear and concise description of any alternative solutions or features you've
 Add any other context or screenshots about the feature request here.
 -->
 
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+

.github/ISSUE_TEMPLATE/instrumentation_request.md

@@ -34,3 +34,5 @@ Any code-owners listed MUST fulfill all criteria laid out in the checklist below
 <!--
 Add any other context or screenshots about the instrumentation request here. Is there a reference you could point for the well-defined lifecycle methods?
 -->
+
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/ownership_request.md

@@ -38,3 +38,5 @@ Examples:
 <!--
 Add any other context that does not fit any of the above sections
 -->
+
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.release-please-manifest.json

@@ -7,7 +7,7 @@
   "packages/resource-detector-github": "0.31.0",
   "packages/resource-detector-instana": "0.22.0",
   "packages/auto-configuration-propagators": "0.4.1",
-  "packages/auto-instrumentations-node": "0.62.0",
+  "packages/auto-instrumentations-node": "0.62.1",
   "packages/auto-instrumentations-web": "0.49.0",
   "packages/baggage-span-processor": "0.4.0",
   "packages/baggage-log-record-processor": "0.4.0",
@@ -17,21 +17,21 @@
   "packages/redis-common": "0.38.0",
   "packages/sql-common": "0.41.0",
   "packages/contrib-test-utils": "0.49.0",
-  "packages/winston-transport": "0.14.0",
+  "packages/winston-transport": "0.14.1",
   "packages/instrumentation-amqplib": "0.50.0",
-  "packages/instrumentation-cucumber": "0.18.0",
-  "packages/instrumentation-dataloader": "0.21.0",
+  "packages/instrumentation-cucumber": "0.18.1",
+  "packages/instrumentation-dataloader": "0.21.1",
   "packages/instrumentation-fs": "0.23.0",
-  "packages/instrumentation-kafkajs": "0.12.0",
+  "packages/instrumentation-kafkajs": "0.13.0",
   "packages/instrumentation-lru-memoizer": "0.48.0",
   "packages/instrumentation-mongoose": "0.50.0",
-  "packages/instrumentation-runtime-node": "0.17.0",
+  "packages/instrumentation-runtime-node": "0.17.1",
   "packages/instrumentation-socket.io": "0.50.0",
   "packages/instrumentation-tedious": "0.22.0",
   "packages/instrumentation-typeorm": "0.4.0",
   "packages/instrumentation-undici": "0.14.0",
   "packages/instrumentation-aws-lambda": "0.54.0",
-  "packages/instrumentation-aws-sdk": "0.56.0",
+  "packages/instrumentation-aws-sdk": "0.57.0",
   "packages/instrumentation-bunyan": "0.49.0",
   "packages/instrumentation-cassandra-driver": "0.49.0",
   "packages/instrumentation-connect": "0.47.0",
@@ -47,16 +47,16 @@
   "packages/instrumentation-memcached": "0.47.0",
   "packages/instrumentation-mongodb": "0.56.0",
   "packages/instrumentation-mysql": "0.49.0",
-  "packages/instrumentation-mysql2": "0.49.0",
+  "packages/instrumentation-mysql2": "0.50.0",
   "packages/instrumentation-nestjs-core": "0.49.0",
   "packages/instrumentation-net": "0.47.0",
   "packages/instrumentation-oracledb": "0.29.0",
-  "packages/instrumentation-pg": "0.55.0",
+  "packages/instrumentation-pg": "0.56.0",
   "packages/instrumentation-pino": "0.50.0",
   "packages/instrumentation-redis": "0.51.0",
   "packages/instrumentation-restify": "0.49.0",
   "packages/instrumentation-router": "0.48.0",
-  "packages/instrumentation-winston": "0.48.0",
+  "packages/instrumentation-winston": "0.48.1",
   "packages/instrumentation-document-load": "0.48.0",
   "packages/instrumentation-long-task": "0.48.0",
   "packages/instrumentation-user-interaction": "0.48.0",

CONTRIBUTING.md

@@ -117,7 +117,7 @@ The required steps to start development on a pacakge are:
 
 - `npm ci` from root folder to install dependencies ([see npm-ci docs](https://docs.npmjs.com/cli/v10/commands/npm-ci))
 - `cd` into the pacakge you want to apply changes.
-- `npm run setup:dev` compiles the TypeScript files for this package and its dependencies within the repository.
+- `npm run compile:with-dependencies` compiles the TypeScript files for this package and its dependencies within the repository.
 
 Then you can proceed to do apply the changes and use the scripts below for development workflow
 
@@ -146,23 +146,21 @@ npm test
 However, some instrumentations require test-services to be running (e.g. the `instrumentation-mongodb` package requires a MongoDB server). Use the `test-services`-related npm scripts to start all required services in Docker and then run the tests with the appropriate configuration to use those services:
 
 ```sh
-npm run test-services:start       # starts services in Docker
-npm run test:with-services-config # runs 'npm test' with envvars from test/test-services.env
-npm run test-services:stop        # stops services in Docker
+npm run test-services:start    # starts services in Docker
+npm run test:with-services-env # runs 'npm test' with envvars from test/test-services.env
+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.
+If you only want to test a single package that dfepends on a service (e.g. the `instrumentation-mongodb`) you can `cd` into it and
+use the same scripts for testing. In this case the script will only start the services needed to test the package.
 
 ```sh
-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
+cd packages/instrumentation-mongodb # get into the instrumenation folder
+npm run test-services:start         # start the MongoDB service in Docker
+npm run test:with-services-env      # runs 'npm test' with envvars from test/test-services.env
+npm run test-services:stop          # stop MongoDB service in Docker
 ```
 
-NOTE: scripts for each package will be added to avoid extra consumption of resources and improve the development experience.
-
 ### Benchmarks
 
 When two or more approaches must be compared, please write a benchmark in the benchmark/index.js module so that we can keep track of the most efficient algorithm.

incubator/opentelemetry-sampler-aws-xray/package.json

@@ -28,11 +28,11 @@
   ],
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
-    "setup:dev": "nx run-many -t compile -p @opentelemetry/sampler-aws-xray",
+    "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
     "compile": "tsc -p .",
+    "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/sampler-aws-xray",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc mocha 'test/**/*.test.ts'",

incubator/opentelemetry-sampler-aws-xray/src/aws-xray-sampling-client.ts

@@ -45,7 +45,7 @@ export class AWSXRaySamplingClient {
     this.makeSamplingRequest<GetSamplingTargetsResponse>(
       this.samplingTargetsEndpoint,
       callback,
-      this.samplerDiag.debug,
+      (message: string) => this.samplerDiag.debug(message),
       JSON.stringify(requestBody)
     );
   }
@@ -56,7 +56,7 @@ export class AWSXRaySamplingClient {
     this.makeSamplingRequest<GetSamplingRulesResponse>(
       this.getSamplingRulesEndpoint,
       callback,
-      this.samplerDiag.error
+      (message: string) => this.samplerDiag.error(message)
     );
   }
 

incubator/opentelemetry-sampler-aws-xray/src/fallback-sampler.ts

@@ -21,16 +21,20 @@
 import { Attributes, Context, Link, SpanKind } from '@opentelemetry/api';
 import {
   Sampler,
+  SamplingDecision,
   SamplingResult,
   TraceIdRatioBasedSampler,
 } from '@opentelemetry/sdk-trace-base';
+import { RateLimitingSampler } from './rate-limiting-sampler';
 
 // FallbackSampler samples 1 req/sec and additional 5% of requests using TraceIdRatioBasedSampler.
 export class FallbackSampler implements Sampler {
   private fixedRateSampler: TraceIdRatioBasedSampler;
+  private rateLimitingSampler: RateLimitingSampler;
 
-  constructor() {
-    this.fixedRateSampler = new TraceIdRatioBasedSampler(0.05);
+  constructor(ratio = 0.05, quota = 1) {
+    this.fixedRateSampler = new TraceIdRatioBasedSampler(ratio);
+    this.rateLimitingSampler = new RateLimitingSampler(quota);
   }
 
   shouldSample(
@@ -41,7 +45,19 @@ export class FallbackSampler implements Sampler {
     attributes: Attributes,
     links: Link[]
   ): SamplingResult {
-    // TODO: implement and use Rate Limiting Sampler
+    const samplingResult: SamplingResult =
+      this.rateLimitingSampler.shouldSample(
+        context,
+        traceId,
+        spanName,
+        spanKind,
+        attributes,
+        links
+      );
+
+    if (samplingResult.decision !== SamplingDecision.NOT_RECORD) {
+      return samplingResult;
+    }
 
     return this.fixedRateSampler.shouldSample(context, traceId);
   }