diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml index c21264328..c13f72256 100644 --- a/.github/workflows/_integration_tests.yml +++ b/.github/workflows/_integration_tests.yml @@ -70,7 +70,7 @@ on: jobs: integration-tests: - name: ${{ matrix.test }} + name: ${{ matrix.test.name }} runs-on: ubuntu-22.04 permissions: contents: read @@ -104,27 +104,28 @@ jobs: - {ref_name: main, test: direct-browser-relay-restart} - {ref_name: main, test: relayed-browser-relay-restart} - test: [ - direct-browser-relay-restart, - direct-curl-api-down, - direct-curl-api-relay-down, - direct-curl-api-restart, - direct-dns-api-down, - direct-dns-relay-down, - direct-dns, - direct-download-roaming-network, - dns-failsafe, # Uses the default DNS control method - dns-nm, - relay-graceful-shutdown, - relayed-browser-relay-restart, - relayed-curl-api-down, - relayed-curl-api-restart, - relayed-curl-relay-restart, - relayed-dns-api-down, - relayed-dns-relay-restart, - relayed-dns, - systemd/dns-systemd-resolved, - ] + test: + - name: direct-browser-relay-restart + - name: direct-curl-api-down + - name: direct-curl-api-relay-down + - name: direct-curl-api-restart + - name: direct-dns-api-down + - name: direct-dns-relay-down + - name: direct-dns + - name: direct-download-roaming-network + # Too noisy can cause flaky tests due to the amount of data + rust_log: debug + - name: dns-failsafe # Uses the default DNS control method + - name: dns-nm + - name: relay-graceful-shutdown + - name: relayed-browser-relay-restart + - name: relayed-curl-api-down + - name: relayed-curl-api-restart + - name: relayed-curl-relay-restart + - name: relayed-dns-api-down + - name: relayed-dns-relay-restart + - name: relayed-dns + - name: systemd/dns-systemd-resolved steps: - uses: actions/checkout@v4 - uses: ./.github/actions/gcp-docker-login @@ -135,6 +136,12 @@ jobs: run: docker compose run elixir /bin/sh -c 'cd apps/domain && mix ecto.seed' - name: Start docker compose in the background run: | + set -xe + + if [[ ! -z "${{ matrix.test.rust_log }}" ]]; then + export RUST_LOG="${{ matrix.test.rust_log }}" + fi + # Start one-by-one to avoid variability in service startup order docker compose up -d dns.httpbin httpbin download.httpbin docker compose up -d api web domain --no-build @@ -143,7 +150,7 @@ jobs: docker compose up -d gateway --no-build docker compose up -d client --no-build - - run: ./scripts/tests/${{ matrix.test }}.sh + - run: ./scripts/tests/${{ matrix.test.name }}.sh - name: Show Client logs if: "!cancelled()" diff --git a/docker-compose.yml b/docker-compose.yml index c67ef46f9..26054cbca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -313,7 +313,7 @@ services: environment: FIREZONE_DNS_CONTROL: "${FIREZONE_DNS_CONTROL:-etc-resolv-conf}" FIREZONE_TOKEN: "n.SFMyNTY.g2gDaANtAAAAJGM4OWJjYzhjLTkzOTItNGRhZS1hNDBkLTg4OGFlZjZkMjhlMG0AAAAkN2RhN2QxY2QtMTExYy00NGE3LWI1YWMtNDAyN2I5ZDIzMGU1bQAAACtBaUl5XzZwQmstV0xlUkFQenprQ0ZYTnFJWktXQnMyRGR3XzJ2Z0lRdkZnbgYAGUmu74wBYgABUYA.UN3vSLLcAMkHeEh5VHumPOutkuue8JA6wlxM9JxJEPE" - RUST_LOG: firezone_linux_client=trace,wire=trace,connlib_client_shared=trace,firezone_tunnel=trace,connlib_shared=trace,boringtun=debug,snownet=debug,str0m=debug,info + RUST_LOG: ${RUST_LOG:-firezone_linux_client=trace,wire=trace,connlib_client_shared=trace,firezone_tunnel=trace,connlib_shared=trace,boringtun=debug,snownet=debug,str0m=debug,info} FIREZONE_API_URL: ws://api:8081 init: true build: @@ -343,7 +343,7 @@ services: test: ["CMD-SHELL", "ip link | grep tun-firezone"] environment: FIREZONE_TOKEN: ".SFMyNTY.g2gDaANtAAAAJGM4OWJjYzhjLTkzOTItNGRhZS1hNDBkLTg4OGFlZjZkMjhlMG0AAAAkMjI3NDU2MGItZTk3Yi00NWU0LThiMzQtNjc5Yzc2MTdlOThkbQAAADhPMDJMN1VTMkozVklOT01QUjlKNklMODhRSVFQNlVPOEFRVk82VTVJUEwwVkpDMjJKR0gwPT09PW4GAF3gLBONAWIAAVGA.DCT0Qv80qzF5OQ6CccLKXPLgzC3Rzx5DqzDAh9mWAww" - RUST_LOG: phoenix_channel=trace,firezone_gateway=trace,wire=trace,connlib_gateway_shared=trace,firezone_tunnel=trace,connlib_shared=trace,phoenix_channel=debug,boringtun=debug,snownet=debug,str0m=debug,info + RUST_LOG: ${RUST_LOG:-phoenix_channel=trace,firezone_gateway=trace,wire=trace,connlib_gateway_shared=trace,firezone_tunnel=trace,connlib_shared=trace,phoenix_channel=debug,boringtun=debug,snownet=debug,str0m=debug,info} FIREZONE_ENABLE_MASQUERADE: 1 FIREZONE_API_URL: ws://api:8081 FIREZONE_ID: 4694E56C-7643-4A15-9DF3-638E5B05F570 @@ -426,7 +426,7 @@ services: # FIREZONE_TOKEN: ".SFMyNTY.g2gDaANtAAAAJGM4OWJjYzhjLTkzOTItNGRhZS1hNDBkLTg4OGFlZjZkMjhlMG0AAAAkNTQ5YzQxMDctMTQ5Mi00ZjhmLWE0ZWMtYTlkMmE2NmQ4YWE5bQAAADhQVTVBSVRFMU84VkRWTk1ITU9BQzc3RElLTU9HVERJQTY3MlM2RzFBQjAyT1MzNEg1TUUwPT09PW4GAEngLBONAWIAAVGA.E-f2MFdGMX7JTL2jwoHBdWcUd2G3UNz2JRZLbQrlf0k" # Token for global Relay FIREZONE_TOKEN: ".SFMyNTY.g2gDaAN3A25pbG0AAAAkZTgyZmNkYzEtMDU3YS00MDE1LWI5MGItM2IxOGYwZjI4MDUzbQAAADhDMTROR0E4N0VKUlIwM0c0UVBSMDdBOUM2Rzc4NFRTU1RIU0Y0VEk1VDBHRDhENkwwVlJHPT09PW4GADXgLBONAWIAAVGA.dShU17FgnvO2GLcTSnBBTDoqQ2tScuG7qjiyKhhlq8s" - RUST_LOG: "debug" + RUST_LOG: ${RUST_LOG:-debug} RUST_BACKTRACE: 1 FIREZONE_API_URL: ws://api:8081 build: @@ -466,7 +466,7 @@ services: # FIREZONE_TOKEN: ".SFMyNTY.g2gDaANtAAAAJGM4OWJjYzhjLTkzOTItNGRhZS1hNDBkLTg4OGFlZjZkMjhlMG0AAAAkNTQ5YzQxMDctMTQ5Mi00ZjhmLWE0ZWMtYTlkMmE2NmQ4YWE5bQAAADhQVTVBSVRFMU84VkRWTk1ITU9BQzc3RElLTU9HVERJQTY3MlM2RzFBQjAyT1MzNEg1TUUwPT09PW4GAEngLBONAWIAAVGA.E-f2MFdGMX7JTL2jwoHBdWcUd2G3UNz2JRZLbQrlf0k" # Token for global Relay FIREZONE_TOKEN: ".SFMyNTY.g2gDaAN3A25pbG0AAAAkZTgyZmNkYzEtMDU3YS00MDE1LWI5MGItM2IxOGYwZjI4MDUzbQAAADhDMTROR0E4N0VKUlIwM0c0UVBSMDdBOUM2Rzc4NFRTU1RIU0Y0VEk1VDBHRDhENkwwVlJHPT09PW4GADXgLBONAWIAAVGA.dShU17FgnvO2GLcTSnBBTDoqQ2tScuG7qjiyKhhlq8s" - RUST_LOG: "debug" + RUST_LOG: ${RUST_LOG:-debug} RUST_BACKTRACE: 1 FIREZONE_API_URL: ws://api:8081 build: diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 901e3d77a..79cf36188 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -82,7 +82,7 @@ android { buildConfigField( "String", "LOG_FILTER", - "\"connlib_client_android=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug," + + "\"connlib_client_android=debug,firezone_tunnel=debug,phoenix_channel=debug,connlib_shared=debug," + "boringtun=debug,snownet=debug,str0m=debug,connlib_client_shared=debug,info\"", ) } diff --git a/rust/headless-client/src/lib.rs b/rust/headless-client/src/lib.rs index 6ca874644..937cc5d36 100644 --- a/rust/headless-client/src/lib.rs +++ b/rust/headless-client/src/lib.rs @@ -77,7 +77,7 @@ pub(crate) const GIT_VERSION: &str = git_version::git_version!( /// Default log filter for the IPC service #[cfg(debug_assertions)] -const SERVICE_RUST_LOG: &str = "firezone_headless_client=debug,firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,boringtun=debug,snownet=debug,str0m=info,info"; +const SERVICE_RUST_LOG: &str = "firezone_headless_client=debug,firezone_tunnel=debug,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,boringtun=debug,snownet=debug,str0m=info,info"; /// Default log filter for the IPC service #[cfg(not(debug_assertions))] diff --git a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift index c7ad5f718..1faed470d 100644 --- a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift +++ b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift @@ -59,7 +59,7 @@ struct Settings: Equatable { authBaseURL: "https://app.firez.one", apiURL: "wss://api.firez.one", logFilter: - "firezone_tunnel=trace,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,snownet=debug,str0m=info,warn" + "firezone_tunnel=debug,phoenix_channel=debug,connlib_shared=debug,connlib_client_shared=debug,snownet=debug,str0m=info,warn" ) #else Settings(