[Instrumentation] D1 follow ups

[jmorrell-cloudflare]

No description provided.

[jmorrell-cloudflare]

@lambrospetrou This is an example of a batch span. All of the queries are visible here, and I've added a count.

My understanding based on #5218 (comment) is that what you would like to see is more like:

{
    name: 'd1_batch',
    'db.system.name': 'cloudflare-d1',
    'db.operation.name': 'batch',
    'db.query.text':
      'SELECT * FROM users WHERE user_id = ?;\n' +
      'SELECT * FROM users WHERE user_id = ?;',
    'db.operation.batch.size': 2,
    'cloudflare.binding.type': 'D1',
    'cloudflare.d1.response.size_after': 8192,
    'cloudflare.d1.response.rows_read': 2,
    'cloudflare.d1.response.rows_written': 0,
    'cloudflare.d1.response.last_row_id': 2,
    'cloudflare.d1.response.changed_db': false,
    'cloudflare.d1.response.changes': 0,
    'cloudflare.d1.response.queries_count': 2,
    'cloudflare.d1.response.meta':
      '[{"duration":0.0014168027188820064,"served_by":"d1-mock","changes":0,"last_row_id":2,"changed_db":false,"size_after":8192,"rows_read":1,"rows_written":0},{"duration":0.005165785717162432,"served_by":"d1-mock","changes":0,"last_row_id":2,"changed_db":false,"size_after":8192,"rows_read":1,"rows_written":0}]',
    closed: true,
}

or that but broken out into more fields?

[jmorrell-cloudflare]

@lambrospetrou After thinking about it, I think the answer here is likely attaching these as span events. For each query in the batch emit a span event with the query, and all the meta data. That would keep it all queryable and clear.

However we don't yet have the ability to emit span events 😅 Mind if I file a ticket and come back to this?

[jmorrell-cloudflare]

This isn't necessary since we already had this data available under the semantic convention name: db.operation.batch.size: https://github.com/cloudflare/workerd/blob/main/src/cloudflare/internal/d1-api.ts#L207

[github-actions]

The generated output of @cloudflare/workers-types has been changed by this PR. If this is intentional, run just generate-types to update the snapshot. Alternatively, you can download the full generated types:

Full Type Diff

[jmorrell-cloudflare]

I've tried a couple of things, but haven't been able to find a way to import the D1Meta type. Given that I'm not creating new duplication of types, but rather copying the pattern that was already present in the code, I think this is likely out-of-scope for my changes and will leave this up to the D1 team to resolve if they wish.