From 5fb9476407fffb33450897c9328632122e66fbfb Mon Sep 17 00:00:00 2001 From: Brian Canzanella Date: Thu, 13 Jul 2023 13:53:25 -0400 Subject: [PATCH 1/2] feat: enable code_level_metrics by default --- lib/config/default.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/config/default.js b/lib/config/default.js index ec0b6e5d0e..fc9141ae13 100644 --- a/lib/config/default.js +++ b/lib/config/default.js @@ -1221,7 +1221,7 @@ defaultConfig.definition = () => ({ code_level_metrics: { enabled: { formatter: boolean, - default: false + default: true } }, From 8d0137492bbc7399f2603526b20ee01ada484086 Mon Sep 17 00:00:00 2001 From: Brian Canzanella Date: Fri, 14 Jul 2023 11:07:25 -0400 Subject: [PATCH 2/2] fix: tests --- test/unit/config/config-defaults.test.js | 4 ++-- test/unit/shim/webframework-shim.test.js | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/test/unit/config/config-defaults.test.js b/test/unit/config/config-defaults.test.js index 54ae8e955a..69d23f58cd 100644 --- a/test/unit/config/config-defaults.test.js +++ b/test/unit/config/config-defaults.test.js @@ -266,8 +266,8 @@ tap.test('with default properties', (t) => { t.end() }) - t.test('should default `code_level_metrics.enabled` to false', (t) => { - t.equal(configuration.code_level_metrics.enabled, false) + t.test('should default `code_level_metrics.enabled` to true', (t) => { + t.equal(configuration.code_level_metrics.enabled, true) t.end() }) diff --git a/test/unit/shim/webframework-shim.test.js b/test/unit/shim/webframework-shim.test.js index 932ddbc8ef..5cd325c881 100644 --- a/test/unit/shim/webframework-shim.test.js +++ b/test/unit/shim/webframework-shim.test.js @@ -599,10 +599,14 @@ test('WebFrameworkShim', function (t) { const segment = wrapped(req) t.ok(segment.attributes) - t.same(segment.getAttributes(), { - 'request.parameters.route.foo': 'bar', - 'request.parameters.route.biz': 'bang' - }) + const attrs = segment.getAttributes() + t.equal(attrs['request.parameters.route.foo'], 'bar') + t.equal(attrs['request.parameters.route.biz'], 'bang') + const filePathSplit = attrs['code.filepath'].split('/') + t.equal(filePathSplit[filePathSplit.length - 1], 'webframework-shim.test.js') + t.equal(attrs['code.function'], 'getActiveSegment') + t.equal(attrs['code.lineno'], 37) + t.equal(attrs['code.column'], 50) t.end() }) }) @@ -618,7 +622,10 @@ test('WebFrameworkShim', function (t) { const segment = wrapped(req) t.ok(segment.attributes) - t.same(segment.getAttributes(), {}) + const attrs = Object.keys(segment.getAttributes()) + const requestParameters = /request\.parameters.*/ + + t.notOk(attrs.some((attr) => requestParameters.test(attr))) t.end() }) })