Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); meta(changelog): Update changelog for 9.16.1 by AbhiPrasad · Pull Request #16223 · getsentry/sentry-javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.16.1

- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))

## 9.16.0

### Important changes
Expand Down
13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/instrument.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions dev-packages/node-integration-tests/suites/vercel/scenario.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions dev-packages/node-integration-tests/suites/vercel/test.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/server-runtime-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ export class ServerRuntimeClient<
if (this._options._experiments?.enableLogs) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const client = this;

client.on('flushLogs', () => {
client._logWeight = 0;
clearTimeout(client._logFlushIdleTimeout);
Expand All@@ -72,6 +73,10 @@ export class ServerRuntimeClient<
}, DEFAULT_LOG_FLUSH_INTERVAL);
}
});

client.on('flush', () => {
_INTERNAL_flushLogsBuffer(client);
});
}
}

Expand Down
20 changes: 20 additions & 0 deletions packages/core/test/lib/server-runtime-client.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -278,5 +278,25 @@ describe('ServerRuntimeClient', () => {
expect(sendEnvelopeSpy).not.toHaveBeenCalled();
expect(client['_logWeight']).toBe(0);
});

it('flushes logs when flush event is triggered', () => {
const options = getDefaultClientOptions({
dsn: PUBLIC_DSN,
_experiments: { enableLogs: true },
});
client = new ServerRuntimeClient(options);

const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');

// Add some logs
_INTERNAL_captureLog({ message: 'test1', level: 'info' }, client);
_INTERNAL_captureLog({ message: 'test2', level: 'info' }, client);

// Trigger flush event
client.emit('flush');

expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
expect(client['_logWeight']).toBe(0); // Weight should be reset after flush
});
});
});

This file was deleted.

18 changes: 0 additions & 18 deletions packages/node/src/integrations/http/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import { addOriginToSpan } from '../../utils/addOriginToSpan';
import { getRequestUrl } from '../../utils/getRequestUrl';
import type { SentryHttpInstrumentationOptions } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentation } from './SentryHttpInstrumentation';
import { SentryHttpInstrumentationBeforeOtel } from './SentryHttpInstrumentationBeforeOtel';

const INTEGRATION_NAME = 'Http';

Expand DownExpand Up@@ -117,10 +116,6 @@ interface HttpOptions {
};
}

const instrumentSentryHttpBeforeOtel = generateInstrumentOnce(`${INTEGRATION_NAME}.sentry-before-otel`, () => {
return new SentryHttpInstrumentationBeforeOtel();
});

const instrumentSentryHttp = generateInstrumentOnce<SentryHttpInstrumentationOptions>(
`${INTEGRATION_NAME}.sentry`,
options => {
Expand DownExpand Up@@ -162,19 +157,6 @@ export const httpIntegration = defineIntegration((options: HttpOptions = {}) =>
return {
name: INTEGRATION_NAME,
setupOnce() {
// TODO: get rid of this too
// Below, we instrument the Node.js HTTP API three times. 2 times Sentry-specific, 1 time OTEL specific.
// Due to timing reasons, we sometimes need to apply Sentry instrumentation _before_ we apply the OTEL
// instrumentation (e.g. to flush on serverless platforms), and sometimes we need to apply Sentry instrumentation
// _after_ we apply OTEL instrumentation (e.g. for isolation scope handling and breadcrumbs).

// This is Sentry-specific instrumentation that is applied _before_ any OTEL instrumentation.
if (process.env.VERCEL) {
// Currently this instrumentation only does something when deployed on Vercel, so to save some overhead, we short circuit adding it here only for Vercel.
// If it's functionality is extended in the future, feel free to remove the if statement and this comment.
instrumentSentryHttpBeforeOtel();
}

const instrumentSpans = _shouldInstrumentSpans(options, getClient<NodeClient>()?.getOptions());

// This is Sentry-specific instrumentation for request isolation and breadcrumbs
Expand Down