Merge pull request #5376 from cloudflare/maizatskyi/2025-10-22-revert

Author: jasnell

src/cloudflare/internal/d1-api.ts

@@ -6,7 +6,6 @@ import {
   createBase64DecoderTransformStream,
   createBase64EncoderTransformStream,
 } from 'cloudflare-internal:streaming-base64';
-import { withSpan, type Span } from 'cloudflare-internal:tracing-helpers';
 
 type Fetcher = {
   fetch: typeof fetch;
@@ -122,51 +121,40 @@ class ImageTransformerImpl implements ImageTransformer {
   async output(
     options: ImageOutputOptions
   ): Promise<ImageTransformationResult> {
-    return await withSpan('images_output', async (span) => {
-      span.setAttribute('cloudflare.binding.type', 'Images');
-      const formData = new StreamableFormData();
+    const formData = new StreamableFormData();
 
-      this.#consume();
-      formData.append('image', this.#stream, { type: 'file' });
+    this.#consume();
+    formData.append('image', this.#stream, { type: 'file' });
 
-      this.#serializeTransforms(formData, span);
+    this.#serializeTransforms(formData);
 
-      span.setAttribute('cloudflare.images.options.format', options.format);
-      formData.append('output_format', options.format);
+    formData.append('output_format', options.format);
+    if (options.quality !== undefined) {
+      formData.append('output_quality', options.quality.toString());
+    }
 
-      if (options.quality !== undefined) {
-        span.setAttribute('cloudflare.images.options.quality', options.quality);
-        formData.append('output_quality', options.quality.toString());
-      }
+    if (options.background !== undefined) {
+      formData.append('background', options.background);
+    }
 
-      if (options.background !== undefined) {
-        span.setAttribute(
-          'cloudflare.images.options.background',
-          options.background
-        );
-        formData.append('background', options.background);
-      }
+    if (options.anim !== undefined) {
+      formData.append('anim', options.anim.toString());
+    }
 
-      if (options.anim !== undefined) {
-        span.setAttribute('cloudflare.images.options.anim', options.anim);
-        formData.append('anim', options.anim.toString());
+    const response = await this.#fetcher.fetch(
+      'https://js.images.cloudflare.com/transform',
+      {
+        method: 'POST',
+        headers: {
+          'content-type': formData.contentType(),
+        },
+        body: formData.stream(),
       }
+    );
 
-      const response = await this.#fetcher.fetch(
-        'https://js.images.cloudflare.com/transform',
-        {
-          method: 'POST',
-          headers: {
-            'content-type': formData.contentType(),
-          },
-          body: formData.stream(),
-        }
-      );
-
-      await throwErrorIfErrorResponse('TRANSFORM', response, span);
+    await throwErrorIfErrorResponse('TRANSFORM', response);
 
-      return new TransformationResultImpl(response);
-    });
+    return new TransformationResultImpl(response);
   }
 
   #consume(): void {
@@ -180,7 +168,7 @@ class ImageTransformerImpl implements ImageTransformer {
     this.#consumed = true;
   }
 
-  #serializeTransforms(formData: StreamableFormData, span: Span): void {
+  #serializeTransforms(formData: StreamableFormData): void {
     const transforms: (TargetedTransform | DrawCommand)[] = [];
 
     // image 0 is the canvas, so the first draw_image has index 1
@@ -222,16 +210,6 @@ class ImageTransformerImpl implements ImageTransformer {
     }
 
     walkTransforms(0, this.#transforms);
-
-    // The transforms are a set of operations which are applied to the image in order.
-    // Attaching an attribute as JSON is a little odd, but I'm not sure if there is
-    // a better way to do this.
-    if (transforms.length > 0) {
-      span.setAttribute(
-        'cloudflare.images.options.transforms',
-        JSON.stringify(transforms)
-      );
-    }
     formData.append('transforms', JSON.stringify(transforms));
   }
 }
@@ -255,53 +233,40 @@ class ImagesBindingImpl implements ImagesBinding {
     stream: ReadableStream<Uint8Array>,
     options?: ImageInputOptions
   ): Promise<ImageInfoResponse> {
-    return await withSpan('images_info', async (span) => {
-      span.setAttribute('cloudflare.binding.type', 'Images');
-      const body = new StreamableFormData();
+    const body = new StreamableFormData();
 
-      span.setAttribute(
-        'cloudflare.images.options.encoding',
-        options?.encoding ?? 'base64'
-      );
-      const decodedStream =
-        options?.encoding === 'base64'
-          ? stream.pipeThrough(createBase64DecoderTransformStream())
-          : stream;
-
-      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 decodedStream =
+      options?.encoding === 'base64'
+        ? stream.pipeThrough(createBase64DecoderTransformStream())
+        : stream;
 
-      await throwErrorIfErrorResponse('INFO', response, span);
+    body.append('image', decodedStream, { type: 'file' });
 
-      const r = (await response.json()) as RawInfoResponse;
+    const response = await this.#fetcher.fetch(
+      'https://js.images.cloudflare.com/info',
+      {
+        method: 'POST',
+        headers: {
+          'content-type': body.contentType(),
+        },
+        body: body.stream(),
+      }
+    );
 
-      span.setAttribute('cloudflare.images.result.format', r.format);
+    await throwErrorIfErrorResponse('INFO', response);
 
-      if ('file_size' in r) {
-        const ret = {
-          fileSize: r.file_size,
-          width: r.width,
-          height: r.height,
-          format: r.format,
-        };
-        span.setAttribute('cloudflare.images.result.file_size', ret.fileSize);
-        span.setAttribute('cloudflare.images.result.width', ret.width);
-        span.setAttribute('cloudflare.images.result.height', ret.height);
-        return ret;
-      }
+    const r = (await response.json()) as RawInfoResponse;
 
-      return r;
-    });
+    if ('file_size' in r) {
+      return {
+        fileSize: r.file_size,
+        width: r.width,
+        height: r.height,
+        format: r.format,
+      };
+    }
+
+    return r;
   }
 
   input(
@@ -327,29 +292,24 @@ class ImagesErrorImpl extends Error implements ImagesError {
 
 async function throwErrorIfErrorResponse(
   operation: string,
-  response: Response,
-  span: Span
+  response: Response
 ): Promise<void> {
   const statusHeader = response.headers.get('cf-images-binding') || '';
 
   const match = /err=(\d+)/.exec(statusHeader);
 
   if (match && match[1]) {
-    const errorMessage = await response.text();
-    span.setAttribute('cloudflare.images.error.code', match[1]);
-    span.setAttribute('error.type', errorMessage);
     throw new ImagesErrorImpl(
-      `IMAGES_${operation}_${errorMessage}`.trim(),
+      `IMAGES_${operation}_${await response.text()}`.trim(),
       Number.parseInt(match[1])
     );
   }
 
   if (response.status > 399) {
-    const errorMessage = await response.text();
-    span.setAttribute('cloudflare.images.error.code', '9523');
-    span.setAttribute('error.type', errorMessage);
     throw new ImagesErrorImpl(
-      `Unexpected error response ${response.status}: ${errorMessage.trim()}`,
+      `Unexpected error response ${response.status}: ${(
+        await response.text()
+      ).trim()}`,
       9523
     );
   }

src/cloudflare/internal/images-api.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(