From 83caa2135aa2db10cf2820c4e8e596216a57d449 Mon Sep 17 00:00:00 2001 From: David <75678655+David-Werth@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:18:21 +0200 Subject: [PATCH 1/6] refactor(tracer): mark memberVariable as readonly --- packages/tracer/tests/unit/Tracer.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tracer/tests/unit/Tracer.test.ts b/packages/tracer/tests/unit/Tracer.test.ts index 042cead86c..730df4423b 100644 --- a/packages/tracer/tests/unit/Tracer.test.ts +++ b/packages/tracer/tests/unit/Tracer.test.ts @@ -975,7 +975,7 @@ describe('Class: Tracer', () => { createCaptureAsyncFuncMock(tracer.provider, newSubsegment); class Lambda implements LambdaInterface { - private memberVariable: string; + readonly memberVariable: string; public constructor(memberVariable: string) { this.memberVariable = memberVariable; From faa9c930753dcea072083f25e0a80ef0bccc1eb7 Mon Sep 17 00:00:00 2001 From: David <75678655+David-Werth@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:26:44 +0200 Subject: [PATCH 2/6] refactor(tracer): remove union type from Subsegment instatiations --- packages/tracer/tests/unit/Tracer.test.ts | 32 +++++++---------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/packages/tracer/tests/unit/Tracer.test.ts b/packages/tracer/tests/unit/Tracer.test.ts index 730df4423b..7b3e8e9c2c 100644 --- a/packages/tracer/tests/unit/Tracer.test.ts +++ b/packages/tracer/tests/unit/Tracer.test.ts @@ -19,7 +19,7 @@ const createCaptureAsyncFuncMock = ( vi .spyOn(provider, 'captureAsyncFunc') .mockImplementation(async (methodName, callBackFn) => { - const newSubsegment = subsegment || new Subsegment(`### ${methodName}`); + const newSubsegment = subsegment ?? new Subsegment(`### ${methodName}`); vi.spyOn(newSubsegment, 'flush').mockImplementation(() => null); return await callBackFn(newSubsegment); }); @@ -692,9 +692,7 @@ describe('Class: Tracer', () => { .mockImplementation(() => ({})); // Act - const newSubsegment: Segment | Subsegment | undefined = new Subsegment( - '## foo.bar' - ); + const newSubsegment = new Subsegment('## foo.bar'); tracer.setSegment(newSubsegment); // Assess @@ -961,9 +959,7 @@ describe('Class: Tracer', () => { it('awaits async methods correctly', async () => { // Prepare const tracer: Tracer = new Tracer(); - const newSubsegment: Segment | Subsegment | undefined = new Subsegment( - '### dummyMethod' - ); + const newSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => newSubsegment @@ -1021,8 +1017,7 @@ describe('Class: Tracer', () => { it('catches the error and logs a warning when a segment fails to close/serialize', async () => { // Prepare const tracer: Tracer = new Tracer(); - const handlerSubsegment: Segment | Subsegment | undefined = - new Subsegment('### dummyMethod'); + const handlerSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => handlerSubsegment ); @@ -1192,9 +1187,7 @@ describe('Class: Tracer', () => { it('captures the exception correctly', async () => { // Prepare const tracer: Tracer = new Tracer(); - const newSubsegment: Segment | Subsegment | undefined = new Subsegment( - '### dummyMethod' - ); + const newSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => newSubsegment ); @@ -1237,9 +1230,7 @@ describe('Class: Tracer', () => { it('preserves the this scope correctly when used as decorator', async () => { // Prepare const tracer: Tracer = new Tracer(); - const newSubsegment: Segment | Subsegment | undefined = new Subsegment( - '### dummyMethod' - ); + const newSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => newSubsegment ); @@ -1274,9 +1265,7 @@ describe('Class: Tracer', () => { it('awaits the async method correctly when used as decorator', async () => { // Prepare const tracer: Tracer = new Tracer(); - const newSubsegment: Segment | Subsegment | undefined = new Subsegment( - '### dummyMethod' - ); + const newSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => newSubsegment @@ -1375,9 +1364,7 @@ describe('Class: Tracer', () => { it('sets the correct name for the subsegment when used as decorator and with a custom subSegmentName', async () => { // Prepare const tracer: Tracer = new Tracer(); - const newSubsegment: Segment | Subsegment | undefined = new Subsegment( - '### dummyMethod' - ); + const newSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(newSubsegment, 'flush').mockImplementation(() => null); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => newSubsegment @@ -1412,8 +1399,7 @@ describe('Class: Tracer', () => { it('catches the error and logs a warning when a segment fails to close/serialize', async () => { // Prepare const tracer: Tracer = new Tracer(); - const handlerSubsegment: Segment | Subsegment | undefined = - new Subsegment('### dummyMethod'); + const handlerSubsegment = new Subsegment('### dummyMethod'); vi.spyOn(tracer.provider, 'getSegment').mockImplementation( () => handlerSubsegment ); From fbc18d77c923f57b8b5eab0e30937dbc951bbcae Mon Sep 17 00:00:00 2001 From: David <75678655+David-Werth@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:30:43 +0200 Subject: [PATCH 3/6] refactor(tracer): remove redundant return --- packages/tracer/src/Tracer.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/tracer/src/Tracer.ts b/packages/tracer/src/Tracer.ts index 590bb2de95..4aeb859221 100644 --- a/packages/tracer/src/Tracer.ts +++ b/packages/tracer/src/Tracer.ts @@ -822,7 +822,6 @@ class Tracer extends Utility implements TracerInterface { if (this.#envConfig.captureHTTPsRequests.toLowerCase() === 'false') { this.captureHTTPsRequests = false; - return; } } From a48b18dd4566d13d7abc8d647b56fb0b2e525f60 Mon Sep 17 00:00:00 2001 From: David <75678655+David-Werth@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:32:39 +0200 Subject: [PATCH 4/6] refactor(tracer): replace implicit return type with 'this' --- packages/tracer/src/Tracer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tracer/src/Tracer.ts b/packages/tracer/src/Tracer.ts index 4aeb859221..77de9f9214 100644 --- a/packages/tracer/src/Tracer.ts +++ b/packages/tracer/src/Tracer.ts @@ -867,7 +867,7 @@ class Tracer extends Utility implements TracerInterface { * * @param options - Configuration passed to the tracer */ - private setOptions(options: TracerOptions): Tracer { + private setOptions(options: TracerOptions): this { const { enabled, serviceName, captureHTTPsRequests, customConfigService } = options; From 91e0942b618350db942eafe306e5131d87d23b26 Mon Sep 17 00:00:00 2001 From: David <75678655+David-Werth@users.noreply.github.com> Date: Tue, 5 Aug 2025 06:59:20 +0200 Subject: [PATCH 5/6] refactor(tracer): remove accidentaly placed nullish coalescing operator --- packages/tracer/tests/unit/Tracer.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tracer/tests/unit/Tracer.test.ts b/packages/tracer/tests/unit/Tracer.test.ts index 7b3e8e9c2c..38eda2c259 100644 --- a/packages/tracer/tests/unit/Tracer.test.ts +++ b/packages/tracer/tests/unit/Tracer.test.ts @@ -19,7 +19,7 @@ const createCaptureAsyncFuncMock = ( vi .spyOn(provider, 'captureAsyncFunc') .mockImplementation(async (methodName, callBackFn) => { - const newSubsegment = subsegment ?? new Subsegment(`### ${methodName}`); + const newSubsegment = subsegment || new Subsegment(`### ${methodName}`); vi.spyOn(newSubsegment, 'flush').mockImplementation(() => null); return await callBackFn(newSubsegment); }); From fa856bd1f98028dd9325010416a2f294472609f9 Mon Sep 17 00:00:00 2001 From: David <75678655+David-Werth@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:02:01 +0200 Subject: [PATCH 6/6] refactor(tracer): mark memberVariable as private and readonly --- packages/tracer/tests/unit/Tracer.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tracer/tests/unit/Tracer.test.ts b/packages/tracer/tests/unit/Tracer.test.ts index 38eda2c259..a59a125a9c 100644 --- a/packages/tracer/tests/unit/Tracer.test.ts +++ b/packages/tracer/tests/unit/Tracer.test.ts @@ -971,7 +971,7 @@ describe('Class: Tracer', () => { createCaptureAsyncFuncMock(tracer.provider, newSubsegment); class Lambda implements LambdaInterface { - readonly memberVariable: string; + private readonly memberVariable: string; public constructor(memberVariable: string) { this.memberVariable = memberVariable;