diff --git a/packages/cloudflare/src/instrumentations/worker/instrumentR2.ts b/packages/cloudflare/src/instrumentations/worker/instrumentR2.ts index a2ffdf72e50a..6befc6ba24de 100644 --- a/packages/cloudflare/src/instrumentations/worker/instrumentR2.ts +++ b/packages/cloudflare/src/instrumentations/worker/instrumentR2.ts @@ -25,24 +25,24 @@ import { isObjectLike, startSpan } from '@sentry/core'; const ORIGIN = 'auto.faas.cloudflare.r2'; const R2_OPERATIONS = { - get: { spanName: 'r2_get', op: OBJECT_GET, operation: 'GetObject' }, - head: { spanName: 'r2_head', op: OBJECT_HEAD, operation: 'HeadObject' }, - put: { spanName: 'r2_put', op: OBJECT_PUT, operation: 'PutObject' }, - delete: { spanName: 'r2_delete', op: OBJECT_DELETE, operation: 'DeleteObject' }, - list: { spanName: 'r2_list', op: OBJECT_LIST, operation: 'ListObjects' }, - uploadPart: { spanName: 'r2_uploadPart', op: OBJECT_UPLOAD_PART, operation: 'UploadPart' }, + get: { spanName: 'R2.GetObject', op: OBJECT_GET, operation: 'GetObject' }, + head: { spanName: 'R2.HeadObject', op: OBJECT_HEAD, operation: 'HeadObject' }, + put: { spanName: 'R2.PutObject', op: OBJECT_PUT, operation: 'PutObject' }, + delete: { spanName: 'R2.DeleteObject', op: OBJECT_DELETE, operation: 'DeleteObject' }, + list: { spanName: 'R2.ListObjects', op: OBJECT_LIST, operation: 'ListObjects' }, + uploadPart: { spanName: 'R2.UploadPart', op: OBJECT_UPLOAD_PART, operation: 'UploadPart' }, abortMultipartUpload: { - spanName: 'r2_abortMultipartUpload', + spanName: 'R2.AbortMultipartUpload', op: OBJECT_MULTIPART_UPLOAD_ABORT, operation: 'AbortMultipartUpload', }, createMultipartUpload: { - spanName: 'r2_createMultipartUpload', + spanName: 'R2.CreateMultipartUpload', op: OBJECT_MULTIPART_UPLOAD_CREATE, operation: 'CreateMultipartUpload', }, completeMultipartUpload: { - spanName: 'r2_completeMultipartUpload', + spanName: 'R2.CompleteMultipartUpload', op: OBJECT_MULTIPART_UPLOAD_COMPLETE, operation: 'CompleteMultipartUpload', }, diff --git a/packages/cloudflare/test/instrumentations/worker/instrumentR2.test.ts b/packages/cloudflare/test/instrumentations/worker/instrumentR2.test.ts index 73aa3d2bf72c..1f8a58e397d2 100644 --- a/packages/cloudflare/test/instrumentations/worker/instrumentR2.test.ts +++ b/packages/cloudflare/test/instrumentations/worker/instrumentR2.test.ts @@ -81,7 +81,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ op: 'object.get', - name: 'r2_get', + name: 'R2.GetObject', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'GetObject', 'cloudflare.r2.bucket': 'MY_BUCKET', @@ -113,7 +113,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ op: 'object.head', - name: 'r2_head', + name: 'R2.HeadObject', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'HeadObject', 'cloudflare.r2.request.key': 'my-file.txt', @@ -143,7 +143,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ op: 'object.put', - name: 'r2_put', + name: 'R2.PutObject', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'PutObject', 'cloudflare.r2.request.key': 'upload/photo.jpg', @@ -171,7 +171,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ op: 'object.delete', - name: 'r2_delete', + name: 'R2.DeleteObject', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'DeleteObject', 'cloudflare.r2.request.key': 'my-file.txt', @@ -207,7 +207,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ op: 'object.list', - name: 'r2_list', + name: 'R2.ListObjects', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'ListObjects', }), @@ -237,7 +237,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ op: 'object.multipart_upload.create', - name: 'r2_createMultipartUpload', + name: 'R2.CreateMultipartUpload', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'CreateMultipartUpload', 'cloudflare.r2.request.key': 'big-file.bin', @@ -257,7 +257,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenCalledTimes(1); expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ - name: 'r2_uploadPart', + name: 'R2.UploadPart', attributes: expect.objectContaining({ 'cloudflare.r2.request.key': 'big-file.bin', 'cloudflare.r2.request.part_number': 1, @@ -295,7 +295,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenCalledTimes(1); expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ - name: 'r2_abortMultipartUpload', + name: 'R2.AbortMultipartUpload', attributes: expect.objectContaining({ 'cloudflare.r2.request.key': 'my-file.txt', }), @@ -324,7 +324,7 @@ describe('instrumentR2Bucket', () => { expect(startSpanSpy).toHaveBeenCalledTimes(1); expect(startSpanSpy).toHaveBeenLastCalledWith( expect.objectContaining({ - name: 'r2_completeMultipartUpload', + name: 'R2.CompleteMultipartUpload', attributes: expect.objectContaining({ 'cloudflare.r2.operation': 'CompleteMultipartUpload', 'cloudflare.r2.request.key': 'my-file.txt',