@@ -21,16 +21,18 @@ it('instruments D1 prepare().all() automatically via env', async ({ signal }) =>
2121 const runner = createRunner ( __dirname )
2222 . ignore ( 'event' )
2323 . expect ( ( envelope : Envelope ) => {
24- if ( envelopeItemType ( envelope ) !== 'transaction' ) return ;
24+ expect ( envelopeItemType ( envelope ) ) . toBe ( 'transaction' ) ;
2525 const d1Spans = findD1Spans ( envelope ) ;
2626 expect ( d1Spans . length ) . toBeGreaterThanOrEqual ( 1 ) ;
2727
2828 const querySpan = d1Spans . find ( s => s . description === 'SELECT * FROM users WHERE id = ?' ) ;
2929 expect ( querySpan ) . toBeDefined ( ) ;
3030 expect ( querySpan ) . toEqual ( {
3131 data : {
32+ 'db.system.name' : 'cloudflare-d1' ,
33+ 'db.operation.name' : 'all' ,
34+ 'db.query.text' : 'SELECT * FROM users WHERE id = ?' ,
3235 'cloudflare.d1.duration' : expect . any ( Number ) ,
33- 'cloudflare.d1.query_type' : 'all' ,
3436 'cloudflare.d1.rows_read' : expect . any ( Number ) ,
3537 'cloudflare.d1.rows_written' : expect . any ( Number ) ,
3638 'sentry.op' : 'db.query' ,
@@ -94,13 +96,48 @@ it('captures error event when a D1 query references a non-existent table', async
9496 await runner . completed ( ) ;
9597} ) ;
9698
99+ it ( 'instruments D1 exec() automatically via env' , async ( { signal } ) => {
100+ const runner = createRunner ( __dirname )
101+ . ignore ( 'event' )
102+ . expect ( ( envelope : Envelope ) => {
103+ expect ( envelopeItemType ( envelope ) ) . toBe ( 'transaction' ) ;
104+ const d1Spans = findD1Spans ( envelope ) ;
105+
106+ const execSpan = d1Spans . find (
107+ s => s . description === 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY, name TEXT)' ,
108+ ) ;
109+ expect ( execSpan ) . toBeDefined ( ) ;
110+ expect ( execSpan ) . toEqual ( {
111+ data : {
112+ 'db.system.name' : 'cloudflare-d1' ,
113+ 'db.operation.name' : 'exec' ,
114+ 'db.query.text' : 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY, name TEXT)' ,
115+ 'sentry.op' : 'db.query' ,
116+ 'sentry.origin' : 'auto.db.cloudflare.d1' ,
117+ } ,
118+ description : 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY, name TEXT)' ,
119+ op : 'db.query' ,
120+ origin : 'auto.db.cloudflare.d1' ,
121+ parent_span_id : expect . any ( String ) ,
122+ span_id : expect . any ( String ) ,
123+ start_timestamp : expect . any ( Number ) ,
124+ timestamp : expect . any ( Number ) ,
125+ trace_id : expect . any ( String ) ,
126+ } ) ;
127+ } )
128+ . start ( signal ) ;
129+
130+ await runner . makeRequest ( 'get' , '/exec' ) ;
131+ await runner . completed ( ) ;
132+ } ) ;
133+
97134it ( 'does not double-instrument when instrumentD1WithSentry is used on top of env instrumentation' , async ( {
98135 signal,
99136} ) => {
100137 const runner = createRunner ( __dirname )
101138 . ignore ( 'event' )
102139 . expect ( ( envelope : Envelope ) => {
103- if ( envelopeItemType ( envelope ) !== 'transaction' ) return ;
140+ expect ( envelopeItemType ( envelope ) ) . toBe ( 'transaction' ) ;
104141 const d1Spans = findD1Spans ( envelope ) ;
105142
106143 const querySpans = d1Spans . filter ( s => s . description === 'SELECT * FROM users WHERE id = ?' ) ;
@@ -112,3 +149,78 @@ it('does not double-instrument when instrumentD1WithSentry is used on top of env
112149 expect ( response ) . toBe ( 'true' ) ;
113150 await runner . completed ( ) ;
114151} ) ;
152+
153+ it ( 'instruments D1 withSession().batch() identically to db.batch()' , async ( { signal } ) => {
154+ let directBatchSpan : Record < string , unknown > | undefined ;
155+ let sessionBatchSpan : Record < string , unknown > | undefined ;
156+
157+ const runner = createRunner ( __dirname )
158+ . ignore ( 'event' )
159+ . expect ( ( envelope : Envelope ) => {
160+ expect ( envelopeItem ( envelope ) . transaction ) . toBe ( 'GET /batch' ) ;
161+
162+ directBatchSpan = findD1Spans ( envelope ) . find ( s => s . description === 'D1 batch' ) ;
163+ } )
164+ . expect ( ( envelope : Envelope ) => {
165+ expect ( envelopeItem ( envelope ) . transaction ) . toBe ( 'GET /with-session/batch' ) ;
166+
167+ sessionBatchSpan = findD1Spans ( envelope ) . find ( s => s . description === 'D1 batch' ) ;
168+ } )
169+ . unordered ( )
170+ . start ( signal ) ;
171+
172+ await runner . makeRequest ( 'get' , '/batch' ) ;
173+ await runner . makeRequest ( 'get' , '/with-session/batch' ) ;
174+ await runner . completed ( ) ;
175+
176+ expect ( directBatchSpan ) . toBeDefined ( ) ;
177+ expect ( sessionBatchSpan ) . toBeDefined ( ) ;
178+
179+ const normalize = ( span : Record < string , unknown > ) : Record < string , unknown > => {
180+ const {
181+ span_id : _spanId ,
182+ parent_span_id : _parentSpanId ,
183+ start_timestamp : _start ,
184+ timestamp : _end ,
185+ trace_id : _traceId ,
186+ ...rest
187+ } = span ;
188+ return rest ;
189+ } ;
190+
191+ expect ( normalize ( sessionBatchSpan ! ) ) . toEqual ( normalize ( directBatchSpan ! ) ) ;
192+ } ) ;
193+
194+ it ( 'instruments D1 batch() automatically via env' , async ( { signal } ) => {
195+ const runner = createRunner ( __dirname )
196+ . ignore ( 'event' )
197+ . expect ( ( envelope : Envelope ) => {
198+ expect ( envelopeItemType ( envelope ) ) . toBe ( 'transaction' ) ;
199+ const d1Spans = findD1Spans ( envelope ) ;
200+
201+ const batchSpan = d1Spans . find ( s => s . description === 'D1 batch' ) ;
202+ expect ( batchSpan ) . toBeDefined ( ) ;
203+ expect ( batchSpan ) . toEqual ( {
204+ data : {
205+ 'db.system.name' : 'cloudflare-d1' ,
206+ 'db.operation.name' : 'batch' ,
207+ 'db.query.text' : 'INSERT INTO users (name) VALUES (?)\nINSERT INTO users (name) VALUES (?)' ,
208+ 'db.operation.batch.size' : 2 ,
209+ 'sentry.op' : 'db.query' ,
210+ 'sentry.origin' : 'auto.db.cloudflare.d1' ,
211+ } ,
212+ description : 'D1 batch' ,
213+ op : 'db.query' ,
214+ origin : 'auto.db.cloudflare.d1' ,
215+ parent_span_id : expect . any ( String ) ,
216+ span_id : expect . any ( String ) ,
217+ start_timestamp : expect . any ( Number ) ,
218+ timestamp : expect . any ( Number ) ,
219+ trace_id : expect . any ( String ) ,
220+ } ) ;
221+ } )
222+ . start ( signal ) ;
223+
224+ await runner . makeRequest ( 'get' , '/batch' ) ;
225+ await runner . completed ( ) ;
226+ } ) ;
0 commit comments