fixup! feat(effect): Remove effectLayer auto composition

Author: JPeer264

dev-packages/e2e-tests/test-applications/effect-node/tests/transactions.test.ts

@@ -28,11 +28,11 @@ test('Sends transaction with manual Effect span', async ({ baseURL }) => {
   expect(transactionEvent.transaction).toBe('http.server GET');
 
   const spans = transactionEvent.spans || [];
-  expect(spans).toContainEqual(
+  expect(spans).toEqual([
     expect.objectContaining({
       description: 'test-span',
     }),
-  );
+  ]);
 });
 
 test('Sends Effect spans with correct parent-child structure', async ({ baseURL }) => {
@@ -49,23 +49,41 @@ test('Sends Effect spans with correct parent-child structure', async ({ baseURL
 
   expect(transactionEvent.transaction).toBe('http.server GET');
 
-  const spans = transactionEvent.spans || [];
-
-  expect(spans).toContainEqual(
+  expect(transactionEvent).toEqual(
     expect.objectContaining({
-      description: 'custom-effect-span',
+      contexts: expect.objectContaining({
+        trace: expect.objectContaining({
+          origin: 'auto.http.effect',
+        }),
+      }),
+      spans: [
+        expect.objectContaining({
+          description: 'custom-effect-span',
+          origin: 'auto.function.effect',
+        }),
+        expect.objectContaining({
+          description: 'nested-span',
+          origin: 'auto.function.effect',
+        }),
+      ],
+      sdk: expect.objectContaining({
+        name: 'sentry.javascript.effect',
+        packages: [
+          expect.objectContaining({
+            name: 'npm:@sentry/effect',
+          }),
+          expect.objectContaining({
+            name: 'npm:@sentry/node-light',
+          }),
+        ],
+      }),
     }),
   );
 
-  expect(spans).toContainEqual(
-    expect.objectContaining({
-      description: 'nested-span',
-    }),
-  );
+  const parentSpan = transactionEvent.spans?.[0]?.span_id;
+  const nestedSpan = transactionEvent.spans?.[1]?.parent_span_id;
 
-  const parentSpan = spans.find(s => s.description === 'custom-effect-span');
-  const nestedSpan = spans.find(s => s.description === 'nested-span');
-  expect(nestedSpan?.parent_span_id).toBe(parentSpan?.span_id);
+  expect(nestedSpan).toBe(parentSpan);
 });
 
 test('Sends transaction for error route', async ({ baseURL }) => {

packages/effect/README.md

@@ -26,6 +26,7 @@ const SentryLive = Layer.mergeAll(
   }),
   Layer.setTracer(Sentry.SentryEffectTracer),
   Logger.replace(Logger.defaultLogger, Sentry.SentryEffectLogger),
+  Sentry.SentryEffectMetricsLayer,
 );
 
 const MainLive = HttpLive.pipe(Layer.provide(SentryLive));

packages/effect/test/layer.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from '@effect/vitest';
-import { getClient, getCurrentScope, getIsolationScope, SDK_VERSION } from '@sentry/core';
+import * as sentryCore from '@sentry/core';
+import { getClient, getCurrentScope, getIsolationScope, SDK_VERSION, SentrySpan } from '@sentry/core';
 import { Effect, Layer, Logger, LogLevel } from 'effect';
 import { afterEach, beforeEach, vi } from 'vitest';
 import * as sentryClient from '../src/index.client';
@@ -41,6 +42,7 @@ describe.each([
 
   afterEach(() => {
     getCurrentScope().setClient(undefined);
+    vi.restoreAllMocks();
   });
 
   it('creates a valid Effect layer', () => {
@@ -91,8 +93,11 @@ describe.each([
 
   it.effect('layer enables tracing when tracer is set', () =>
     Effect.gen(function* () {
+      const startInactiveSpanMock = vi.spyOn(sentryCore, 'startInactiveSpan');
+
       const result = yield* Effect.withSpan('test-span')(Effect.succeed('traced'));
       expect(result).toBe('traced');
+      expect(startInactiveSpanMock).toHaveBeenCalledWith(expect.objectContaining({ name: 'test-span' }));
     }).pipe(
       Effect.withTracer(SentryEffectTracer),
       Effect.provide(
@@ -106,11 +111,14 @@ describe.each([
 
   it.effect('layer can be composed with tracer layer', () =>
     Effect.gen(function* () {
+      const startInactiveSpanMock = vi.spyOn(sentryCore, 'startInactiveSpan');
+
       const result = yield* Effect.succeed(42).pipe(
         Effect.map(n => n * 2),
         Effect.withSpan('computation'),
       );
       expect(result).toBe(84);
+      expect(startInactiveSpanMock).toHaveBeenCalledWith(expect.objectContaining({ name: 'computation' }));
     }).pipe(
       Effect.provide(
         Layer.mergeAll(
@@ -145,13 +153,16 @@ describe.each([
 
   it.effect('layer can be composed with all Effect features', () =>
     Effect.gen(function* () {
+      const startInactiveSpanMock = vi.spyOn(sentryCore, 'startInactiveSpan');
+
       yield* Effect.logInfo('starting computation');
       const result = yield* Effect.succeed(42).pipe(
         Effect.map(n => n * 2),
         Effect.withSpan('computation'),
       );
       yield* Effect.logInfo('computation complete');
       expect(result).toBe(84);
+      expect(startInactiveSpanMock).toHaveBeenCalledWith(expect.objectContaining({ name: 'computation' }));
     }).pipe(
       Effect.provide(
         Layer.mergeAll(