always send v2 envelopes

Author: nicohrubec

packages/core/src/logs/envelope.ts

@@ -9,20 +9,13 @@ import { isBrowser } from '../utils/isBrowser';
 /**
  * Creates a log container envelope item for a list of logs.
  *
- * When `spanStreamingEnabled` is false, the payload is emitted in the legacy (v1) shape for
- * backwards compatibility: Relay's historical behavior for log envelopes was to always infer
- * end-user IP and User-Agent. Sending `version: 2` opts the payload into the explicit
- * `ingest_settings` protocol, which would silently turn that inference off for SDKs that
- * haven't adopted the new behavior.
- *
  * @param items - The logs to include in the envelope.
- * @param spanStreamingEnabled - If true, emit the v2 payload shape with explicit `ingest_settings`.
  * @param inferUserData - If true, tells Relay to infer the end-user IP and User-Agent from the incoming request.
+ *                        Only emitted as `ingest_settings` in browser environments.
  * @returns The created log container envelope item.
  */
 export function createLogContainerEnvelopeItem(
   items: Array<SerializedLog>,
-  spanStreamingEnabled?: boolean,
   inferUserData?: boolean,
 ): LogContainerItem {
   const inferSetting = inferUserData ? 'auto' : 'never';
@@ -33,11 +26,9 @@ export function createLogContainerEnvelopeItem(
       content_type: 'application/vnd.sentry.items.log+json',
     },
     {
-      ...(spanStreamingEnabled && {
-        version: 2,
-        ...(isBrowser() && {
-          ingest_settings: { infer_ip: inferSetting, infer_user_agent: inferSetting },
-        }),
+      version: 2,
+      ...(isBrowser() && {
+        ingest_settings: { infer_ip: inferSetting, infer_user_agent: inferSetting },
       }),
       items,
     },
@@ -53,7 +44,6 @@ export function createLogContainerEnvelopeItem(
  * @param metadata - The metadata to include in the envelope.
  * @param tunnel - The tunnel to include in the envelope.
  * @param dsn - The DSN to include in the envelope.
- * @param spanStreamingEnabled - If true, emit the v2 payload shape with explicit `ingest_settings`.
  * @param inferUserData - If true, tells Relay to infer the end-user IP and User-Agent from the incoming request.
  * @returns The created envelope.
  */
@@ -62,7 +52,6 @@ export function createLogEnvelope(
   metadata?: SdkMetadata,
   tunnel?: string,
   dsn?: DsnComponents,
-  spanStreamingEnabled?: boolean,
   inferUserData?: boolean,
 ): LogEnvelope {
   const headers: LogEnvelope[0] = {};
@@ -78,7 +67,5 @@ export function createLogEnvelope(
     headers.dsn = dsnToString(dsn);
   }
 
-  return createEnvelope<LogEnvelope>(headers, [
-    createLogContainerEnvelopeItem(logs, spanStreamingEnabled, inferUserData),
-  ]);
+  return createEnvelope<LogEnvelope>(headers, [createLogContainerEnvelopeItem(logs, inferUserData)]);
 }

packages/core/src/logs/internal.ts

@@ -3,7 +3,6 @@ import { getGlobalSingleton } from '../carrier';
 import type { Client } from '../client';
 import { getClient, getCurrentScope, getIsolationScope } from '../currentScopes';
 import { DEBUG_BUILD } from '../debug-build';
-import { hasSpanStreamingEnabled } from '../tracing/spans/hasSpanStreamingEnabled';
 import type { Integration } from '../types-hoist/integration';
 import type { Log, SerializedLog } from '../types-hoist/log';
 import { consoleSandbox, debug } from '../utils/debug-logger';
@@ -198,7 +197,6 @@ export function _INTERNAL_flushLogsBuffer(client: Client, maybeLogBuffer?: Array
     clientOptions._metadata,
     clientOptions.tunnel,
     client.getDsn(),
-    hasSpanStreamingEnabled(client),
     clientOptions.sendDefaultPii,
   );
 

packages/core/test/lib/logs/envelope.test.ts

@@ -23,36 +23,23 @@ afterEach(() => {
 });
 
 describe('createLogContainerEnvelopeItem', () => {
-  it('creates an envelope item with legacy shape when span streaming is disabled', () => {
-    const mockLog: SerializedLog = {
-      timestamp: 1713859200,
-      level: 'error',
-      body: 'Test error message',
-    };
-
-    const result = createLogContainerEnvelopeItem([mockLog, mockLog]);
-
-    expect(result).toHaveLength(2);
-    expect(result[0]).toEqual({ type: 'log', item_count: 2, content_type: 'application/vnd.sentry.items.log+json' });
-    expect(result[1]).toEqual({ items: [mockLog, mockLog] });
-  });
-
-  it('emits version: 2 without ingest_settings when span streaming is enabled but not in browser', () => {
+  it('emits version: 2 without ingest_settings when not in browser', () => {
     const mockLog: SerializedLog = {
       timestamp: 1713859200,
       level: 'info',
       body: 'Test log message',
     };
 
-    const result = createLogContainerEnvelopeItem([mockLog], true, true);
+    const result = createLogContainerEnvelopeItem([mockLog], true);
 
+    expect(result[0]).toEqual({ type: 'log', item_count: 1, content_type: 'application/vnd.sentry.items.log+json' });
     expect(result[1]).toEqual({
       version: 2,
       items: [mockLog],
     });
   });
 
-  it("includes ingest_settings with 'auto' values when span streaming is enabled, in browser, and inferUserData is true", () => {
+  it("includes ingest_settings with 'auto' values when in browser and inferUserData is true", () => {
     vi.mocked(isBrowser).mockReturnValue(true);
 
     const mockLog: SerializedLog = {
@@ -61,7 +48,7 @@ describe('createLogContainerEnvelopeItem', () => {
       body: 'Test log message',
     };
 
-    const result = createLogContainerEnvelopeItem([mockLog], true, true);
+    const result = createLogContainerEnvelopeItem([mockLog], true);
 
     expect(result[1]).toEqual({
       version: 2,
@@ -70,7 +57,7 @@ describe('createLogContainerEnvelopeItem', () => {
     });
   });
 
-  it("includes ingest_settings with 'never' values when span streaming is enabled, in browser, and inferUserData is false", () => {
+  it("includes ingest_settings with 'never' values when in browser and inferUserData is false", () => {
     vi.mocked(isBrowser).mockReturnValue(true);
 
     const mockLog: SerializedLog = {
@@ -79,30 +66,14 @@ describe('createLogContainerEnvelopeItem', () => {
       body: 'Test log message',
     };
 
-    const result = createLogContainerEnvelopeItem([mockLog], true, false);
+    const result = createLogContainerEnvelopeItem([mockLog], false);
 
     expect(result[1]).toEqual({
       version: 2,
       ingest_settings: { infer_ip: 'never', infer_user_agent: 'never' },
       items: [mockLog],
     });
   });
-
-  it('omits version and ingest_settings when span streaming is disabled even if in browser', () => {
-    vi.mocked(isBrowser).mockReturnValue(true);
-
-    const mockLog: SerializedLog = {
-      timestamp: 1713859200,
-      level: 'info',
-      body: 'Test log message',
-    };
-
-    const result = createLogContainerEnvelopeItem([mockLog], false, true);
-
-    expect(result[1]).toEqual({
-      items: [mockLog],
-    });
-  });
 });
 
 describe('createLogEnvelope', () => {
@@ -208,7 +179,7 @@ describe('createLogEnvelope', () => {
       expect.arrayContaining([
         expect.arrayContaining([
           { type: 'log', item_count: 2, content_type: 'application/vnd.sentry.items.log+json' },
-          { items: mockLogs },
+          { version: 2, items: mockLogs },
         ]),
       ]),
     );