autotel-cloudflare 2.15.0 → 2.16.0

package/README.md

@@ -44,8 +44,8 @@ head_sampling_rate = 1.0      # Let autotel handle sampling
 import { wrapModule, trace } from 'autotel-cloudflare'
 
 // Zero-boilerplate function tracing
-const processOrder = trace(async (orderId: string) => {
-  const order = await env.ORDERS_KV.get(orderId)  // Auto-instrumented!
+const processOrder = trace(async (orderId: string, kv: KVNamespace) => {
+  const order = await kv.get(orderId)  // Auto-instrumented!
   return order
 })
 
@@ -57,7 +57,7 @@ export default wrapModule(
   },
   {
     async fetch(req, env, ctx) {
-      return Response.json(await processOrder('123'))
+      return Response.json(await processOrder('123', env.ORDERS_KV))
     }
   }
 )

package/dist/bindings.d.ts

@@ -32,25 +32,6 @@ declare function instrumentD1<D extends D1Database>(d1: D, databaseName?: string
  * Instrument service binding (Fetcher)
  */
 declare function instrumentServiceBinding<F extends Fetcher>(fetcher: F, serviceName?: string): F;
-/**
- * Auto-instrument all Cloudflare bindings in the environment
- *
- * Detection order (most specific first):
- * 1. R2 — get, put, delete, list, head
- * 2. KV — get, put, delete, list (not head)
- * 3. D1 — prepare, exec
- * 4. Vectorize — query, insert, upsert, describe
- * 5. AI — run + (gateway or models discriminator)
- * 6. Hyperdrive — connect + connectionString + host
- * 7. Queue Producer — send, sendBatch (not get)
- * 8. Analytics Engine — writeDataPoint
- * 9. Images — info, input
- * 10. Service Binding — fetch (broadest, must be last)
- *
- * Not auto-detected (manual only):
- * - Rate Limiter — limit() alone too generic
- * - Browser Rendering — indistinguishable from Service Binding
- */
 declare function instrumentBindings(env: Record<string, any>): Record<string, any>;
 
 /**

package/dist/bindings.js

@@ -1,4 +1,4 @@
-export { instrumentAI, instrumentAnalyticsEngine, instrumentBindings, instrumentBrowserRendering, instrumentD1, instrumentHyperdrive, instrumentImages, instrumentKV, instrumentQueueProducer, instrumentR2, instrumentRateLimiter, instrumentServiceBinding, instrumentVectorize } from './chunk-4UG2QCPQ.js';
+export { instrumentAI, instrumentAnalyticsEngine, instrumentBindings, instrumentBrowserRendering, instrumentD1, instrumentHyperdrive, instrumentImages, instrumentKV, instrumentQueueProducer, instrumentR2, instrumentRateLimiter, instrumentServiceBinding, instrumentVectorize } from './chunk-NUNTBJWB.js';
 import './chunk-O4IYKWPJ.js';
 //# sourceMappingURL=bindings.js.map
 //# sourceMappingURL=bindings.js.map

package/dist/{chunk-4UG2QCPQ.js → chunk-NUNTBJWB.js}

@@ -1,5 +1,6 @@
 import { wrap, isWrapped, setAttr } from './chunk-O4IYKWPJ.js';
 import { trace, SpanKind, SpanStatusCode } from '@opentelemetry/api';
+import { getActiveConfig } from 'autotel-edge';
 
 function instrumentAI(ai, bindingName) {
   const name = bindingName || "ai";
@@ -8,7 +9,7 @@ function instrumentAI(ai, bindingName) {
       const value = Reflect.get(target, prop);
       if (prop === "run" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [model] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -23,7 +24,7 @@ function instrumentAI(ai, bindingName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   if (result?.usage?.prompt_tokens !== void 0) {
                     setAttr(span, "gen_ai.usage.input_tokens", Number(result.usage.prompt_tokens));
                   }
@@ -60,7 +61,7 @@ function instrumentVectorize(vectorize, indexName) {
       const value = Reflect.get(target, prop);
       if (typeof prop === "string" && TRACED_METHODS.includes(prop) && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const operation = prop;
             const tracer = trace.getTracer("autotel-edge");
             const attributes = {
@@ -85,7 +86,7 @@ function instrumentVectorize(vectorize, indexName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   if (operation === "query" && result?.matches) {
                     setAttr(span, "db.vectorize.matches_count", result.matches.length);
                   }
@@ -118,7 +119,7 @@ function instrumentHyperdrive(hyperdrive, bindingName) {
       const value = Reflect.get(target, prop);
       if (prop === "connect" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const tracer = trace.getTracer("autotel-edge");
             const attributes = {
               "db.system": "cloudflare-hyperdrive",
@@ -144,7 +145,7 @@ function instrumentHyperdrive(hyperdrive, bindingName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
                 } catch (error) {
@@ -174,7 +175,7 @@ function instrumentQueueProducer(queue, queueName) {
       const value = Reflect.get(target, prop);
       if (prop === "send" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
               `Queue ${name}: send`,
@@ -189,7 +190,7 @@ function instrumentQueueProducer(queue, queueName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   setAttr(span, "messaging.message.id", result?.messageId);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
@@ -210,7 +211,7 @@ function instrumentQueueProducer(queue, queueName) {
       }
       if (prop === "sendBatch" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [messages] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -227,7 +228,7 @@ function instrumentQueueProducer(queue, queueName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
                 } catch (error) {
@@ -257,7 +258,7 @@ function instrumentAnalyticsEngine(ae, datasetName) {
       const value = Reflect.get(target, prop);
       if (prop === "writeDataPoint" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [dataPoint] = args;
             const tracer = trace.getTracer("autotel-edge");
             const attributes = {
@@ -283,7 +284,7 @@ function instrumentAnalyticsEngine(ae, datasetName) {
               },
               (span) => {
                 try {
-                  Reflect.apply(fnTarget, thisArg, args);
+                  Reflect.apply(fnTarget, target, args);
                   span.setStatus({ code: SpanStatusCode.OK });
                 } catch (error) {
                   span.recordException(error);
@@ -382,7 +383,7 @@ function instrumentImages(images, bindingName) {
       const value = Reflect.get(target, prop);
       if (prop === "info" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
               `Images ${name}: info`,
@@ -395,7 +396,7 @@ function instrumentImages(images, bindingName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   setAttr(span, "images.width", result?.width);
                   setAttr(span, "images.height", result?.height);
                   setAttr(span, "images.format", result?.format);
@@ -418,8 +419,8 @@ function instrumentImages(images, bindingName) {
       }
       if (prop === "input" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
-            const transformer = Reflect.apply(fnTarget, thisArg, args);
+          apply: (fnTarget, _thisArg, args) => {
+            const transformer = Reflect.apply(fnTarget, target, args);
             const meta = { operationCount: 0 };
             return proxyTransformer(transformer, meta, name);
           }
@@ -432,6 +433,11 @@ function instrumentImages(images, bindingName) {
 }
 
 // src/bindings/bindings.ts
+function sanitizeStatement(query, mode) {
+  if (mode === "off") return void 0;
+  if (mode === "obfuscated") return query.replaceAll(/'[^']*'/g, "'?'").replaceAll(/\b\d+\b/g, "?");
+  return query;
+}
 function instrumentKV(kv, namespaceName) {
   const name = namespaceName || "kv";
   const kvHandler = {
@@ -439,7 +445,7 @@ function instrumentKV(kv, namespaceName) {
       const value = Reflect.get(target, prop);
       if (prop === "get" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [key, options] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -456,7 +462,7 @@ function instrumentKV(kv, namespaceName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setAttribute("db.result.type", result === null ? "null" : typeof result);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
@@ -477,7 +483,7 @@ function instrumentKV(kv, namespaceName) {
       }
       if (prop === "put" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [key] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -493,7 +499,7 @@ function instrumentKV(kv, namespaceName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
                 } catch (error) {
@@ -513,7 +519,7 @@ function instrumentKV(kv, namespaceName) {
       }
       if (prop === "delete" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [key] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -529,7 +535,7 @@ function instrumentKV(kv, namespaceName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
                 } catch (error) {
@@ -549,7 +555,7 @@ function instrumentKV(kv, namespaceName) {
       }
       if (prop === "list" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [options] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -566,7 +572,7 @@ function instrumentKV(kv, namespaceName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setAttribute("db.result.keys_count", result.keys.length);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
@@ -597,7 +603,7 @@ function instrumentR2(r2, bucketName) {
       const value = Reflect.get(target, prop);
       if (prop === "get" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [key] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -613,7 +619,7 @@ function instrumentR2(r2, bucketName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   if (result) {
                     span.setAttribute("db.result.size", result.size);
                     span.setAttribute("db.result.etag", result.etag);
@@ -640,7 +646,7 @@ function instrumentR2(r2, bucketName) {
       }
       if (prop === "put" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [key] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -656,7 +662,7 @@ function instrumentR2(r2, bucketName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setAttribute("db.result.etag", result.etag);
                   span.setAttribute("db.result.uploaded", result.uploaded);
                   span.setStatus({ code: SpanStatusCode.OK });
@@ -678,7 +684,7 @@ function instrumentR2(r2, bucketName) {
       }
       if (prop === "delete" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const keys = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -694,7 +700,7 @@ function instrumentR2(r2, bucketName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
                 } catch (error) {
@@ -714,7 +720,7 @@ function instrumentR2(r2, bucketName) {
       }
       if (prop === "list" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [options] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -731,7 +737,7 @@ function instrumentR2(r2, bucketName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setAttribute("db.result.objects_count", result.objects.length);
                   span.setAttribute("db.result.truncated", result.truncated);
                   span.setStatus({ code: SpanStatusCode.OK });
@@ -763,30 +769,36 @@ function instrumentD1(d1, databaseName) {
       const value = Reflect.get(target, prop);
       if (prop === "prepare" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [query] = args;
             const tracer = trace.getTracer("autotel-edge");
-            const prepared = Reflect.apply(fnTarget, thisArg, args);
+            const prepared = Reflect.apply(fnTarget, target, args);
             const preparedHandler = {
               get(target2, prop2) {
                 const value2 = Reflect.get(target2, prop2);
                 if (prop2 === "first" || prop2 === "run" || prop2 === "all" || prop2 === "raw") {
                   return new Proxy(value2, {
-                    apply: (fnTarget2, thisArg2, args2) => {
+                    apply: (fnTarget2, _thisArg2, args2) => {
+                      const activeConfig = getActiveConfig();
+                      const captureMode = activeConfig?.dataSafety?.captureDbStatement ?? "full";
+                      const statement = sanitizeStatement(query, captureMode);
+                      const attributes = {
+                        "db.system": "cloudflare-d1",
+                        "db.operation": prop2,
+                        "db.name": name
+                      };
+                      if (statement !== void 0) {
+                        attributes["db.statement"] = statement;
+                      }
                       return tracer.startActiveSpan(
                         `D1 ${name}: ${prop2}`,
                         {
                           kind: SpanKind.CLIENT,
-                          attributes: {
-                            "db.system": "cloudflare-d1",
-                            "db.operation": prop2,
-                            "db.name": name,
-                            "db.statement": query
-                          }
+                          attributes
                         },
                         async (span) => {
                           try {
-                            const result = await Reflect.apply(fnTarget2, thisArg2, args2);
+                            const result = await Reflect.apply(fnTarget2, target2, args2);
                             if (prop2 === "all" && Array.isArray(result)) {
                               span.setAttribute("db.result.rows_count", result.length);
                             } else if (prop2 === "first" && result) {
@@ -818,23 +830,29 @@ function instrumentD1(d1, databaseName) {
       }
       if (prop === "exec" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [query] = args;
             const tracer = trace.getTracer("autotel-edge");
+            const activeConfig = getActiveConfig();
+            const captureMode = activeConfig?.dataSafety?.captureDbStatement ?? "full";
+            const statement = sanitizeStatement(query, captureMode);
+            const attributes = {
+              "db.system": "cloudflare-d1",
+              "db.operation": "exec",
+              "db.name": name
+            };
+            if (statement !== void 0) {
+              attributes["db.statement"] = statement;
+            }
             return tracer.startActiveSpan(
               `D1 ${name}: exec`,
               {
                 kind: SpanKind.CLIENT,
-                attributes: {
-                  "db.system": "cloudflare-d1",
-                  "db.operation": "exec",
-                  "db.name": name,
-                  "db.statement": query
-                }
+                attributes
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   span.setAttribute("db.result.count", result.count);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
@@ -865,7 +883,7 @@ function instrumentServiceBinding(fetcher, serviceName) {
       const value = Reflect.get(target, prop);
       if (prop === "fetch" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [input, init] = args;
             const request = new Request(input, init);
             const tracer = trace.getTracer("autotel-edge");
@@ -882,7 +900,7 @@ function instrumentServiceBinding(fetcher, serviceName) {
               },
               async (span) => {
                 try {
-                  const response = await Reflect.apply(fnTarget, thisArg, args);
+                  const response = await Reflect.apply(fnTarget, target, args);
                   span.setAttribute("http.response.status_code", response.status);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return response;
@@ -908,7 +926,10 @@ function instrumentServiceBinding(fetcher, serviceName) {
 }
 var hasMethod = (obj, m) => typeof obj?.[m] === "function";
 var hasExactMethods = (obj, methods) => methods.every((m) => hasMethod(obj, m));
+var envCache = /* @__PURE__ */ new WeakMap();
 function instrumentBindings(env) {
+  const cached = envCache.get(env);
+  if (cached) return cached;
   const instrumented = {};
   for (const [key, value] of Object.entries(env)) {
     if (!value || typeof value !== "object") {
@@ -961,6 +982,7 @@ function instrumentBindings(env) {
     }
     instrumented[key] = value;
   }
+  envCache.set(env, instrumented);
   return instrumented;
 }
 function instrumentRateLimiter(limiter, bindingName) {
@@ -970,7 +992,7 @@ function instrumentRateLimiter(limiter, bindingName) {
       const value = Reflect.get(target, prop);
       if (prop === "limit" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [options] = args;
             const tracer = trace.getTracer("autotel-edge");
             return tracer.startActiveSpan(
@@ -984,7 +1006,7 @@ function instrumentRateLimiter(limiter, bindingName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   setAttr(span, "rate_limiter.success", result?.success);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
@@ -1015,7 +1037,7 @@ function instrumentBrowserRendering(browser, bindingName) {
       const value = Reflect.get(target, prop);
       if (prop === "fetch" && typeof value === "function") {
         return new Proxy(value, {
-          apply: (fnTarget, thisArg, args) => {
+          apply: (fnTarget, _thisArg, args) => {
             const [input] = args;
             const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
             const tracer = trace.getTracer("autotel-edge");
@@ -1030,7 +1052,7 @@ function instrumentBrowserRendering(browser, bindingName) {
               },
               async (span) => {
                 try {
-                  const result = await Reflect.apply(fnTarget, thisArg, args);
+                  const result = await Reflect.apply(fnTarget, target, args);
                   setAttr(span, "http.response.status_code", result?.status);
                   span.setStatus({ code: SpanStatusCode.OK });
                   return result;
@@ -1056,5 +1078,5 @@ function instrumentBrowserRendering(browser, bindingName) {
 }
 
 export { instrumentAI, instrumentAnalyticsEngine, instrumentBindings, instrumentBrowserRendering, instrumentD1, instrumentHyperdrive, instrumentImages, instrumentKV, instrumentQueueProducer, instrumentR2, instrumentRateLimiter, instrumentServiceBinding, instrumentVectorize };
-//# sourceMappingURL=chunk-4UG2QCPQ.js.map
-//# sourceMappingURL=chunk-4UG2QCPQ.js.map
+//# sourceMappingURL=chunk-NUNTBJWB.js.map
+//# sourceMappingURL=chunk-NUNTBJWB.js.map