Merge 8db5618 into 6fca7ee

lcian · web-flow · commit a869d72ac05f · 2025-07-14T17:01:30.000Z
diff --git a/.envrc b/.envrc
@@ -0,0 +1,2 @@
+export VIRTUAL_ENV=".venv"
+layout python3
diff --git a/.github/workflows/system-tests-backend.yml b/.github/workflows/system-tests-backend.yml
@@ -66,7 +66,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           python3 -m pip install --upgrade pip
-          python3 -m pip install requests
+          python3 -m pip install -r requirements.txt
 
       - name: Set up Java
         uses: actions/setup-java@v4
diff --git a/.gitignore b/.gitignore
@@ -20,5 +20,7 @@ distributions/
 *.vscode/
 sentry-spring-boot-starter-jakarta/src/main/resources/META-INF/spring.factories
 sentry-samples/sentry-samples-spring-boot-jakarta/spy.log
+sentry-mock-server.txt
+spring-server.txt
 spy.log
 .kotlin
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical check preMerge publish systemtest systemtest-interactive
+.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleBenchmarkTestRelease assembleUiTestRelease assembleUiTestCriticalRelease createCoverageReports runUiTestCritical setupPython systemTest systemTestInteractive check preMerge publish
 
 all: stop clean javadocs compile createCoverageReports
 assembleBenchmarks: assembleBenchmarkTestRelease
@@ -10,6 +10,7 @@ publish: clean dryRelease
 clean:
 	./gradlew clean --no-configuration-cache
 	rm -rf distributions
+	rm -rf .venv
 
 # build and run tests
 compile:
@@ -59,13 +60,19 @@ createCoverageReports:
 	./gradlew jacocoTestReport
 	./gradlew koverXmlReportRelease
 
+# Create the Python virtual environment for system tests, and install the necessary dependencies
+setupPython:
+	@test -d .venv || python3 -m venv .venv
+	.venv/bin/pip install --upgrade pip
+	.venv/bin/pip install -r requirements.txt
+
 # Run system tests for sample applications
-systemtest:
-	python3 test/system-test-runner.py test --all
+systemTest: setupPython
+	.venv/bin/python test/system-test-runner.py test --all
 
 # Run system tests with interactive module selection
-systemtest-interactive:
-	python3 test/system-test-runner.py test --interactive
+systemTestInteractive: setupPython
+	.venv/bin/python test/system-test-runner.py test --interactive
 
 # Run tests and lint
 check:
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,5 @@
+certifi==2025.7.14
+charset-normalizer==3.4.2
+idna==3.10
+requests==2.32.4
+urllib3==2.5.0
diff --git a/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java b/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java
@@ -66,8 +66,8 @@ public static void main(String[] args) throws InterruptedException {
           // Enable SDK logging with Debug level
           options.setDebug(true);
           // To change the verbosity, use:
-          // By default it's DEBUG.
           // options.setDiagnosticLevel(SentryLevel.ERROR);
+          // By default it's DEBUG.
           // A good option to have SDK debug log in prod is to use only level ERROR here.
 
           // Exclude frames from some packages from being "inApp" so are hidden by default in Sentry
diff --git a/test/system-test-runner.py b/test/system-test-runner.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export VIRTUAL_ENV=".venv"`
	`2`	`+layout python3`