@sentio/sdk 2.50.1 → 2.50.2-rc.2

package/src/eth/base-processor.ts

@@ -1,4 +1,3 @@
-import { AsyncLocalStorage } from 'node:async_hooks'
 import { BaseContract, DeferredTopicFilter, LogDescription, TransactionResponseParams } from 'ethers'
 
 import { BoundContractView, ContractContext, ContractView, GlobalContext } from './context.js'
@@ -19,9 +18,9 @@ import { PromiseOrVoid } from '../core/promises.js'
 import { ServerError, Status } from 'nice-grpc'
 import { fixEmptyKey, formatEthData, RichBlock, Trace, TypedCallTrace, TypedEvent } from './eth.js'
 import sha3 from 'js-sha3'
-import { ListStateStorage, metricsStorage } from '@sentio/runtime'
+import { ListStateStorage } from '@sentio/runtime'
 import { EthChainId } from '@sentio/chain'
-import { handlersProxy } from '../utils/metrics.js'
+import { getHandlerName, proxyProcessor } from '../utils/metrics.js'
 import { ALL_ADDRESS } from '../core/index.js'
 
 export interface AddressOrTypeEventFilter extends DeferredTopicFilter {
@@ -33,6 +32,7 @@ export const defaultPreprocessHandler = () => (<PreprocessResult>{ ethCallParams
 
 export class EventsHandler {
   filters: AddressOrTypeEventFilter[]
+  handlerName: string
   handler: (event: Data_EthLog) => Promise<ProcessResult>
   preprocessHandler?: (event: Data_EthLog, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
@@ -40,6 +40,7 @@ export class EventsHandler {
 
 export class TraceHandler {
   signatures: string[]
+  handlerName: string
   handler: (trace: Data_EthTrace) => Promise<ProcessResult>
   preprocessHandler?: (event: Data_EthTrace, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
@@ -314,6 +315,7 @@ export class GlobalProcessor {
     this.traceHandlers.push({
       signatures,
       fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
+      handlerName: getHandlerName(),
       handler: async function (data: Data_EthTrace) {
         const { trace, block, transaction, transactionReceipt } = formatEthData(data)
 
@@ -383,22 +385,7 @@ export abstract class BaseProcessor<
       this.config.endBlock = BigInt(config.endBlock)
     }
 
-    const chain_id = this.getChainId()
-    this.blockHandlers = new Proxy(this.blockHandlers, handlersProxy({ chain_id, category: 'interval' }))
-    this.eventHandlers = new Proxy(this.eventHandlers, handlersProxy({ chain_id, category: 'event' }))
-    this.traceHandlers = new Proxy(this.traceHandlers, handlersProxy({ chain_id, category: 'call' }))
-
-    return new Proxy(this, {
-      get: (target, prop, receiver) => {
-        return metricsStorage.run(metricsStorage.getStore() || prop.toString(), () => {
-          const fn = (target as any)[prop]
-          if (typeof fn == 'function') {
-            return AsyncLocalStorage.bind((...args: any) => fn.apply(receiver, args))
-          }
-          return Reflect.get(target, prop, receiver)
-        })
-      }
-    })
+    return proxyProcessor(this)
   }
 
   protected abstract CreateBoundContractView(): TBoundContractView
@@ -452,6 +439,7 @@ export abstract class BaseProcessor<
     this.eventHandlers.push({
       filters: _filters,
       fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
+      handlerName: getHandlerName(),
       handler: async function (data: Data_EthLog, preparedData?: PreparedData) {
         const { log, block, transaction, transactionReceipt } = formatEthData(data)
         if (!log) {
@@ -693,6 +681,7 @@ export abstract class BaseProcessor<
     this.traceHandlers.push({
       signatures,
       fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
+      handlerName: getHandlerName(),
       handler: async function (data: Data_EthTrace, preparedData?: PreparedData) {
         const contractView = processor.CreateBoundContractView()
         const contractInterface = contractView.rawContract.interface

package/src/eth/eth-plugin.ts

@@ -115,6 +115,7 @@ export class EthPlugin extends Plugin {
           contractConfig.traceConfigs.push({
             signature: signature,
             handlerId: handlerId,
+            handlerName: traceHandler.handlerName,
             fetchConfig: traceHandler.fetchConfig
           })
         }
@@ -127,6 +128,7 @@ export class EthPlugin extends Plugin {
         const handlerId = handlers.eventHandlers.push(eventsHandler.handler) - 1
         const logConfig: LogHandlerConfig = {
           handlerId: handlerId,
+          handlerName: eventsHandler.handlerName,
           filters: [],
           fetchConfig: eventsHandler.fetchConfig
         }
@@ -205,6 +207,7 @@ export class EthPlugin extends Plugin {
           contractConfig.traceConfigs.push({
             signature: signature,
             handlerId: handlerId,
+            handlerName: traceHandler.handlerName,
             fetchConfig: traceHandler.fetchConfig
           })
         }
@@ -226,6 +229,7 @@ export class EthPlugin extends Plugin {
         const handlerId = handlers.eventHandlers.push(eventsHandler.handler) - 1
         const logConfig: LogHandlerConfig = {
           handlerId: handlerId,
+          handlerName: eventsHandler.handlerName,
           filters: [],
           fetchConfig: eventsHandler.fetchConfig
         }

package/src/tsup.config.ts

@@ -22,6 +22,7 @@ export default defineConfig({
   sourcemap: 'inline',
   clean: true,
   format: 'esm',
+  keepNames: true,
   // dts: {
   //   resolve: true,
   // },

package/src/utils/metrics.ts

@@ -1,23 +1,20 @@
-import { processMetrics, metricsStorage } from '@sentio/runtime'
-import { Attributes } from '@opentelemetry/api'
+import { AsyncLocalStorage } from 'node:async_hooks'
+import { metricsStorage } from '@sentio/runtime'
 
-export function handlersProxy<T extends object>(attributes: Attributes): ProxyHandler<T> {
-  return {
-    set: (target, prop, value, receiver) => {
-      if (value.handler) {
-        const handlerName = metricsStorage.getStore()
-        const handler = value.handler
-        value.handler = async (...args: any) => {
-          const startTs = Date.now()
-          const res = await handler(...args)
-          processMetrics.processor_handler_duration.record(Date.now() - startTs, {
-            ...attributes,
-            handler: handlerName
-          })
-          return res
+export function getHandlerName() {
+  return metricsStorage.getStore() || 'unknown'
+}
+
+export function proxyProcessor(cls: any) {
+  return new Proxy(cls, {
+    get: (target, prop, receiver) => {
+      return metricsStorage.run(metricsStorage.getStore() || `${cls.constructor.name}.${prop.toString()}`, () => {
+        const fn = (target as any)[prop]
+        if (typeof fn == 'function') {
+          return AsyncLocalStorage.bind((...args: any) => fn.apply(receiver, args))
         }
-      }
-      return Reflect.set(target, prop, value, receiver)
+        return Reflect.get(target, prop, receiver)
+      })
     }
-  }
+  })
 }