newrelic 13.6.6 → 13.7.0

package/NEWS.md

@@ -1,3 +1,44 @@
+### v13.7.0 (2025-12-08)
+
+#### Features
+
+* Updated `koa` instrumentation to properly wrap `Router` when using `@koa/router@15.0.0`+ ([#3550](https://github.com/newrelic/node-newrelic/pull/3550)) ([f1e08ad](https://github.com/newrelic/node-newrelic/commit/f1e08ad9fe200138ab9ed32e423517f64e41af49))
+* Added ability to configure a ratio based sampler ([#3501](https://github.com/newrelic/node-newrelic/pull/3501)) ([f300bd5](https://github.com/newrelic/node-newrelic/commit/f300bd5eacf9d6509b56484e7ad36d5c0725b497))
+    * To assign a ratio based sampler, set `config.distributed_tracing.sampler.root`, `config.distributed_tracing.sampler.remote_parent_sampled`, or `config.distributed_tracing.sampler.remote_parent_not_sampled` to `{ trace_id_ratio_based: { ratio: <float between 0 and 1> }}`
+    * To assign via environment variables set `NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_<TYPE>='trace_id_ratio_based'` and `NEW_RELIC_DISTRIBUTED_TRACING_SAMPLER_<TYPE>_RATIO=<float between 0 and 1>` where `<TYPE>` is one of `ROOT`, `REMOTE_PARENT_SAMPLED`, or `REMOTE_PARENT_NOT_SAMPLED`
+* Updated configuration to allow `adaptive.sampling_target` to be set for `config.distributed_tracing.sampler.root`, `config.distributed_tracing.sampler.remote_parent_sampled`, and `config.distributed_tracing.sampler.remote_parent_not_sampled` ([#3532](https://github.com/newrelic/node-newrelic/pull/3532)) ([44f51dd](https://github.com/newrelic/node-newrelic/commit/44f51dd5583e74aef1e2d0ee9483d51d5ff786c3))
+* Added support for OTEL span links ([#3528](https://github.com/newrelic/node-newrelic/pull/3528)) ([e840690](https://github.com/newrelic/node-newrelic/commit/e8406903dd0c92cd003fac69770785489e1bba85))
+* Replaced `default` with `adaptive` as the default for samplers ([#3543](https://github.com/newrelic/node-newrelic/pull/3543)) ([3f03162](https://github.com/newrelic/node-newrelic/commit/3f0316285fdde6d3c38ce819aa41221a71bd4fcb))
+* Preliminary support for partial granularity traces (Not available for production use)
+    * Added `essential` type for partial granularity traces ([#3547](https://github.com/newrelic/node-newrelic/pull/3547)) ([3d85fb5](https://github.com/newrelic/node-newrelic/commit/3d85fb5fa16d411892eb4a23067e66669461ada0))
+    * Added `reduced` type for partial granularity traces. ([#3540](https://github.com/newrelic/node-newrelic/pull/3540)) ([cfa8f41](https://github.com/newrelic/node-newrelic/commit/cfa8f41618595cc5ffb3e3b5574673721c64580c))
+    * Added partial granularity samplers and assign transactions with `isPartialTrace` when partial granularity sampling decisions have been made ([#3544](https://github.com/newrelic/node-newrelic/pull/3544)) ([1535a82](https://github.com/newrelic/node-newrelic/commit/1535a82331ce40d7c96e0c6746ec70bcdbd6e4f6))
+    * Refactored samplers into classes and store them on `agent.sampler.*` ([#3527](https://github.com/newrelic/node-newrelic/pull/3527)) ([ad63441](https://github.com/newrelic/node-newrelic/commit/ad634411a0d91240c0c16c7a372b00b36651589f))
+    * Updated `Samplers` class to normalize logger messages, short circuit when applicable and remove optional chaining checks ([#3546](https://github.com/newrelic/node-newrelic/pull/3546)) ([4f7684c](https://github.com/newrelic/node-newrelic/commit/4f7684cb4c64a89545704c70c110d2fd13815197))
+    * Updated samplers to assign priority between 0-1 when DT is disabled or both full and partial granularity are disabled ([#3559](https://github.com/newrelic/node-newrelic/pull/3559)) ([7a1c37e](https://github.com/newrelic/node-newrelic/commit/7a1c37e3e04fef0538a8af15fa690915bce65262))
+    * Updated transaction to store partial granularity indicator as `.partialType` ([#3561](https://github.com/newrelic/node-newrelic/pull/3561)) ([a7f20d8](https://github.com/newrelic/node-newrelic/commit/a7f20d8e83b44556434bae90bd3924c54af9f587))
+    * Updated when partial granularity rules are applied ([#3553](https://github.com/newrelic/node-newrelic/pull/3553)) ([a4bdf4f](https://github.com/newrelic/node-newrelic/commit/a4bdf4fbbbdac102519020c5ca4d3dc92eeff844))
+    * Added `toString` and `get [Symbol.toStringTag]()` to default Sampler class ([#3562](https://github.com/newrelic/node-newrelic/pull/3562)) ([771168d](https://github.com/newrelic/node-newrelic/commit/771168dcd927240b6efc703f238046e9a7f7766b))
+
+#### Bug fixes
+
+* Fixed normalization of OTEL hrtime ([#3564](https://github.com/newrelic/node-newrelic/pull/3564)) ([707fe7d](https://github.com/newrelic/node-newrelic/commit/707fe7d6395f0e15b5e6c6195f93df1c27540423))
+
+#### Documentation
+
+* Updated compatibility report ([#3551](https://github.com/newrelic/node-newrelic/pull/3551)) ([02268a4](https://github.com/newrelic/node-newrelic/commit/02268a4e3fe7b2f2f5c2fd035bcb337fd7b2bfc2))
+* Added internal doc for attributes ([#3539](https://github.com/newrelic/node-newrelic/pull/3539)) ([68543b6](https://github.com/newrelic/node-newrelic/commit/68543b606fc53e59e9a6fcb08173e423bc6437a9))
+
+#### Miscellaneous chores
+
+* Improved logging around `preconnect` payload
+    * Added more logging around assigning hostname during `preconnect` ([#3568](https://github.com/newrelic/node-newrelic/pull/3568)) ([3ee4d38](https://github.com/newrelic/node-newrelic/commit/3ee4d383cd7d9e7bf16e9da5e7f130fc2a103ca4))
+    * Improved GCP utilization logging ([#3552](https://github.com/newrelic/node-newrelic/pull/3552)) ([e6c4141](https://github.com/newrelic/node-newrelic/commit/e6c4141b55860b5f1fe5cd14049abb9eca9b3859))
+* Utilization resolution is now done concurrently ([#3556](https://github.com/newrelic/node-newrelic/pull/3556)) ([8386360](https://github.com/newrelic/node-newrelic/commit/8386360fe7fb4b7278e001dac8c8293581654069))
+* Collected OTEL instrumentation scope metadata on all OTEL spans. ([#3554](https://github.com/newrelic/node-newrelic/pull/3554)) ([75703c4](https://github.com/newrelic/node-newrelic/commit/75703c41a8db1d204a1500b8b43dff0d04a5b286))
+* Improved OTEL hrtime processing ([#3557](https://github.com/newrelic/node-newrelic/pull/3557)) ([8f187b1](https://github.com/newrelic/node-newrelic/commit/8f187b11eac96f78d9743cadb2302001ed94412a))
+* Renamed config `opentelemetry_bridge` to `opentelemetry` ([#3565](https://github.com/newrelic/node-newrelic/pull/3565)) ([c9d156f](https://github.com/newrelic/node-newrelic/commit/c9d156fe302ffb99b262ffd3e256d953301f08f2))
+
 ### v13.6.6 (2025-11-19)
 
 #### Bug fixes

package/THIRD_PARTY_NOTICES.md

@@ -42,7 +42,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 * [@aws-sdk/client-s3](#aws-sdkclient-s3)
 * [@aws-sdk/s3-request-presigner](#aws-sdks3-request-presigner)
-* [@koa/router](#koarouter)
 * [@matteo.collina/tspl](#matteocollinatspl)
 * [@newrelic/eslint-config](#newreliceslint-config)
 * [@newrelic/newrelic-oss-cli](#newrelicnewrelic-oss-cli)
@@ -69,9 +68,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [got](#got)
 * [husky](#husky)
 * [jsdoc](#jsdoc)
-* [koa-route](#koa-route)
-* [koa-router](#koa-router)
-* [koa](#koa)
 * [lint-staged](#lint-staged)
 * [lockfile-lint](#lockfile-lint)
 * [nock](#nock)
@@ -1190,7 +1186,7 @@ This product includes source derived from [@opentelemetry/api](https://github.co
 
 ### @opentelemetry/core
 
-This product includes source derived from [@opentelemetry/core](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
+This product includes source derived from [@opentelemetry/core](https://github.com/open-telemetry/opentelemetry-js) ([v2.2.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.2.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.2.0/LICENSE):
 
 ```
                                  Apache License
@@ -1608,7 +1604,7 @@ This product includes source derived from [@opentelemetry/exporter-metrics-otlp-
 
 ### @opentelemetry/resources
 
-This product includes source derived from [@opentelemetry/resources](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
+This product includes source derived from [@opentelemetry/resources](https://github.com/open-telemetry/opentelemetry-js) ([v2.2.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.2.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.2.0/LICENSE):
 
 ```
                                  Apache License
@@ -2026,7 +2022,7 @@ This product includes source derived from [@opentelemetry/sdk-logs](https://gith
 
 ### @opentelemetry/sdk-metrics
 
-This product includes source derived from [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
+This product includes source derived from [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js) ([v2.2.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.2.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.2.0/LICENSE):
 
 ```
                                  Apache License
@@ -2235,7 +2231,7 @@ This product includes source derived from [@opentelemetry/sdk-metrics](https://g
 
 ### @opentelemetry/sdk-trace-base
 
-This product includes source derived from [@opentelemetry/sdk-trace-base](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
+This product includes source derived from [@opentelemetry/sdk-trace-base](https://github.com/open-telemetry/opentelemetry-js) ([v2.2.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.2.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.2.0/LICENSE):
 
 ```
                                  Apache License
@@ -2533,7 +2529,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### import-in-the-middle
 
-This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.14.4](https://github.com/nodejs/import-in-the-middle/tree/v1.14.4)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.14.4/LICENSE):
+This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.15.0](https://github.com/nodejs/import-in-the-middle/tree/v1.15.0)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.15.0/LICENSE):
 
 ```
                                  Apache License
@@ -2908,7 +2904,7 @@ SOFTWARE.
 
 ### semver
 
-This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.7.2](https://github.com/npm/node-semver/tree/v7.7.2)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.7.2/LICENSE):
+This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.7.3](https://github.com/npm/node-semver/tree/v7.7.3)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.7.3/LICENSE):
 
 ```
 The ISC License
@@ -2964,7 +2960,7 @@ SOFTWARE.
 
 ### @aws-sdk/client-s3
 
-This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.896.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.896.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.896.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.919.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.919.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.919.0/LICENSE):
 
 ```
                                 Apache License
@@ -3173,7 +3169,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
 
 ### @aws-sdk/s3-request-presigner
 
-This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.896.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.896.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.896.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.919.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.919.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.919.0/LICENSE):
 
 ```
                                 Apache License
@@ -3380,35 +3376,6 @@ This product includes source derived from [@aws-sdk/s3-request-presigner](https:
 
 ```
 
-### @koa/router
-
-This product includes source derived from [@koa/router](https://github.com/koajs/router) ([v12.0.2](https://github.com/koajs/router/tree/v12.0.2)), distributed under the [MIT License](https://github.com/koajs/router/blob/v12.0.2/LICENSE):
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2015 Alexander C. Mingoia and @koajs contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-```
-
 ### @matteo.collina/tspl
 
 This product includes source derived from [@matteo.collina/tspl](https://github.com/mcollina/tspl) ([v0.1.1](https://github.com/mcollina/tspl/tree/v0.1.1)), distributed under the [MIT License](https://github.com/mcollina/tspl/blob/v0.1.1/LICENSE):
@@ -5033,7 +5000,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.36.0](https://github.com/eslint/eslint/tree/v9.36.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.36.0/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.38.0](https://github.com/eslint/eslint/tree/v9.38.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.38.0/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
@@ -5196,7 +5163,7 @@ SOFTWARE.
 
 ### jsdoc
 
-This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v4.0.4](https://github.com/jsdoc/jsdoc/tree/v4.0.4)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v4.0.4/LICENSE.md):
+This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v4.0.5](https://github.com/jsdoc/jsdoc/tree/v4.0.5)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v4.0.5/LICENSE.md):
 
 ```
 # License
@@ -5304,90 +5271,6 @@ https://github.com/jmblog/color-themes-for-google-code-prettify
 
 ```
 
-### koa-route
-
-This product includes source derived from [koa-route](https://github.com/koajs/route) ([v4.0.1](https://github.com/koajs/route/tree/v4.0.1)), distributed under the [MIT License](https://github.com/koajs/route/blob/v4.0.1/Readme.md):
-
-```
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
-associated documentation files (the "Software"), to deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial 
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
-EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
-
-### koa-router
-
-This product includes source derived from [koa-router](https://github.com/koajs/router) ([v12.0.1](https://github.com/koajs/router/tree/v12.0.1)), distributed under the [MIT License](https://github.com/koajs/router/blob/v12.0.1/LICENSE):
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2015 Alexander C. Mingoia and @koajs contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-```
-
-### koa
-
-This product includes source derived from [koa](https://github.com/koajs/koa) ([v2.16.2](https://github.com/koajs/koa/tree/v2.16.2)), distributed under the [MIT License](https://github.com/koajs/koa/blob/v2.16.2/LICENSE):
-
-```
-(The MIT License)
-
-Copyright (c) 2019 Koa contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-```
-
 ### lint-staged
 
 This product includes source derived from [lint-staged](https://github.com/okonet/lint-staged) ([v11.2.6](https://github.com/okonet/lint-staged/tree/v11.2.6)), distributed under the [MIT License](https://github.com/okonet/lint-staged/blob/v11.2.6/LICENSE):

package/index.js

@@ -102,7 +102,7 @@ function initialize() {
       logger.warn(
         'New Relic for Node.js in worker_threads is not officially supported. Not starting! To bypass this, set `config.worker_threads.enabled` to true in configuration.'
       )
-    } else if (config.opentelemetry_bridge.enabled === true && otelBridgeAvailable() === false) {
+    } else if (config.opentelemetry.enabled === true && otelBridgeAvailable() === false) {
       logger.warn(
         'OpenTelemetry bridge enabled, but packages are missing. Not starting!'
       )

package/lib/agent.js

@@ -5,7 +5,6 @@
 
 'use strict'
 
-const AdaptiveSampler = require('./samplers/adaptive-sampler')
 const CollectorAPI = require('./collector/api')
 const ServerlessCollector = require('./collector/serverless')
 const DESTINATIONS = require('./config/attribute-filter').DESTINATIONS
@@ -41,6 +40,7 @@ const synthetics = require('./synthetics')
 const Harvester = require('./harvester')
 const { createFeatureUsageMetrics } = require('./util/application-logging')
 const HealthReporter = require('./health-reporter')
+const Samplers = require('./samplers')
 
 // Map of valid states to whether or not data collection is valid
 const STATES = {
@@ -287,12 +287,8 @@ function Agent(config) {
     this.collector,
     this.harvester
   )
-  this.transactionSampler = new AdaptiveSampler({
-    agent: this,
-    serverless: config.serverless_mode.enabled,
-    period: config.sampling_target_period_in_seconds * 1000,
-    target: config.sampling_target
-  })
+
+  this.samplers = new Samplers(this)
 
   this.queries = new QueryTraceAggregator(
     {
@@ -848,10 +844,10 @@ Agent.prototype._listenForConfigChanges = function _listenForConfigChanges() {
     self.txSegmentNormalizer.load.apply(self.txSegmentNormalizer, arguments)
   })
   this.config.on('sampling_target', function updateSamplingTarget(target) {
-    self.transactionSampler.samplingTarget = target
+    self.samplers.updateAdaptiveTarget(target)
   })
   this.config.on('sampling_target_period_in_seconds', function updateSamplePeriod(period) {
-    self.transactionSampler.samplingPeriod = period * 1000
+    self.samplers.updateAdaptivePeriod(period)
   })
   this.config.on('event_harvest_config', function onHarvestConfigReceived(harvestConfig) {
     if (harvestConfig) {

package/lib/attributes.js

@@ -19,6 +19,9 @@ const MAXIMUM_ATTR_VALUE_LENGTH = 4_096
  * @private
  */
 class Attributes {
+  static SCOPE_TRANSACTION = 'transaction'
+  static SCOPE_SEGMENT = 'segment'
+
   /**
    * @param {object} params Constructor parameters.
    * @param {string} params.scope
@@ -125,8 +128,8 @@ class Attributes {
 
     if (!isValidType(value)) {
       return logger.debug(
-        'Not adding attribute %s with %s value type. This is expected for undefined' +
-          'attributes and only an issue if an attribute is not expected to be undefined' +
+        'Not adding attribute %s with %s value type. This is expected for undefined ' +
+          'attributes and only an issue if an attribute is not expected to be undefined ' +
           'or not of the type expected.',
         key,
         typeof value
@@ -181,10 +184,14 @@ class Attributes {
  */
 function makeFilter(scope) {
   const { attributeFilter } = Config.getInstance()
-  if (scope === 'transaction') {
-    return (d, k) => attributeFilter.filterTransaction(d, k)
-  } else if (scope === 'segment') {
-    return (d, k) => attributeFilter.filterSegment(d, k)
+  switch (scope) {
+    case Attributes.SCOPE_TRANSACTION: {
+      return (d, k) => attributeFilter.filterTransaction(d, k)
+    }
+
+    case Attributes.SCOPE_SEGMENT: {
+      return (d, k) => attributeFilter.filterSegment(d, k)
+    }
   }
 }
 

package/lib/config/default.js

@@ -1173,7 +1173,6 @@ defaultConfig.definition = () => {
             default: true,
             formatter: boolean
           },
-          ...samplerConfigs
         },
         partial_granularity: {
           enabled: {
@@ -1707,7 +1706,7 @@ defaultConfig.definition = () => {
      * NOTICE: this configuration is subject to change while the OTEL
      * feature set is in development.
      */
-    opentelemetry_bridge: {
+    opentelemetry: {
     /**
      * Global switch for the whole OpenTelemetry feature. If it is set to
      * `false`, any other sub-feature, e.g. `traces`, will not be enabled

package/lib/config/index.js

@@ -25,7 +25,7 @@ const mergeServerConfig = new MergeServerConfig()
 const { boolean: isTruthular } = require('./formatters')
 const configDefinition = definition()
 const parseLabels = require('../util/label-parser')
-const { buildTraceIdRatioSamplers, setTraceIdRatioSamplerFromEnv } = require('./samplers')
+const { buildSamplers, setSamplersFromEnv } = require('./samplers')
 
 /**
  * CONSTANTS -- we gotta lotta 'em
@@ -125,6 +125,8 @@ function Config(config) {
   this.trusted_account_ids = null
   this.trusted_account_key = null
 
+  // The global sampling target for AdaptiveSamplers that do not
+  // specify their own sampling_target
   this.sampling_target = this.distributed_tracing.sampler.adaptive_sampling_target
   this.sampling_target_period_in_seconds = 60
   this.max_payload_size_in_bytes = DEFAULT_MAX_PAYLOAD_SIZE_IN_BYTES
@@ -999,10 +1001,13 @@ function getHostnameSafe(gcpId = null) {
     // If not applicable, use the os.hostname()
     if (config.heroku.use_dyno_names && process.env.DYNO) {
       _hostname = process.env.DYNO || os.hostname()
+      logger.info('Using Heroku dyno name for host name: %s', _hostname)
     } else if (config.utilization.gcp_use_instance_as_host && process.env.K_SERVICE && gcpId) {
       _hostname = gcpId
+      logger.info('Using GCP instance ID for host name: %s', _hostname)
     } else {
       _hostname = os.hostname()
+      logger.info('Using OS hostname for host name: %s', _hostname)
     }
     return _hostname
   } catch {
@@ -1010,14 +1015,15 @@ function getHostnameSafe(gcpId = null) {
 
     if (this.process_host.ipv_preference === '6' && addresses.ipv6) {
       _hostname = addresses.ipv6
+      logger.info('Defaulting to ipv6 address for host name: %s', _hostname)
     } else if (addresses.ipv4) {
-      logger.info('Defaulting to ipv4 address for host name')
+      logger.info('Defaulting to ipv4 address for host name: %s', _hostname)
       _hostname = addresses.ipv4
     } else if (addresses.ipv6) {
-      logger.info('Defaulting to ipv6 address for host name')
+      logger.info('Defaulting to ipv6 address for host name: %s', _hostname)
       _hostname = addresses.ipv6
     } else {
-      logger.info('No hostname, ipv4, or ipv6 address found for machine')
+      logger.info('No hostname, ipv4, or ipv6 address found for machine using UNKNOWN_BOX')
       _hostname = 'UNKNOWN_BOX'
     }
 
@@ -1065,8 +1071,8 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
       continue
     }
 
-    // Handle trace_id_ratio_based for distributed tracing sampler configuration
-    buildTraceIdRatioSamplers({ config: external, key, incomingConfig: internal, logger })
+    // Handle object-based distributed tracing sampler configurations
+    buildSamplers({ config: external, key, configToUpdate: internal, logger })
 
     if (key === 'ssl' && !isTruthular(external.ssl)) {
       logger.warn(SSL_WARNING)
@@ -1207,10 +1213,11 @@ Config.prototype._fromEnvironment = function _fromEnvironment(
       setFromEnv({ config, key, paths, envVar, formatter: value.formatter })
 
       // Handle custom configuration of the sampler if it's set to trace_id_ratio_based
-      // since sampler was set to a string but now has to be converted to an object.
-      // This is called here because we need set the sampler to a value first in config before setting
-      // trace id ratio sampler (if the user set that)
-      setTraceIdRatioSamplerFromEnv({
+      // or adaptive with adaptive.sampling_target defined, since sampler was set to a
+      // string but now has to be converted to an object.
+      // This is called here because we need to set the sampler to a value first in config
+      // before setting the samplers.
+      setSamplersFromEnv({
         key,
         config,
         paths,