Revert "Add tracing infrastructure for bindings"

This reverts commit f617216.

Author: mikea

src/cloudflare/internal/d1-api.ts

@@ -2,8 +2,6 @@
 // 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;
 }
@@ -85,10 +83,7 @@ class D1Database {
   }
 
   prepare(query: string): D1PreparedStatement {
-    return withSpan('prepare', (span) => {
-      span.setAttribute('query', query);
-      return new D1PreparedStatement(this.alwaysPrimarySession, query);
-    });
+    return new D1PreparedStatement(this.alwaysPrimarySession, query);
   }
 
   async batch<T = unknown>(
@@ -98,10 +93,7 @@ class D1Database {
   }
 
   async exec(query: string): Promise<D1ExecResult> {
-    return withSpan('exec', async (span) => {
-      span.setAttribute('query', query);
-      return this.alwaysPrimarySession.exec(query);
-    });
+    return this.alwaysPrimarySession.exec(query);
   }
 
   withSession(
@@ -163,10 +155,7 @@ class D1DatabaseSession {
   }
 
   prepare(sql: string): D1PreparedStatement {
-    return withSpan('prepare', (span) => {
-      span.setAttribute('sql', sql);
-      return new D1PreparedStatement(this, sql);
-    });
+    return new D1PreparedStatement(this, sql);
   }
 
   async batch<T = unknown>(

src/cloudflare/internal/images-api.ts

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

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

@@ -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(