fix(server-utils): Set client span kind on direct dataloader ops, not batch

Author: logaretm

dev-packages/node-integration-tests/suites/tracing/dataloader/test.ts

@@ -29,12 +29,15 @@ describe('dataloader auto-instrumentation', () => {
             expect(loadSpan?.status).toBe('ok');
             expect(loadSpan?.data?.['sentry.origin']).toBe(ORIGIN);
             expect(loadSpan?.data?.['sentry.op']).toBe(CACHE_GET_OP);
+            // A direct operation is a client call; the deferred `batch` below gets no kind
+            expect(loadSpan?.data?.['otel.kind']).toBe('CLIENT');
 
             const batchSpan = spans.find(span => span.description === 'dataloader.batch');
             expect(batchSpan).toBeDefined();
             expect(batchSpan?.op).toBe(CACHE_GET_OP);
             expect(batchSpan?.origin).toBe(ORIGIN);
             expect(batchSpan?.status).toBe('ok');
+            expect(batchSpan?.data?.['otel.kind']).toBeUndefined();
 
             // The batch span links back to the load span that triggered it
             expect(batchSpan?.links).toEqual([

packages/server-utils/src/integrations/tracing-channel/dataloader.ts

@@ -66,9 +66,10 @@ function makeSpanOptions(loader: DataLoaderInstance | undefined, operation: Oper
 
   return {
     name: getSpanName(loader, operation),
-    // The batch runs off a deferred tick and has no obvious network peer, so only `load`/`loadMany`
-    // get a client kind, matching the vendored OTel instrumentation.
-    kind: operation === 'batch' ? SPAN_KIND.CLIENT : undefined,
+    // Every direct operation (`load`/`loadMany`/`prime`/`clear`/`clearAll`) is a client call, matching
+    // the vendored OTel instrumentation. The `batch` runs off a deferred tick with no obvious network
+    // peer, so it gets no kind.
+    kind: operation === 'batch' ? undefined : SPAN_KIND.CLIENT,
     op: isCacheGet ? CACHE_GET_OP : undefined,
     onlyIfParent: true,
     attributes: {