fixes

Author: mydea

packages/core/test/lib/utils/promisebuffer.test.ts

@@ -149,10 +149,12 @@ describe('PromiseBuffer', () => {
       expect(p5).toHaveBeenCalled();
 
       expect(buffer.$.length).toEqual(5);
-      const result = await buffer.drain(8);
+      const result = await buffer.drain(6);
       expect(result).toEqual(false);
-      // p5 is still in the buffer
-      expect(buffer.$.length).toEqual(1);
+      // p5 & p4 are still in the buffer
+      // Leaving some wiggle room, possibly one or two items are still in the buffer
+      // to avoid flakiness
+      expect(buffer.$.length).toBeGreaterThanOrEqual(1);
 
       // Now drain final item
       const result2 = await buffer.drain();

packages/node-core/src/integrations/http/httpServerIntegration.ts

@@ -22,9 +22,14 @@ import { MAX_BODY_BYTE_LENGTH } from './constants';
 
 type ServerEmit = typeof Server.prototype.emit;
 
+// Inlining this type to not depend on newer TS types
+interface WeakRefImpl<T> {
+  deref(): T | undefined;
+}
+
 type StartSpanCallback = (next: () => boolean) => boolean;
 type RequestWithOptionalStartSpanCallback = IncomingMessage & {
-  _startSpanCallback?: WeakRef<StartSpanCallback>;
+  _startSpanCallback?: WeakRefImpl<StartSpanCallback>;
 };
 
 const HTTP_SERVER_INSTRUMENTED_KEY = createContextKey('sentry_http_server_instrumented');