@thesight/sdk 0.3.7 → 0.4.0

package/dist/index.cjs

@@ -20,7 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  IdlResolver: () => import_core4.IdlResolver,
+  IdlResolver: () => import_core5.IdlResolver,
   InstrumentedConnection: () => InstrumentedConnection,
   SightSpanExporter: () => SightSpanExporter,
   buildDsn: () => buildDsn,
@@ -30,15 +30,93 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_web3 = require("@solana/web3.js");
-var import_api3 = require("@opentelemetry/api");
-var import_core3 = require("@thesight/core");
+var import_api4 = require("@opentelemetry/api");
 var import_core4 = require("@thesight/core");
 
-// src/init.ts
+// src/enrichment.ts
 var import_api = require("@opentelemetry/api");
+var import_core = require("@thesight/core");
+var SOLANA_CU_BUDGET = 2e5;
+var DEFAULT_ENRICHMENT_TIMEOUT_MS = 3e4;
+var DEFAULT_ENRICHMENT_POLL_MS = 500;
+async function pollForTransaction(getTransaction, signature, commitment, deadline, basePollMs) {
+  let attempt = 0;
+  while (Date.now() < deadline) {
+    try {
+      const tx = await getTransaction(signature, {
+        commitment,
+        maxSupportedTransactionVersion: 0
+      });
+      if (tx) return tx;
+    } catch {
+    }
+    attempt++;
+    const waitMs = Math.min(basePollMs * Math.pow(1.5, attempt - 1), 2e3);
+    await sleep(waitMs);
+  }
+  return null;
+}
+function attachTxDetailsToSpan(span, txDetails) {
+  span.setAttribute("solana.tx.status", txDetails.meta?.err ? "failed" : "confirmed");
+  span.setAttribute("solana.tx.slot", txDetails.slot);
+  const fee = txDetails.meta?.fee;
+  if (fee !== void 0) span.setAttribute("solana.tx.fee_lamports", fee);
+  const cuUsed = txDetails.meta?.computeUnitsConsumed;
+  if (cuUsed !== void 0 && cuUsed !== null) {
+    span.setAttribute("solana.tx.cu_used", Number(cuUsed));
+    span.setAttribute("solana.tx.cu_budget", SOLANA_CU_BUDGET);
+    span.setAttribute(
+      "solana.tx.cu_utilization",
+      parseFloat((Number(cuUsed) / SOLANA_CU_BUDGET * 100).toFixed(1))
+    );
+  }
+}
+async function attachParsedLogsToSpan(span, logs, resolver) {
+  const { cpiTree } = (0, import_core.parseLogs)({ logs });
+  await (0, import_core.enrichTree)(cpiTree, resolver);
+  const attributions = (0, import_core.flatAttributions)(cpiTree);
+  for (const attr of attributions) {
+    span.addEvent("cpi.invoke", {
+      "cpi.program": attr.programName ?? attr.programId,
+      "cpi.instruction": attr.instructionName ?? "unknown",
+      "cpi.depth": attr.depth,
+      "cpi.cu_consumed": attr.cuConsumed,
+      "cpi.cu_self": attr.cuSelf,
+      "cpi.percentage": parseFloat(attr.percentage.toFixed(2))
+    });
+  }
+  const root = cpiTree.roots[0];
+  if (root) {
+    if (root.programName) span.setAttribute("solana.tx.program", root.programName);
+    if (root.instructionName) span.setAttribute("solana.tx.instruction", root.instructionName);
+  }
+  return cpiTree;
+}
+function finalizeSpan(span, txDetails, startTime) {
+  if (!txDetails) {
+    span.setAttribute("solana.tx.status", "timeout");
+    span.setAttribute("solana.tx.enrichment_ms", Date.now() - startTime);
+    return;
+  }
+  span.setAttribute("solana.tx.enrichment_ms", Date.now() - startTime);
+  if (txDetails.meta?.err) {
+    span.setStatus({ code: import_api.SpanStatusCode.ERROR });
+  } else {
+    span.setStatus({ code: import_api.SpanStatusCode.OK });
+  }
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+// src/index.ts
+var import_core5 = require("@thesight/core");
+
+// src/init.ts
+var import_api2 = require("@opentelemetry/api");
 
 // src/exporter.ts
-var import_core = require("@opentelemetry/core");
+var import_core2 = require("@opentelemetry/core");
 
 // src/dsn.ts
 function parseDsn(dsn) {
@@ -91,7 +169,7 @@ var SightSpanExporter = class {
   }
   async export(spans, resultCallback) {
     if (this.shuttingDown) {
-      resultCallback({ code: import_core.ExportResultCode.FAILED, error: new Error("Exporter is shut down") });
+      resultCallback({ code: import_core2.ExportResultCode.FAILED, error: new Error("Exporter is shut down") });
       return;
     }
     const chunks = [];
@@ -102,10 +180,10 @@ var SightSpanExporter = class {
       for (const chunk of chunks) {
         await this.sendChunk(chunk);
       }
-      resultCallback({ code: import_core.ExportResultCode.SUCCESS });
+      resultCallback({ code: import_core2.ExportResultCode.SUCCESS });
     } catch (err) {
       resultCallback({
-        code: import_core.ExportResultCode.FAILED,
+        code: import_core2.ExportResultCode.FAILED,
         error: err instanceof Error ? err : new Error(String(err))
       });
     }
@@ -139,8 +217,8 @@ var SightSpanExporter = class {
     const attr = span.attributes;
     const resource2 = span.resource.attributes;
     const serviceName = typeof resource2["service.name"] === "string" ? resource2["service.name"] : void 0;
-    const startTimeMs = (0, import_core.hrTimeToMilliseconds)(span.startTime);
-    const endTimeMs = (0, import_core.hrTimeToMilliseconds)(span.endTime);
+    const startTimeMs = (0, import_core2.hrTimeToMilliseconds)(span.startTime);
+    const endTimeMs = (0, import_core2.hrTimeToMilliseconds)(span.endTime);
     const durationMs = Math.max(0, endTimeMs - startTimeMs);
     const out = {
       traceId: span.spanContext().traceId,
@@ -214,8 +292,9 @@ function initSight(config) {
   });
   try {
     const _require = eval("require");
-    const { NodeTracerProvider } = _require("@opentelemetry/sdk-trace-node");
-    const { BatchSpanProcessor } = _require("@opentelemetry/sdk-trace-base");
+    const traceBase = _require("@opentelemetry/sdk-trace-base");
+    const TracerProvider = traceBase.TracerProvider ?? traceBase.BasicTracerProvider;
+    const BatchSpanProcessor = traceBase.BatchSpanProcessor;
     const otelResources = _require("@opentelemetry/resources");
     const processor = new BatchSpanProcessor(exporter, {
       scheduledDelayMillis: config.batchDelayMs ?? 5e3,
@@ -228,11 +307,11 @@ function initSight(config) {
     };
     const resource = typeof otelResources.resourceFromAttributes === "function" ? otelResources.resourceFromAttributes(resourceAttrs) : new otelResources.Resource(resourceAttrs);
     let provider;
-    if (typeof NodeTracerProvider.prototype.addSpanProcessor === "function") {
-      provider = new NodeTracerProvider({ resource });
+    if (typeof TracerProvider.prototype.addSpanProcessor === "function") {
+      provider = new TracerProvider({ resource });
       provider.addSpanProcessor(processor);
     } else {
-      provider = new NodeTracerProvider({ resource, spanProcessors: [processor] });
+      provider = new TracerProvider({ resource, spanProcessors: [processor] });
     }
     try {
       provider.register();
@@ -249,7 +328,7 @@ function initSight(config) {
     _lastTier1Error = tier1Err;
   }
   try {
-    const proxy = import_api.trace.getTracerProvider();
+    const proxy = import_api2.trace.getTracerProvider();
     const delegate = proxy?.getDelegate?.() ?? proxy;
     if (delegate && typeof delegate.addSpanProcessor === "function") {
       const processor2 = new SightInlineProcessor(
@@ -259,7 +338,7 @@ function initSight(config) {
       );
       delegate.addSpanProcessor(processor2);
       return {
-        tracer: import_api.trace.getTracer("@thesight/sdk"),
+        tracer: import_api2.trace.getTracer("@thesight/sdk"),
         mode: "piggyback",
         shutdown: async () => {
           await processor2.shutdown();
@@ -281,7 +360,7 @@ function initSight(config) {
     }
   }
   return {
-    tracer: import_api.trace.getTracer("@thesight/sdk"),
+    tracer: import_api2.trace.getTracer("@thesight/sdk"),
     mode: "api_only",
     shutdown: async () => {
     }
@@ -331,68 +410,40 @@ var SightInlineProcessor = class {
 };
 
 // src/track.ts
-var import_api2 = require("@opentelemetry/api");
-var import_core2 = require("@thesight/core");
+var import_api3 = require("@opentelemetry/api");
+var import_core3 = require("@thesight/core");
 async function trackSolanaTransaction(opts) {
   const tracerName = opts.serviceName ?? "@thesight/sdk";
-  const tracer = opts.tracer ?? import_api2.trace.getTracer(tracerName);
-  const span = tracer.startSpan("solana.trackTransaction", {}, import_api2.context.active());
+  const tracer = opts.tracer ?? import_api3.trace.getTracer(tracerName);
+  const span = tracer.startSpan("solana.trackTransaction", {}, import_api3.context.active());
   span.setAttribute("solana.tx.signature", opts.signature);
   const start = Date.now();
-  const deadline = start + (opts.timeoutMs ?? 3e4);
+  const deadline = start + (opts.timeoutMs ?? DEFAULT_ENRICHMENT_TIMEOUT_MS);
   const commitment = opts.commitment ?? "confirmed";
-  const basePoll = opts.pollIntervalMs ?? 500;
+  const basePoll = opts.pollIntervalMs ?? DEFAULT_ENRICHMENT_POLL_MS;
   const resolver = opts.idlResolver ?? buildResolverFromIdls(opts.idls);
   try {
-    const txDetails = await pollGetTransaction(opts.connection, opts.signature, commitment, deadline, basePoll);
+    const txDetails = await pollForTransaction(
+      (sig, pollOpts) => opts.connection.getTransaction(sig, pollOpts),
+      opts.signature,
+      commitment,
+      deadline,
+      basePoll
+    );
     if (!txDetails) {
-      span.setAttribute("solana.tx.status", "timeout");
-      span.setAttribute("solana.tx.enrichment_ms", Date.now() - start);
+      finalizeSpan(span, null, start);
       return;
     }
-    span.setAttribute("solana.tx.status", txDetails.meta?.err ? "failed" : "confirmed");
-    span.setAttribute("solana.tx.slot", txDetails.slot);
-    const fee = txDetails.meta?.fee;
-    if (fee !== void 0) span.setAttribute("solana.tx.fee_lamports", fee);
-    const cuUsed = txDetails.meta?.computeUnitsConsumed;
-    if (cuUsed !== void 0 && cuUsed !== null) {
-      span.setAttribute("solana.tx.cu_used", Number(cuUsed));
-      span.setAttribute("solana.tx.cu_budget", 2e5);
-      span.setAttribute(
-        "solana.tx.cu_utilization",
-        parseFloat((Number(cuUsed) / 2e5 * 100).toFixed(1))
-      );
-    }
+    attachTxDetailsToSpan(span, txDetails);
     const logs = txDetails.meta?.logMessages ?? [];
     if (logs.length > 0) {
-      const { cpiTree } = (0, import_core2.parseLogs)({ logs });
-      await (0, import_core2.enrichTree)(cpiTree, resolver);
-      for (const attr of (0, import_core2.flatAttributions)(cpiTree)) {
-        span.addEvent("cpi.invoke", {
-          "cpi.program": attr.programName ?? attr.programId,
-          "cpi.instruction": attr.instructionName ?? "unknown",
-          "cpi.depth": attr.depth,
-          "cpi.cu_consumed": attr.cuConsumed,
-          "cpi.cu_self": attr.cuSelf,
-          "cpi.percentage": parseFloat(attr.percentage.toFixed(2))
-        });
-      }
-      const root = cpiTree.roots[0];
-      if (root) {
-        if (root.programName) span.setAttribute("solana.tx.program", root.programName);
-        if (root.instructionName) span.setAttribute("solana.tx.instruction", root.instructionName);
-      }
-    }
-    span.setAttribute("solana.tx.enrichment_ms", Date.now() - start);
-    if (txDetails.meta?.err) {
-      span.setStatus({ code: import_api2.SpanStatusCode.ERROR });
-    } else {
-      span.setStatus({ code: import_api2.SpanStatusCode.OK });
+      await attachParsedLogsToSpan(span, logs, resolver);
     }
+    finalizeSpan(span, txDetails, start);
   } catch (err) {
     span.recordException(err instanceof Error ? err : new Error(String(err)));
     span.setStatus({
-      code: import_api2.SpanStatusCode.ERROR,
+      code: import_api3.SpanStatusCode.ERROR,
       message: err instanceof Error ? err.message : String(err)
     });
   } finally {
@@ -400,27 +451,10 @@ async function trackSolanaTransaction(opts) {
   }
 }
 function buildResolverFromIdls(idls) {
-  const resolver = new import_core2.IdlResolver();
+  const resolver = new import_core3.IdlResolver();
   if (idls) resolver.registerMany(idls);
   return resolver;
 }
-async function pollGetTransaction(connection, signature, commitment, deadline, basePollMs) {
-  let attempt = 0;
-  while (Date.now() < deadline) {
-    try {
-      const tx = await connection.getTransaction(signature, {
-        commitment,
-        maxSupportedTransactionVersion: 0
-      });
-      if (tx) return tx;
-    } catch {
-    }
-    attempt++;
-    const waitMs = Math.min(basePollMs * Math.pow(1.5, attempt - 1), 2e3);
-    await new Promise((resolve) => setTimeout(resolve, waitMs));
-  }
-  return null;
-}
 
 // src/index.ts
 var InstrumentedConnection = class extends import_web3.Connection {
@@ -437,7 +471,9 @@ var InstrumentedConnection = class extends import_web3.Connection {
       enrichmentTimeoutMs,
       enrichmentPollIntervalMs,
       disableAutoSpan,
-      commitment,
+      // Note: commitment is intentionally NOT destructured out. It must
+      // pass through to super() via connectionConfig so the parent
+      // Connection uses it for RPC calls (preflight, blockhash, etc.).
       ...connectionConfig
     } = config2 ?? {};
     super(endpoint, connectionConfig);
@@ -446,17 +482,17 @@ var InstrumentedConnection = class extends import_web3.Connection {
       idlRpcEndpoint,
       skipIdlResolution,
       allowOnChainIdlFetch,
-      enrichmentTimeoutMs: enrichmentTimeoutMs ?? 3e4,
-      enrichmentPollIntervalMs: enrichmentPollIntervalMs ?? 500,
+      enrichmentTimeoutMs: enrichmentTimeoutMs ?? DEFAULT_ENRICHMENT_TIMEOUT_MS,
+      enrichmentPollIntervalMs: enrichmentPollIntervalMs ?? DEFAULT_ENRICHMENT_POLL_MS,
       disableAutoSpan,
-      commitment
+      commitment: config2?.commitment
     };
-    this.idlResolver = new import_core3.IdlResolver({
+    this.idlResolver = new import_core4.IdlResolver({
       rpcEndpoint: idlRpcEndpoint ?? endpoint,
       allowOnChainFetch: allowOnChainIdlFetch ?? false
     });
     if (idls) this.idlResolver.registerMany(idls);
-    this.tracer = tracer ?? import_api3.trace.getTracer("@thesight/sdk");
+    this.tracer = tracer ?? import_api4.trace.getTracer("@thesight/sdk");
   }
   /**
    * Register an IDL for a single program. Convenience forwarder for the
@@ -488,7 +524,7 @@ var InstrumentedConnection = class extends import_web3.Connection {
     if (this.sightConfig.disableAutoSpan) {
       return super.sendRawTransaction(rawTransaction, options);
     }
-    const span = this.tracer.startSpan("solana.sendRawTransaction", {}, import_api3.context.active());
+    const span = this.tracer.startSpan("solana.sendRawTransaction", {}, import_api4.context.active());
     const submitStart = Date.now();
     let signature;
     try {
@@ -499,7 +535,7 @@ var InstrumentedConnection = class extends import_web3.Connection {
       span.setAttribute("solana.tx.status", "failed");
       span.recordException(err instanceof Error ? err : new Error(String(err)));
       span.setStatus({
-        code: import_api3.SpanStatusCode.ERROR,
+        code: import_api4.SpanStatusCode.ERROR,
         message: err instanceof Error ? err.message : String(err)
       });
       span.end();
@@ -523,30 +559,30 @@ var InstrumentedConnection = class extends import_web3.Connection {
    */
   async enrichSpanInBackground(span, signature, submitStart) {
     const enrichStart = Date.now();
-    const deadline = enrichStart + (this.sightConfig.enrichmentTimeoutMs ?? 3e4);
+    const deadline = enrichStart + (this.sightConfig.enrichmentTimeoutMs ?? DEFAULT_ENRICHMENT_TIMEOUT_MS);
     const commitment = this.sightConfig.commitment ?? "confirmed";
-    const basePollMs = this.sightConfig.enrichmentPollIntervalMs ?? 500;
+    const basePollMs = this.sightConfig.enrichmentPollIntervalMs ?? DEFAULT_ENRICHMENT_POLL_MS;
     try {
-      const txDetails = await this.pollForTransaction(signature, commitment, deadline, basePollMs);
+      const txDetails = await pollForTransaction(
+        (sig, opts) => super.getTransaction(sig, opts),
+        signature,
+        commitment,
+        deadline,
+        basePollMs
+      );
       if (!txDetails) {
-        span.setAttribute("solana.tx.status", "timeout");
-        span.setAttribute("solana.tx.enrichment_ms", Date.now() - submitStart);
+        finalizeSpan(span, null, submitStart);
         span.end();
         return;
       }
-      this.attachTxDetailsToSpan(span, txDetails);
+      attachTxDetailsToSpan(span, txDetails);
       if (!this.sightConfig.skipIdlResolution) {
         const logs = txDetails.meta?.logMessages ?? [];
         if (logs.length > 0) {
-          await this.attachParsedLogsToSpan(span, logs);
+          await attachParsedLogsToSpan(span, logs, this.idlResolver);
         }
       }
-      span.setAttribute("solana.tx.enrichment_ms", Date.now() - submitStart);
-      if (txDetails.meta?.err) {
-        span.setStatus({ code: import_api3.SpanStatusCode.ERROR });
-      } else {
-        span.setStatus({ code: import_api3.SpanStatusCode.OK });
-      }
+      finalizeSpan(span, txDetails, submitStart);
     } catch (err) {
       span.recordException(err instanceof Error ? err : new Error(String(err)));
       span.setAttribute(
@@ -557,75 +593,7 @@ var InstrumentedConnection = class extends import_web3.Connection {
       span.end();
     }
   }
-  /**
-   * Poll `getTransaction(signature)` until either the on-chain record is
-   * returned or the deadline passes. Exponential backoff (1.5x) capped at
-   * 2 seconds to balance responsiveness against RPC load.
-   */
-  async pollForTransaction(signature, commitment, deadline, basePollMs) {
-    let attempt = 0;
-    while (Date.now() < deadline) {
-      try {
-        const tx = await super.getTransaction(signature, {
-          commitment,
-          maxSupportedTransactionVersion: 0
-        });
-        if (tx) return tx;
-      } catch {
-      }
-      attempt++;
-      const waitMs = Math.min(basePollMs * Math.pow(1.5, attempt - 1), 2e3);
-      await sleep(waitMs);
-    }
-    return null;
-  }
-  /** Attach the flat fields (slot, fee, CU, status) from a tx response to a span. */
-  attachTxDetailsToSpan(span, txDetails) {
-    span.setAttribute("solana.tx.status", txDetails.meta?.err ? "failed" : "confirmed");
-    span.setAttribute("solana.tx.slot", txDetails.slot);
-    const fee = txDetails.meta?.fee;
-    if (fee !== void 0) span.setAttribute("solana.tx.fee_lamports", fee);
-    const cuUsed = txDetails.meta?.computeUnitsConsumed;
-    if (cuUsed !== void 0 && cuUsed !== null) {
-      span.setAttribute("solana.tx.cu_used", Number(cuUsed));
-      span.setAttribute("solana.tx.cu_budget", 2e5);
-      span.setAttribute(
-        "solana.tx.cu_utilization",
-        parseFloat((Number(cuUsed) / 2e5 * 100).toFixed(1))
-      );
-    }
-  }
-  /**
-   * Parse program logs into a CPI tree, enrich with registered IDLs, and
-   * emit one `cpi.invoke` event per invocation onto the span. Root
-   * program/instruction names are copied onto span attributes so dashboards
-   * can filter by them without walking events.
-   */
-  async attachParsedLogsToSpan(span, logs) {
-    const { cpiTree } = (0, import_core3.parseLogs)({ logs });
-    await (0, import_core3.enrichTree)(cpiTree, this.idlResolver);
-    const attributions = (0, import_core3.flatAttributions)(cpiTree);
-    for (const attr of attributions) {
-      span.addEvent("cpi.invoke", {
-        "cpi.program": attr.programName ?? attr.programId,
-        "cpi.instruction": attr.instructionName ?? "unknown",
-        "cpi.depth": attr.depth,
-        "cpi.cu_consumed": attr.cuConsumed,
-        "cpi.cu_self": attr.cuSelf,
-        "cpi.percentage": parseFloat(attr.percentage.toFixed(2))
-      });
-    }
-    const root = cpiTree.roots[0];
-    if (root) {
-      if (root.programName) span.setAttribute("solana.tx.program", root.programName);
-      if (root.instructionName) span.setAttribute("solana.tx.instruction", root.instructionName);
-    }
-    return cpiTree;
-  }
 };
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   IdlResolver,