Merge branch 'develop' into abhi-skip-flaky-replay-tests

Author: lforst

.github/workflows/build.yml

@@ -44,7 +44,6 @@ env:
     ${{ github.workspace }}/packages/ember/*.d.ts
     ${{ github.workspace }}/packages/gatsby/*.d.ts
     ${{ github.workspace }}/packages/core/src/version.ts
-    ${{ github.workspace }}/packages/serverless
     ${{ github.workspace }}/packages/utils/cjs
     ${{ github.workspace }}/packages/utils/esm
 
@@ -385,7 +384,7 @@ jobs:
             ${{ github.workspace }}/packages/replay/build/bundles/**
             ${{ github.workspace }}/packages/replay-canvas/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
-            ${{ github.workspace }}/packages/serverless/build/aws/dist-serverless/*.zip
+            ${{ github.workspace }}/packages/aws-serverless/build/aws/dist-serverless/*.zip
 
   job_browser_unit_tests:
     name: Browser Unit Tests

packages/node-experimental/test/transports/http.test.ts

@@ -53,14 +53,14 @@ function setupTestServer(
     res.connection?.end();
   });
 
-  testServer.listen(18099);
+  testServer.listen(18100);
 
   return new Promise(resolve => {
     testServer?.on('listening', resolve);
   });
 }
 
-const TEST_SERVER_URL = 'http://localhost:18099';
+const TEST_SERVER_URL = 'http://localhost:18100';
 
 const EVENT_ENVELOPE = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
   [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }] as EventItem,

packages/node-experimental/test/transports/https.test.ts

@@ -53,14 +53,14 @@ function setupTestServer(
     res.connection?.end();
   });
 
-  testServer.listen(8099);
+  testServer.listen(8100);
 
   return new Promise(resolve => {
     testServer?.on('listening', resolve);
   });
 }
 
-const TEST_SERVER_URL = 'https://localhost:8099';
+const TEST_SERVER_URL = 'https://localhost:8100';
 
 const EVENT_ENVELOPE = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
   [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }] as EventItem,

scripts/aws-deploy-local-layer.sh

@@ -13,15 +13,15 @@ set -euo pipefail
 # Remove old distribution directories and zip files.
 echo "Preparing local directories for new build..."
 rm -rf dist-serverless/
-rm -rf ./packages/serverless/build
-rm -rf ./packages/serverless/dist
-rm -rf ./packages/serverless/node_modules
+rm -rf ./packages/aws-serverless/build
+rm -rf ./packages/aws-serverless/dist
+rm -rf ./packages/aws-serverless/node_modules
 
 # Creating Lambda layer
-echo "Creating Lambda layer in ./packages/serverless/build/aws/dist-serverless..."
-cd packages/serverless
+echo "Creating Lambda layer in ./packages/aws-serverless/build/aws/dist-serverless..."
+cd packages/aws-serverless
 yarn build
-echo "Done creating Lambda layer in ./packages/serverless/build/aws/dist-serverless."
+echo "Done creating Lambda layer in ./packages/aws-serverless/build/aws/dist-serverless."
 
 # Deploying zipped Lambda layer to AWS
 ZIP=$(ls build/aws/dist-serverless | grep sentry-node-serverless | head -n 1)