npm - @opentelemetry/propagation-utils - Versions diffs - 0.31.9 → 0.31.10 - Mend

@opentelemetry/propagation-utils 0.31.9 → 0.31.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/build/esm/pubsub-propagation.js +4 -2
package/build/esm/pubsub-propagation.js.map +1 -1
package/build/src/pubsub-propagation.js +4 -2
package/build/src/pubsub-propagation.js.map +1 -1
package/package.json +3 -5

package/build/esm/pubsub-propagation.js CHANGED Viewed

@@ -59,11 +59,13 @@ const patchArrayFunction = (messages, functionName, tracer, loopContext) => {
             });
             if (typeof res === 'object') {
                 const startSpanFunction = Object.getOwnPropertyDescriptor(message, START_SPAN_FUNCTION);
-                startSpanFunction &&
+                if (startSpanFunction) {
                     Object.defineProperty(res, START_SPAN_FUNCTION, startSpanFunction);
+                }
                 const endSpanFunction = Object.getOwnPropertyDescriptor(message, END_SPAN_FUNCTION);
-                endSpanFunction &&
+                if (endSpanFunction) {
                     Object.defineProperty(res, END_SPAN_FUNCTION, endSpanFunction);
+                }
             }
             return res;
         };

package/build/esm/pubsub-propagation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright The OpenTelemetry Authors\n \n Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n \n https://www.apache.org/licenses/LICENSE-2.0\n \n Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n Tracer,\n SpanKind,\n Span,\n Context,\n Link,\n context,\n trace,\n diag,\n SpanAttributes,\n} from '@opentelemetry/api';\n\nconst START_SPAN_FUNCTION = Symbol(\n 'opentelemetry.pubsub-propagation.start_span'\n);\nconst END_SPAN_FUNCTION = Symbol('opentelemetry.pubsub-propagation.end_span');\n\ninterface OtelProcessedMessage {\n [START_SPAN_FUNCTION]?: () => Span;\n [END_SPAN_FUNCTION]?: () => void;\n}\n\nconst patchArrayFilter = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages.filter;\n const patchedFunc = function (\n this: unknown,\n ...args: Parameters<typeof origFunc>\n ) {\n const newArray = origFunc.apply(this, args);\n patchArrayForProcessSpans(newArray, tracer, loopContext);\n return newArray;\n };\n\n Object.defineProperty(messages, 'filter', {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nfunction isPromise(value: unknown): value is Promise<unknown> {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n return typeof (value as any)?.then === 'function';\n}\n\nconst patchArrayFunction = (\n messages: OtelProcessedMessage[],\n functionName: 'forEach' \| 'map',\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages[functionName] as typeof messages.map;\n const patchedFunc = function (\n this: unknown,\n ...arrFuncArgs: Parameters<typeof origFunc>\n ) {\n const callback = arrFuncArgs[0];\n const wrappedCallback = function (\n this: unknown,\n ...callbackArgs: Parameters<typeof callback>\n ) {\n const message = callbackArgs[0];\n const messageSpan = message?.[START_SPAN_FUNCTION]?.();\n if (!messageSpan) return callback.apply(this, callbackArgs);\n\n const res = context.with(trace.setSpan(loopContext, messageSpan), () => {\n let result: Promise<unknown> \| unknown;\n try {\n result = callback.apply(this, callbackArgs);\n if (isPromise(result)) {\n const endSpan = () => message[END_SPAN_FUNCTION]?.();\n result.then(endSpan, endSpan);\n }\n return result;\n } finally {\n if (!isPromise(result)) {\n message[END_SPAN_FUNCTION]?.();\n }\n }\n });\n\n if (typeof res === 'object') {\n const startSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n START_SPAN_FUNCTION\n );\n startSpanFunction &&\n Object.defineProperty(res, START_SPAN_FUNCTION, startSpanFunction);\n\n const endSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n END_SPAN_FUNCTION\n );\n endSpanFunction &&\n Object.defineProperty(res, END_SPAN_FUNCTION, endSpanFunction);\n }\n return res;\n };\n arrFuncArgs[0] = wrappedCallback;\n const funcResult = origFunc.apply(this, arrFuncArgs);\n if (Array.isArray(funcResult))\n patchArrayForProcessSpans(funcResult, tracer, loopContext);\n return funcResult;\n };\n\n Object.defineProperty(messages, functionName, {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nconst patchArrayForProcessSpans = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context = context.active()\n) => {\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'forEach',\n tracer,\n loopContext\n );\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'map',\n tracer,\n loopContext\n );\n patchArrayFilter(messages, tracer, loopContext);\n};\n\nconst startMessagingProcessSpan = <T>(\n message: T,\n name: string,\n attributes: SpanAttributes,\n parentContext: Context,\n propagatedContext: Context,\n tracer: Tracer,\n processHook?: ProcessHook<T>\n): Span => {\n const links: Link[] = [];\n const spanContext = trace.getSpanContext(propagatedContext);\n if (spanContext) {\n links.push({\n context: spanContext,\n } as Link);\n }\n\n const spanName = `${name} process`;\n const processSpan = tracer.startSpan(\n spanName,\n {\n kind: SpanKind.CONSUMER,\n attributes: {\n ...attributes,\n ['messaging.operation']: 'process',\n },\n links,\n },\n parentContext\n );\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => processSpan,\n });\n\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {\n processSpan.end();\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {},\n });\n },\n });\n\n try {\n processHook?.(processSpan, message);\n } catch (err) {\n diag.error('opentelemetry-pubsub-propagation: process hook error', err);\n }\n\n return processSpan;\n};\n\ninterface SpanDetails {\n attributes: SpanAttributes;\n parentContext: Context;\n name: string;\n}\n\ntype ProcessHook<T> = (processSpan: Span, message: T) => void;\n\ninterface PatchForProcessingPayload<T> {\n messages: T[];\n tracer: Tracer;\n parentContext: Context;\n messageToSpanDetails: (message: T) => SpanDetails;\n processHook?: ProcessHook<T>;\n}\n\nconst patchMessagesArrayToStartProcessSpans = <T>({\n messages,\n tracer,\n parentContext,\n messageToSpanDetails,\n processHook,\n}: PatchForProcessingPayload<T>) => {\n messages.forEach(message => {\n const {\n attributes,\n name,\n parentContext: propagatedContext,\n } = messageToSpanDetails(message);\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () =>\n startMessagingProcessSpan<T>(\n message,\n name,\n attributes,\n parentContext,\n propagatedContext,\n tracer,\n processHook\n ),\n });\n });\n};\n\nexport default {\n patchMessagesArrayToStartProcessSpans,\n patchArrayForProcessSpans,\n};\n"]}
1	+ {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright The OpenTelemetry Authors\n \n Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n \n https://www.apache.org/licenses/LICENSE-2.0\n \n Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n Tracer,\n SpanKind,\n Span,\n Context,\n Link,\n context,\n trace,\n diag,\n SpanAttributes,\n} from '@opentelemetry/api';\n\nconst START_SPAN_FUNCTION = Symbol(\n 'opentelemetry.pubsub-propagation.start_span'\n);\nconst END_SPAN_FUNCTION = Symbol('opentelemetry.pubsub-propagation.end_span');\n\ninterface OtelProcessedMessage {\n [START_SPAN_FUNCTION]?: () => Span;\n [END_SPAN_FUNCTION]?: () => void;\n}\n\nconst patchArrayFilter = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages.filter;\n const patchedFunc = function (\n this: unknown,\n ...args: Parameters<typeof origFunc>\n ) {\n const newArray = origFunc.apply(this, args);\n patchArrayForProcessSpans(newArray, tracer, loopContext);\n return newArray;\n };\n\n Object.defineProperty(messages, 'filter', {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nfunction isPromise(value: unknown): value is Promise<unknown> {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n return typeof (value as any)?.then === 'function';\n}\n\nconst patchArrayFunction = (\n messages: OtelProcessedMessage[],\n functionName: 'forEach' \| 'map',\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages[functionName] as typeof messages.map;\n const patchedFunc = function (\n this: unknown,\n ...arrFuncArgs: Parameters<typeof origFunc>\n ) {\n const callback = arrFuncArgs[0];\n const wrappedCallback = function (\n this: unknown,\n ...callbackArgs: Parameters<typeof callback>\n ) {\n const message = callbackArgs[0];\n const messageSpan = message?.[START_SPAN_FUNCTION]?.();\n if (!messageSpan) return callback.apply(this, callbackArgs);\n\n const res = context.with(trace.setSpan(loopContext, messageSpan), () => {\n let result: Promise<unknown> \| unknown;\n try {\n result = callback.apply(this, callbackArgs);\n if (isPromise(result)) {\n const endSpan = () => message[END_SPAN_FUNCTION]?.();\n result.then(endSpan, endSpan);\n }\n return result;\n } finally {\n if (!isPromise(result)) {\n message[END_SPAN_FUNCTION]?.();\n }\n }\n });\n\n if (typeof res === 'object') {\n const startSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n START_SPAN_FUNCTION\n );\n if (startSpanFunction) {\n Object.defineProperty(res, START_SPAN_FUNCTION, startSpanFunction);\n }\n\n const endSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n END_SPAN_FUNCTION\n );\n if (endSpanFunction) {\n Object.defineProperty(res, END_SPAN_FUNCTION, endSpanFunction);\n }\n }\n return res;\n };\n arrFuncArgs[0] = wrappedCallback;\n const funcResult = origFunc.apply(this, arrFuncArgs);\n if (Array.isArray(funcResult))\n patchArrayForProcessSpans(funcResult, tracer, loopContext);\n return funcResult;\n };\n\n Object.defineProperty(messages, functionName, {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nconst patchArrayForProcessSpans = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context = context.active()\n) => {\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'forEach',\n tracer,\n loopContext\n );\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'map',\n tracer,\n loopContext\n );\n patchArrayFilter(messages, tracer, loopContext);\n};\n\nconst startMessagingProcessSpan = <T>(\n message: T,\n name: string,\n attributes: SpanAttributes,\n parentContext: Context,\n propagatedContext: Context,\n tracer: Tracer,\n processHook?: ProcessHook<T>\n): Span => {\n const links: Link[] = [];\n const spanContext = trace.getSpanContext(propagatedContext);\n if (spanContext) {\n links.push({\n context: spanContext,\n } as Link);\n }\n\n const spanName = `${name} process`;\n const processSpan = tracer.startSpan(\n spanName,\n {\n kind: SpanKind.CONSUMER,\n attributes: {\n ...attributes,\n ['messaging.operation']: 'process',\n },\n links,\n },\n parentContext\n );\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => processSpan,\n });\n\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {\n processSpan.end();\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {},\n });\n },\n });\n\n try {\n processHook?.(processSpan, message);\n } catch (err) {\n diag.error('opentelemetry-pubsub-propagation: process hook error', err);\n }\n\n return processSpan;\n};\n\ninterface SpanDetails {\n attributes: SpanAttributes;\n parentContext: Context;\n name: string;\n}\n\ntype ProcessHook<T> = (processSpan: Span, message: T) => void;\n\ninterface PatchForProcessingPayload<T> {\n messages: T[];\n tracer: Tracer;\n parentContext: Context;\n messageToSpanDetails: (message: T) => SpanDetails;\n processHook?: ProcessHook<T>;\n}\n\nconst patchMessagesArrayToStartProcessSpans = <T>({\n messages,\n tracer,\n parentContext,\n messageToSpanDetails,\n processHook,\n}: PatchForProcessingPayload<T>) => {\n messages.forEach(message => {\n const {\n attributes,\n name,\n parentContext: propagatedContext,\n } = messageToSpanDetails(message);\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () =>\n startMessagingProcessSpan<T>(\n message,\n name,\n attributes,\n parentContext,\n propagatedContext,\n tracer,\n processHook\n ),\n });\n });\n};\n\nexport default {\n patchMessagesArrayToStartProcessSpans,\n patchArrayForProcessSpans,\n};\n"]}

package/build/src/pubsub-propagation.js CHANGED Viewed

@@ -61,11 +61,13 @@ const patchArrayFunction = (messages, functionName, tracer, loopContext) => {
             });
             if (typeof res === 'object') {
                 const startSpanFunction = Object.getOwnPropertyDescriptor(message, START_SPAN_FUNCTION);
-                startSpanFunction &&
+                if (startSpanFunction) {
                     Object.defineProperty(res, START_SPAN_FUNCTION, startSpanFunction);
+                }
                 const endSpanFunction = Object.getOwnPropertyDescriptor(message, END_SPAN_FUNCTION);
-                endSpanFunction &&
+                if (endSpanFunction) {
                     Object.defineProperty(res, END_SPAN_FUNCTION, endSpanFunction);
+                }
             }
             return res;
         };

package/build/src/pubsub-propagation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright The OpenTelemetry Authors\n \n Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n \n https://www.apache.org/licenses/LICENSE-2.0\n \n Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n Tracer,\n SpanKind,\n Span,\n Context,\n Link,\n context,\n trace,\n diag,\n SpanAttributes,\n} from '@opentelemetry/api';\n\nconst START_SPAN_FUNCTION = Symbol(\n 'opentelemetry.pubsub-propagation.start_span'\n);\nconst END_SPAN_FUNCTION = Symbol('opentelemetry.pubsub-propagation.end_span');\n\ninterface OtelProcessedMessage {\n [START_SPAN_FUNCTION]?: () => Span;\n [END_SPAN_FUNCTION]?: () => void;\n}\n\nconst patchArrayFilter = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages.filter;\n const patchedFunc = function (\n this: unknown,\n ...args: Parameters<typeof origFunc>\n ) {\n const newArray = origFunc.apply(this, args);\n patchArrayForProcessSpans(newArray, tracer, loopContext);\n return newArray;\n };\n\n Object.defineProperty(messages, 'filter', {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nfunction isPromise(value: unknown): value is Promise<unknown> {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n return typeof (value as any)?.then === 'function';\n}\n\nconst patchArrayFunction = (\n messages: OtelProcessedMessage[],\n functionName: 'forEach' \| 'map',\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages[functionName] as typeof messages.map;\n const patchedFunc = function (\n this: unknown,\n ...arrFuncArgs: Parameters<typeof origFunc>\n ) {\n const callback = arrFuncArgs[0];\n const wrappedCallback = function (\n this: unknown,\n ...callbackArgs: Parameters<typeof callback>\n ) {\n const message = callbackArgs[0];\n const messageSpan = message?.[START_SPAN_FUNCTION]?.();\n if (!messageSpan) return callback.apply(this, callbackArgs);\n\n const res = context.with(trace.setSpan(loopContext, messageSpan), () => {\n let result: Promise<unknown> \| unknown;\n try {\n result = callback.apply(this, callbackArgs);\n if (isPromise(result)) {\n const endSpan = () => message[END_SPAN_FUNCTION]?.();\n result.then(endSpan, endSpan);\n }\n return result;\n } finally {\n if (!isPromise(result)) {\n message[END_SPAN_FUNCTION]?.();\n }\n }\n });\n\n if (typeof res === 'object') {\n const startSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n START_SPAN_FUNCTION\n );\n startSpanFunction &&\n Object.defineProperty(res, START_SPAN_FUNCTION, startSpanFunction);\n\n const endSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n END_SPAN_FUNCTION\n );\n endSpanFunction &&\n Object.defineProperty(res, END_SPAN_FUNCTION, endSpanFunction);\n }\n return res;\n };\n arrFuncArgs[0] = wrappedCallback;\n const funcResult = origFunc.apply(this, arrFuncArgs);\n if (Array.isArray(funcResult))\n patchArrayForProcessSpans(funcResult, tracer, loopContext);\n return funcResult;\n };\n\n Object.defineProperty(messages, functionName, {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nconst patchArrayForProcessSpans = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context = context.active()\n) => {\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'forEach',\n tracer,\n loopContext\n );\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'map',\n tracer,\n loopContext\n );\n patchArrayFilter(messages, tracer, loopContext);\n};\n\nconst startMessagingProcessSpan = <T>(\n message: T,\n name: string,\n attributes: SpanAttributes,\n parentContext: Context,\n propagatedContext: Context,\n tracer: Tracer,\n processHook?: ProcessHook<T>\n): Span => {\n const links: Link[] = [];\n const spanContext = trace.getSpanContext(propagatedContext);\n if (spanContext) {\n links.push({\n context: spanContext,\n } as Link);\n }\n\n const spanName = `${name} process`;\n const processSpan = tracer.startSpan(\n spanName,\n {\n kind: SpanKind.CONSUMER,\n attributes: {\n ...attributes,\n ['messaging.operation']: 'process',\n },\n links,\n },\n parentContext\n );\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => processSpan,\n });\n\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {\n processSpan.end();\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {},\n });\n },\n });\n\n try {\n processHook?.(processSpan, message);\n } catch (err) {\n diag.error('opentelemetry-pubsub-propagation: process hook error', err);\n }\n\n return processSpan;\n};\n\ninterface SpanDetails {\n attributes: SpanAttributes;\n parentContext: Context;\n name: string;\n}\n\ntype ProcessHook<T> = (processSpan: Span, message: T) => void;\n\ninterface PatchForProcessingPayload<T> {\n messages: T[];\n tracer: Tracer;\n parentContext: Context;\n messageToSpanDetails: (message: T) => SpanDetails;\n processHook?: ProcessHook<T>;\n}\n\nconst patchMessagesArrayToStartProcessSpans = <T>({\n messages,\n tracer,\n parentContext,\n messageToSpanDetails,\n processHook,\n}: PatchForProcessingPayload<T>) => {\n messages.forEach(message => {\n const {\n attributes,\n name,\n parentContext: propagatedContext,\n } = messageToSpanDetails(message);\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () =>\n startMessagingProcessSpan<T>(\n message,\n name,\n attributes,\n parentContext,\n propagatedContext,\n tracer,\n processHook\n ),\n });\n });\n};\n\nexport default {\n patchMessagesArrayToStartProcessSpans,\n patchArrayForProcessSpans,\n};\n"]}
1	+ {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright The OpenTelemetry Authors\n \n Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n \n https://www.apache.org/licenses/LICENSE-2.0\n \n Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n Tracer,\n SpanKind,\n Span,\n Context,\n Link,\n context,\n trace,\n diag,\n SpanAttributes,\n} from '@opentelemetry/api';\n\nconst START_SPAN_FUNCTION = Symbol(\n 'opentelemetry.pubsub-propagation.start_span'\n);\nconst END_SPAN_FUNCTION = Symbol('opentelemetry.pubsub-propagation.end_span');\n\ninterface OtelProcessedMessage {\n [START_SPAN_FUNCTION]?: () => Span;\n [END_SPAN_FUNCTION]?: () => void;\n}\n\nconst patchArrayFilter = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages.filter;\n const patchedFunc = function (\n this: unknown,\n ...args: Parameters<typeof origFunc>\n ) {\n const newArray = origFunc.apply(this, args);\n patchArrayForProcessSpans(newArray, tracer, loopContext);\n return newArray;\n };\n\n Object.defineProperty(messages, 'filter', {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nfunction isPromise(value: unknown): value is Promise<unknown> {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n return typeof (value as any)?.then === 'function';\n}\n\nconst patchArrayFunction = (\n messages: OtelProcessedMessage[],\n functionName: 'forEach' \| 'map',\n tracer: Tracer,\n loopContext: Context\n) => {\n const origFunc = messages[functionName] as typeof messages.map;\n const patchedFunc = function (\n this: unknown,\n ...arrFuncArgs: Parameters<typeof origFunc>\n ) {\n const callback = arrFuncArgs[0];\n const wrappedCallback = function (\n this: unknown,\n ...callbackArgs: Parameters<typeof callback>\n ) {\n const message = callbackArgs[0];\n const messageSpan = message?.[START_SPAN_FUNCTION]?.();\n if (!messageSpan) return callback.apply(this, callbackArgs);\n\n const res = context.with(trace.setSpan(loopContext, messageSpan), () => {\n let result: Promise<unknown> \| unknown;\n try {\n result = callback.apply(this, callbackArgs);\n if (isPromise(result)) {\n const endSpan = () => message[END_SPAN_FUNCTION]?.();\n result.then(endSpan, endSpan);\n }\n return result;\n } finally {\n if (!isPromise(result)) {\n message[END_SPAN_FUNCTION]?.();\n }\n }\n });\n\n if (typeof res === 'object') {\n const startSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n START_SPAN_FUNCTION\n );\n if (startSpanFunction) {\n Object.defineProperty(res, START_SPAN_FUNCTION, startSpanFunction);\n }\n\n const endSpanFunction = Object.getOwnPropertyDescriptor(\n message,\n END_SPAN_FUNCTION\n );\n if (endSpanFunction) {\n Object.defineProperty(res, END_SPAN_FUNCTION, endSpanFunction);\n }\n }\n return res;\n };\n arrFuncArgs[0] = wrappedCallback;\n const funcResult = origFunc.apply(this, arrFuncArgs);\n if (Array.isArray(funcResult))\n patchArrayForProcessSpans(funcResult, tracer, loopContext);\n return funcResult;\n };\n\n Object.defineProperty(messages, functionName, {\n enumerable: false,\n value: patchedFunc,\n });\n};\n\nconst patchArrayForProcessSpans = (\n messages: unknown[],\n tracer: Tracer,\n loopContext: Context = context.active()\n) => {\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'forEach',\n tracer,\n loopContext\n );\n patchArrayFunction(\n messages as OtelProcessedMessage[],\n 'map',\n tracer,\n loopContext\n );\n patchArrayFilter(messages, tracer, loopContext);\n};\n\nconst startMessagingProcessSpan = <T>(\n message: T,\n name: string,\n attributes: SpanAttributes,\n parentContext: Context,\n propagatedContext: Context,\n tracer: Tracer,\n processHook?: ProcessHook<T>\n): Span => {\n const links: Link[] = [];\n const spanContext = trace.getSpanContext(propagatedContext);\n if (spanContext) {\n links.push({\n context: spanContext,\n } as Link);\n }\n\n const spanName = `${name} process`;\n const processSpan = tracer.startSpan(\n spanName,\n {\n kind: SpanKind.CONSUMER,\n attributes: {\n ...attributes,\n ['messaging.operation']: 'process',\n },\n links,\n },\n parentContext\n );\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => processSpan,\n });\n\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {\n processSpan.end();\n Object.defineProperty(message, END_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () => {},\n });\n },\n });\n\n try {\n processHook?.(processSpan, message);\n } catch (err) {\n diag.error('opentelemetry-pubsub-propagation: process hook error', err);\n }\n\n return processSpan;\n};\n\ninterface SpanDetails {\n attributes: SpanAttributes;\n parentContext: Context;\n name: string;\n}\n\ntype ProcessHook<T> = (processSpan: Span, message: T) => void;\n\ninterface PatchForProcessingPayload<T> {\n messages: T[];\n tracer: Tracer;\n parentContext: Context;\n messageToSpanDetails: (message: T) => SpanDetails;\n processHook?: ProcessHook<T>;\n}\n\nconst patchMessagesArrayToStartProcessSpans = <T>({\n messages,\n tracer,\n parentContext,\n messageToSpanDetails,\n processHook,\n}: PatchForProcessingPayload<T>) => {\n messages.forEach(message => {\n const {\n attributes,\n name,\n parentContext: propagatedContext,\n } = messageToSpanDetails(message);\n\n Object.defineProperty(message, START_SPAN_FUNCTION, {\n enumerable: false,\n writable: true,\n value: () =>\n startMessagingProcessSpan<T>(\n message,\n name,\n attributes,\n parentContext,\n propagatedContext,\n tracer,\n processHook\n ),\n });\n });\n};\n\nexport default {\n patchMessagesArrayToStartProcessSpans,\n patchArrayForProcessSpans,\n};\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/propagation-utils",
-  "version": "0.31.9",
+  "version": "0.31.10",
   "description": "Propagation utilities for opentelemetry instrumentations",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -11,8 +11,6 @@
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json",
     "compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/propagation-utils",
-    "lint": "eslint . --ext=ts,js,mjs",
-    "lint:fix": "eslint . --ext=ts,js,mjs --fix",
     "prepublishOnly": "npm run compile",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "test": "nyc mocha 'test/**/*.test.ts'",
@@ -46,7 +44,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.53.0",
+    "@opentelemetry/contrib-test-utils": "^0.54.0",
     "@types/mocha": "^10.0.0",
     "@types/node": "18.18.14",
     "@types/sinon": "^17.0.0",
@@ -55,5 +53,5 @@
     "sinon": "15.2.0",
     "typescript": "5.0.4"
   },
-  "gitHead": "333e026413f082f90859bb778abf7519fbffa940"
+  "gitHead": "2801ab2f0f9243b154a624298dacb7228c4f70cd"
 }