feat(effect): Use client options to check if metrics are enabled

Author: JPeer264

packages/core/src/client.ts

@@ -256,10 +256,10 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
 
     // todo(v11): Remove the experimental flag
     // eslint-disable-next-line deprecation/deprecation
-    const enableMetrics = this._options.enableMetrics ?? this._options._experiments?.enableMetrics ?? true;
+    this._options.enableMetrics = this._options.enableMetrics ?? this._options._experiments?.enableMetrics ?? true;
 
     // Setup metric flushing with weight and timeout tracking
-    if (enableMetrics) {
+    if (this._options.enableMetrics) {
       setupWeightBasedFlushing(
         this,
         'afterCaptureMetric',

packages/effect/README.md

@@ -22,6 +22,7 @@ const MainLive = HttpLive.pipe(
   Layer.provide(
     Sentry.effectLayer({
       dsn: '__DSN__',
+      enableLogs: true,
       enableEffectLogs: true,
       enableEffectMetrics: true,
     }),

packages/effect/src/utils/buildEffectLayer.ts

@@ -1,3 +1,4 @@
+import type { Client } from '@sentry/core';
 import type * as EffectLayer from 'effect/Layer';
 import { empty as emptyLayer, provideMerge } from 'effect/Layer';
 import { defaultLogger, replace as replaceLogger } from 'effect/Logger';
@@ -19,21 +20,22 @@ export interface EffectLayerBaseOptions {
  */
 export function buildEffectLayer<T extends EffectLayerBaseOptions>(
   options: T,
-  client: unknown,
+  client: Client | undefined,
 ): EffectLayer.Layer<never, never, never> {
   if (!client) {
     return emptyLayer;
   }
 
+  const clientOptions = client.getOptions();
   const { enableEffectLogs = false, enableEffectMetrics = false } = options;
   let layer: EffectLayer.Layer<never, never, never> = SentryEffectTracerLayer;
 
-  if (enableEffectLogs) {
+  if (enableEffectLogs && clientOptions.enableLogs) {
     const effectLogger = replaceLogger(defaultLogger, SentryEffectLogger);
     layer = layer.pipe(provideMerge(effectLogger));
   }
 
-  if (enableEffectMetrics) {
+  if (enableEffectMetrics && clientOptions.enableMetrics) {
     layer = layer.pipe(provideMerge(SentryEffectMetricsLayer));
   }
 

packages/effect/test/buildEffectLayer.test.ts

@@ -1,14 +1,31 @@
 import { describe, expect, it, vi } from '@effect/vitest';
 import * as sentryCore from '@sentry/core';
 import { logger as sentryLogger } from '@sentry/core';
+import type { NodeOptions } from '@sentry/node-core';
 import { Effect, Layer } from 'effect';
 import { empty as emptyLayer } from 'effect/Layer';
+import { init } from '../src/index.server';
 import { buildEffectLayer } from '../src/utils/buildEffectLayer';
 
+function getMockTransport() {
+  return () => ({
+    send: vi.fn().mockResolvedValue({}),
+    flush: vi.fn().mockResolvedValue(true),
+  });
+}
+
+function createClient(options: NodeOptions = {}) {
+  return init({
+    dsn: 'https://username@domain/123',
+    transport: getMockTransport(),
+    ...options,
+  });
+}
+
 describe('buildEffectLayer', () => {
   describe('when client is falsy', () => {
     it('returns empty layer when client is null', () => {
-      const layer = buildEffectLayer({}, null);
+      const layer = buildEffectLayer({}, undefined);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
@@ -25,45 +42,49 @@ describe('buildEffectLayer', () => {
   });
 
   describe('when client is truthy', () => {
-    const mockClient = { mock: true };
-
     it('returns a valid layer with default options', () => {
-      const layer = buildEffectLayer({}, mockClient);
+      const client = createClient();
+      const layer = buildEffectLayer({}, client);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
     });
 
     it('returns a valid layer with enableEffectLogs: false', () => {
-      const layer = buildEffectLayer({ enableEffectLogs: false }, mockClient);
+      const client = createClient();
+      const layer = buildEffectLayer({ enableEffectLogs: false }, client);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
     });
 
     it('returns a valid layer with enableEffectLogs: true', () => {
-      const layer = buildEffectLayer({ enableEffectLogs: true }, mockClient);
+      const client = createClient();
+      const layer = buildEffectLayer({ enableEffectLogs: true }, client);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
     });
 
     it('returns a valid layer with enableEffectMetrics: false', () => {
-      const layer = buildEffectLayer({ enableEffectMetrics: false }, mockClient);
+      const client = createClient();
+      const layer = buildEffectLayer({ enableEffectMetrics: false }, client);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
     });
 
     it('returns a valid layer with enableEffectMetrics: true', () => {
-      const layer = buildEffectLayer({ enableEffectMetrics: true }, mockClient);
+      const client = createClient();
+      const layer = buildEffectLayer({ enableEffectMetrics: true }, client);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
     });
 
     it('returns a valid layer with all features enabled', () => {
-      const layer = buildEffectLayer({ enableEffectLogs: true, enableEffectMetrics: true }, mockClient);
+      const client = createClient();
+      const layer = buildEffectLayer({ enableEffectLogs: true, enableEffectMetrics: true }, client);
 
       expect(layer).toBeDefined();
       expect(Layer.isLayer(layer)).toBe(true);
@@ -73,7 +94,7 @@ describe('buildEffectLayer', () => {
       Effect.gen(function* () {
         const result = yield* Effect.succeed('test-result');
         expect(result).toBe('test-result');
-      }).pipe(Effect.provide(buildEffectLayer({}, mockClient))),
+      }).pipe(Effect.provide(buildEffectLayer({}, createClient()))),
     );
 
     it.effect('layer with logs enabled routes Effect logs to Sentry logger', () =>
@@ -82,12 +103,13 @@ describe('buildEffectLayer', () => {
         yield* Effect.log('test log message');
         expect(infoSpy).toHaveBeenCalledWith('test log message');
         infoSpy.mockRestore();
-      }).pipe(Effect.provide(buildEffectLayer({ enableEffectLogs: true }, mockClient))),
+      }).pipe(Effect.provide(buildEffectLayer({ enableEffectLogs: true }, createClient({ enableLogs: true })))),
     );
 
     it('returns different layer when enableEffectMetrics is true vs false', () => {
-      const layerWithMetrics = buildEffectLayer({ enableEffectMetrics: true }, mockClient);
-      const layerWithoutMetrics = buildEffectLayer({ enableEffectMetrics: false }, mockClient);
+      const client = createClient();
+      const layerWithMetrics = buildEffectLayer({ enableEffectMetrics: true }, client);
+      const layerWithoutMetrics = buildEffectLayer({ enableEffectMetrics: false }, client);
 
       expect(layerWithMetrics).not.toBe(layerWithoutMetrics);
     });
@@ -96,7 +118,11 @@ describe('buildEffectLayer', () => {
       Effect.gen(function* () {
         const result = yield* Effect.succeed('all-features');
         expect(result).toBe('all-features');
-      }).pipe(Effect.provide(buildEffectLayer({ enableEffectLogs: true, enableEffectMetrics: true }, mockClient))),
+      }).pipe(
+        Effect.provide(
+          buildEffectLayer({ enableEffectLogs: true, enableEffectMetrics: true }, createClient({ enableLogs: true })),
+        ),
+      ),
     );
 
     it.effect('layer enables tracing for Effect spans via Sentry tracer', () =>
@@ -110,12 +136,12 @@ describe('buildEffectLayer', () => {
           }),
         );
         startInactiveSpanSpy.mockRestore();
-      }).pipe(Effect.provide(buildEffectLayer({}, mockClient))),
+      }).pipe(Effect.provide(buildEffectLayer({}, createClient()))),
     );
   });
 
   describe('with additional options', () => {
-    const mockClient = { mock: true };
+    const client = createClient({ enableLogs: true });
 
     it('accepts options with additional properties', () => {
       const layer = buildEffectLayer(
@@ -125,7 +151,7 @@ describe('buildEffectLayer', () => {
           dsn: 'https://test@sentry.io/123',
           debug: true,
         } as { enableEffectLogs?: boolean; enableEffectMetrics?: boolean; dsn?: string; debug?: boolean },
-        mockClient,
+        client,
       );
 
       expect(layer).toBeDefined();