From d240578b42448bb3302a72e1e2f047ad19a3a8b3 Mon Sep 17 00:00:00 2001 From: Herman Ho Date: Thu, 15 Jun 2023 23:07:36 +0000 Subject: [PATCH 1/2] Add http field in Segment and Subsegment type --- packages/core/lib/segments/attributes/subsegment.d.ts | 3 +++ packages/core/lib/segments/segment.d.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/packages/core/lib/segments/attributes/subsegment.d.ts b/packages/core/lib/segments/attributes/subsegment.d.ts index 64db3433..0cd7ce47 100644 --- a/packages/core/lib/segments/attributes/subsegment.d.ts +++ b/packages/core/lib/segments/attributes/subsegment.d.ts @@ -1,5 +1,6 @@ import * as http from 'http'; import { Segment, SegmentLike } from '../../aws-xray'; +import IncomingRequestData from '../../middleware/incoming_request_data'; declare class Subsegment { id: string; @@ -12,6 +13,8 @@ declare class Subsegment { namespace?: string; notTraced: boolean; + http?: IncomingRequestData; + constructor(name: string); addNewSubsegment(name: string): Subsegment; diff --git a/packages/core/lib/segments/segment.d.ts b/packages/core/lib/segments/segment.d.ts index 170b7f60..a16f107b 100644 --- a/packages/core/lib/segments/segment.d.ts +++ b/packages/core/lib/segments/segment.d.ts @@ -14,6 +14,7 @@ declare class Segment { notTraced?: boolean; additionalTraceData?: object + http?: IncomingRequestData; constructor(name: string, rootId?: string | null, parentId?: string | null); From 295f890935231c473e63b9b7a36f6813d23c771d Mon Sep 17 00:00:00 2001 From: Herman Ho Date: Tue, 20 Jun 2023 16:17:55 +0000 Subject: [PATCH 2/2] add RemoteRequestData --- .../segments/attributes/remote_request_data.d.ts | 14 ++++++++++++++ .../core/lib/segments/attributes/subsegment.d.ts | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/core/lib/segments/attributes/remote_request_data.d.ts diff --git a/packages/core/lib/segments/attributes/remote_request_data.d.ts b/packages/core/lib/segments/attributes/remote_request_data.d.ts new file mode 100644 index 00000000..aa29cc6b --- /dev/null +++ b/packages/core/lib/segments/attributes/remote_request_data.d.ts @@ -0,0 +1,14 @@ +import * as http from 'http'; +import * as https from 'https'; + +declare class RemoteRequestData { + request: { url: string, method: string, traced?: boolean }; + + response?: http.IncomingMessage | https.IncomingMessage; + + constructor(req: http.ClientRequest | https.ClientRequest, res: http.IncomingMessage | https.IncomingMessage, downstreamXRayEnabled: boolean); + + init(res: http.ServerResponse): void; +} + +export = RemoteRequestData; diff --git a/packages/core/lib/segments/attributes/subsegment.d.ts b/packages/core/lib/segments/attributes/subsegment.d.ts index 0cd7ce47..c518ab76 100644 --- a/packages/core/lib/segments/attributes/subsegment.d.ts +++ b/packages/core/lib/segments/attributes/subsegment.d.ts @@ -1,6 +1,6 @@ import * as http from 'http'; import { Segment, SegmentLike } from '../../aws-xray'; -import IncomingRequestData from '../../middleware/incoming_request_data'; +import RemoteRequestData from './remote_request_data'; declare class Subsegment { id: string; @@ -13,7 +13,7 @@ declare class Subsegment { namespace?: string; notTraced: boolean; - http?: IncomingRequestData; + http?: RemoteRequestData; constructor(name: string);