Add support for stripping header structs

creditkarma · Aug 9, 2019 · 60e84c7 · 60e84c7
1 parent c0f929d
commit 60e84c7
Show file tree

Hide file tree

Showing 18 changed files with 157 additions and 103 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/thrift-client-context-filter/package-lock.json b/packages/thrift-client-context-filter/package-lock.json
diff --git a/packages/thrift-client-timing-filter/package-lock.json b/packages/thrift-client-timing-filter/package-lock.json
diff --git a/packages/thrift-client-ttwitter-filter/package-lock.json b/packages/thrift-client-ttwitter-filter/package-lock.json
diff --git a/packages/thrift-client-ttwitter-filter/src/main/ThriftClientTTwitterFilter.ts b/packages/thrift-client-ttwitter-filter/src/main/ThriftClientTTwitterFilter.ts
@@ -161,34 +161,25 @@ export function ThriftClientTTwitterFilter<T>({
 
                             const requestHeader: TTwitter.IRequestHeader = {
                                 trace_id: new Int64(
-                                    `0x${
-                                        (normalHeaders as any)[
-                                            ZipkinHeaders.TraceId
-                                        ]
-                                    }`,
+                                    `0x${normalHeaders[ZipkinHeaders.TraceId]}`,
                                 ),
                                 span_id: new Int64(
-                                    `0x${
-                                        (normalHeaders as any)[
-                                            ZipkinHeaders.SpanId
-                                        ]
-                                    }`,
+                                    `0x${normalHeaders[ZipkinHeaders.SpanId]}`,
                                 ),
                                 parent_span_id:
                                     normalHeaders[ZipkinHeaders.ParentId] !==
                                     undefined
                                         ? new Int64(
                                               `0x${
-                                                  (normalHeaders as any)[
+                                                  normalHeaders[
                                                       ZipkinHeaders.ParentId
                                                   ]
                                               }`,
                                           )
                                         : undefined,
                                 sampled:
-                                    (normalHeaders as any)[
-                                        ZipkinHeaders.Sampled
-                                    ] === '1',
+                                    normalHeaders[ZipkinHeaders.Sampled] ===
+                                    '1',
                                 client_id:
                                     clientId !== undefined
                                         ? new TTwitter.ClientId(clientId)

diff --git a/packages/thrift-client-zipkin-filter/package-lock.json b/packages/thrift-client-zipkin-filter/package-lock.json
diff --git a/packages/thrift-client/package-lock.json b/packages/thrift-client/package-lock.json
diff --git a/packages/thrift-integration/package-lock.json b/packages/thrift-integration/package-lock.json
diff --git a/packages/thrift-server-core/package-lock.json b/packages/thrift-server-core/package-lock.json
diff --git a/packages/thrift-server-core/src/main/utils/readThriftObject.ts b/packages/thrift-server-core/src/main/utils/readThriftObject.ts
@@ -1,9 +1,11 @@
 import {
     IProtocolConstructor,
     IStructCodec,
+    IThriftField,
     ITransportConstructor,
     ProtocolType,
     TransportType,
+    TType,
 } from '../types'
 
 import { getProtocol, TProtocol } from '../protocols'
@@ -26,3 +28,35 @@ export function readThriftObject<StrictType>(
         resolve([decoded, receiver.remaining()])
     })
 }
+
+export function stripStruct(
+    data: Buffer,
+    transportType: TransportType = 'buffered',
+    protocolType: ProtocolType = 'binary',
+): Buffer {
+    try {
+        const Transport: ITransportConstructor = getTransport(transportType)
+        const Protocol: IProtocolConstructor = getProtocol(protocolType)
+        const receiver: TTransport = new Transport(data)
+        const input: TProtocol = new Protocol(receiver)
+
+        input.readStructBegin()
+
+        while (true) {
+            const ret: IThriftField = input.readFieldBegin()
+            const fieldType: TType = ret.fieldType
+            if (fieldType === TType.STOP) {
+                break
+            } else {
+                input.skip(fieldType)
+            }
+            input.readFieldEnd()
+        }
+
+        input.readStructEnd()
+
+        return receiver.remaining()
+    } catch (err) {
+        return data
+    }
+}