Merge pull request #5094 from cloudflare/maksym/WO-750/0

WO-750 Add tracing infrastructure for bindings

Author: mar-cf

src/cloudflare/internal/d1-api.ts

@@ -2,6 +2,8 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
+import { withSpan } from 'cloudflare-internal:tracing-helpers';
+
 interface Fetcher {
   fetch: typeof fetch;
 }
@@ -83,7 +85,10 @@ class D1Database {
   }
 
   prepare(query: string): D1PreparedStatement {
-    return new D1PreparedStatement(this.alwaysPrimarySession, query);
+    return withSpan('prepare', (span) => {
+      span.setAttribute('query', query);
+      return new D1PreparedStatement(this.alwaysPrimarySession, query);
+    });
   }
 
   async batch<T = unknown>(
@@ -93,7 +98,10 @@ class D1Database {
   }
 
   async exec(query: string): Promise<D1ExecResult> {
-    return this.alwaysPrimarySession.exec(query);
+    return withSpan('exec', async (span) => {
+      span.setAttribute('query', query);
+      return this.alwaysPrimarySession.exec(query);
+    });
   }
 
   withSession(
@@ -155,7 +163,10 @@ class D1DatabaseSession {
   }
 
   prepare(sql: string): D1PreparedStatement {
-    return new D1PreparedStatement(this, sql);
+    return withSpan('prepare', (span) => {
+      span.setAttribute('sql', sql);
+      return new D1PreparedStatement(this, sql);
+    });
   }
 
   async batch<T = unknown>(

src/cloudflare/internal/images-api.ts

@@ -6,6 +6,7 @@ import {
   createBase64DecoderTransformStream,
   createBase64EncoderTransformStream,
 } from 'cloudflare-internal:streaming-base64';
+import { withSpan } from 'cloudflare-internal:tracing-helpers';
 
 type Fetcher = {
   fetch: typeof fetch;
@@ -233,40 +234,49 @@ class ImagesBindingImpl implements ImagesBinding {
     stream: ReadableStream<Uint8Array>,
     options?: ImageInputOptions
   ): Promise<ImageInfoResponse> {
-    const body = new StreamableFormData();
-
-    const decodedStream =
-      options?.encoding === 'base64'
-        ? stream.pipeThrough(createBase64DecoderTransformStream())
-        : stream;
-
-    body.append('image', decodedStream, { type: 'file' });
+    return await withSpan('images_info', async (span) => {
+      const body = new StreamableFormData();
+
+      const decodedStream =
+        options?.encoding === 'base64'
+          ? stream.pipeThrough(createBase64DecoderTransformStream())
+          : stream;
+
+      span.setAttribute('cloudflare.images.info.encoding', options?.encoding);
+
+      body.append('image', decodedStream, { type: 'file' });
+
+      const response = await this.#fetcher.fetch(
+        'https://js.images.cloudflare.com/info',
+        {
+          method: 'POST',
+          headers: {
+            'content-type': body.contentType(),
+          },
+          body: body.stream(),
+        }
+      );
 
-    const response = await this.#fetcher.fetch(
-      'https://js.images.cloudflare.com/info',
-      {
-        method: 'POST',
-        headers: {
-          'content-type': body.contentType(),
-        },
-        body: body.stream(),
-      }
-    );
+      await throwErrorIfErrorResponse('INFO', response);
 
-    await throwErrorIfErrorResponse('INFO', response);
+      const r = (await response.json()) as RawInfoResponse;
 
-    const r = (await response.json()) as RawInfoResponse;
+      span.setAttribute('cloudflare.images.info.format', r.format);
 
-    if ('file_size' in r) {
-      return {
-        fileSize: r.file_size,
-        width: r.width,
-        height: r.height,
-        format: r.format,
-      };
-    }
+      if ('file_size' in r) {
+        span.setAttribute('cloudflare.images.info.file_size', r.file_size);
+        span.setAttribute('cloudflare.images.info.width', r.width);
+        span.setAttribute('cloudflare.images.info.height', r.height);
+        return {
+          fileSize: r.file_size,
+          width: r.width,
+          height: r.height,
+          format: r.format,
+        };
+      }
 
-    return r;
+      return r;
+    });
   }
 
   input(

src/cloudflare/internal/test-tracing-wrapper.ts

@@ -0,0 +1,22 @@
+// Copyright (c) 2025 Cloudflare, Inc.
+// Licensed under the Apache 2.0 license found in the LICENSE file or at:
+//     https://opensource.org/licenses/Apache-2.0
+
+// TEST-ONLY MODULE - DO NOT USE IN PRODUCTION
+// This wrapper exists solely to expose internal tracing utilities for testing.
+// It must be in the internal/ directory to be compiled as part of the cloudflare bundle,
+// but it should never be used outside of test configurations.
+
+import { withSpan } from 'cloudflare-internal:tracing-helpers';
+
+interface TestWrapper {
+  withSpan: typeof withSpan;
+}
+
+// Wrapper function that provides test utilities for tracing
+export default function (_env: unknown): TestWrapper {
+  return {
+    // Export withSpan for testing
+    withSpan,
+  };
+}

src/cloudflare/internal/test/BUILD.bazel

@@ -0,0 +1,9 @@
+exports_files(
+    ["instrumentation-test-helper.js"],
+    visibility = [
+        "//src/cloudflare/internal/test/d1:__pkg__",
+        "//src/cloudflare/internal/test/images:__pkg__",
+        "//src/cloudflare/internal/test/tracing:__pkg__",
+        "//src/workerd/api:__pkg__",
+    ],
+)

src/cloudflare/internal/test/d1/BUILD.bazel

@@ -7,7 +7,7 @@ wd_test(
     data = glob(
         ["*.js"],
         exclude = ["d1-api-test-with-sessions.js"],
-    ),
+    ) + ["//src/cloudflare/internal/test:instrumentation-test-helper.js"],
 )
 
 wd_test(