@thesight/sdk 0.3.7 → 0.4.0

package/dist/index.js

@@ -5,11 +5,89 @@ import {
 import {
   trace as trace3,
   context as context2,
-  SpanStatusCode as SpanStatusCode2
+  SpanStatusCode as SpanStatusCode3
 } from "@opentelemetry/api";
-import { parseLogs as parseLogs2, IdlResolver as IdlResolver2, enrichTree as enrichTree2, flatAttributions as flatAttributions2 } from "@thesight/core";
 import { IdlResolver as IdlResolver3 } from "@thesight/core";
 
+// src/enrichment.ts
+import { SpanStatusCode } from "@opentelemetry/api";
+import { parseLogs, enrichTree, flatAttributions } from "@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 } = parseLogs({ logs });
+  await enrichTree(cpiTree, resolver);
+  const attributions = 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: SpanStatusCode.ERROR });
+  } else {
+    span.setStatus({ code: SpanStatusCode.OK });
+  }
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+// src/index.ts
+import { IdlResolver as IdlResolver4 } from "@thesight/core";
+
 // src/init.ts
 import { trace } from "@opentelemetry/api";
 
@@ -193,8 +271,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,
@@ -207,11 +286,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();
@@ -310,68 +389,40 @@ var SightInlineProcessor = class {
 };
 
 // src/track.ts
-import { trace as trace2, context, SpanStatusCode } from "@opentelemetry/api";
-import { parseLogs, IdlResolver, enrichTree, flatAttributions } from "@thesight/core";
+import { trace as trace2, context, SpanStatusCode as SpanStatusCode2 } from "@opentelemetry/api";
+import { IdlResolver as IdlResolver2 } from "@thesight/core";
 async function trackSolanaTransaction(opts) {
   const tracerName = opts.serviceName ?? "@thesight/sdk";
   const tracer = opts.tracer ?? trace2.getTracer(tracerName);
   const span = tracer.startSpan("solana.trackTransaction", {}, 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 } = parseLogs({ logs });
-      await enrichTree(cpiTree, resolver);
-      for (const attr of 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: SpanStatusCode.ERROR });
-    } else {
-      span.setStatus({ code: 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: SpanStatusCode.ERROR,
+      code: SpanStatusCode2.ERROR,
       message: err instanceof Error ? err.message : String(err)
     });
   } finally {
@@ -379,27 +430,10 @@ async function trackSolanaTransaction(opts) {
   }
 }
 function buildResolverFromIdls(idls) {
-  const resolver = new IdlResolver();
+  const resolver = new IdlResolver2();
   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 Connection {
@@ -416,7 +450,9 @@ var InstrumentedConnection = class extends 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);
@@ -425,12 +461,12 @@ var InstrumentedConnection = class extends 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 IdlResolver2({
+    this.idlResolver = new IdlResolver3({
       rpcEndpoint: idlRpcEndpoint ?? endpoint,
       allowOnChainFetch: allowOnChainIdlFetch ?? false
     });
@@ -478,7 +514,7 @@ var InstrumentedConnection = class extends Connection {
       span.setAttribute("solana.tx.status", "failed");
       span.recordException(err instanceof Error ? err : new Error(String(err)));
       span.setStatus({
-        code: SpanStatusCode2.ERROR,
+        code: SpanStatusCode3.ERROR,
         message: err instanceof Error ? err.message : String(err)
       });
       span.end();
@@ -502,30 +538,30 @@ var InstrumentedConnection = class extends 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: SpanStatusCode2.ERROR });
-      } else {
-        span.setStatus({ code: SpanStatusCode2.OK });
-      }
+      finalizeSpan(span, txDetails, submitStart);
     } catch (err) {
       span.recordException(err instanceof Error ? err : new Error(String(err)));
       span.setAttribute(
@@ -536,77 +572,9 @@ var InstrumentedConnection = class extends 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 } = parseLogs2({ logs });
-    await enrichTree2(cpiTree, this.idlResolver);
-    const attributions = flatAttributions2(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));
-}
 export {
-  IdlResolver3 as IdlResolver,
+  IdlResolver4 as IdlResolver,
   InstrumentedConnection,
   SightSpanExporter,
   buildDsn,