feat: migrate our log library to tracing

.github/workflows/ci.yml

@@ -213,6 +213,8 @@ jobs:
         run: tests/fixtures/initdb.sh
         env:
           PGPORT: ${{ job.services.postgres.ports[5432] }}
+      - uses: taiki-e/install-action@763e3324d4fd026c9bd284c504378585777a87d5 # v2.62.57
+        with: { tool: sqlx-cli }
 
       # we want to test our docker images before we push them to the registry
       # this is done by
@@ -331,20 +333,19 @@ jobs:
           PLATFORM=linux/arm64
           TAG=${{ github.repository }}:linux
           export MARTIN_BUILD_ALL=-
-          export MARTIN_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -v $PWD/tests:/tests $TAG"
-          export MARTIN_CP_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -v $PWD/tests:/tests --entrypoint /usr/local/bin/martin-cp $TAG"
+          export MARTIN_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -e RUST_LOG_FORMAT=bare -v $PWD/tests:/tests $TAG"
+          export MARTIN_CP_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -e RUST_LOG_FORMAT=bare -v $PWD/tests:/tests --entrypoint /usr/local/bin/martin-cp $TAG"
           export MBTILES_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -v $PWD/tests:/tests --entrypoint /usr/local/bin/mbtiles $TAG"
           tests/test.sh
         env:
           DATABASE_URL: postgres://${{ env.PGUSER }}:${{ env.PGUSER }}@${{ env.PGHOST }}:${{ job.services.postgres.ports[5432] }}/${{ env.PGDATABASE }}?sslmode=require
-
       - name: Test linux/amd64 Docker image
         run: |
           PLATFORM=linux/amd64
           TAG=${{ github.repository }}:linux
           export MARTIN_BUILD_ALL=-
-          export MARTIN_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -v $PWD/tests:/tests $TAG"
-          export MARTIN_CP_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -v $PWD/tests:/tests --entrypoint /usr/local/bin/martin-cp $TAG"
+          export MARTIN_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -e RUST_LOG_FORMAT=bare -v $PWD/tests:/tests $TAG"
+          export MARTIN_CP_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -e RUST_LOG_FORMAT=bare -v $PWD/tests:/tests --entrypoint /usr/local/bin/martin-cp $TAG"
           export MBTILES_BIN="docker run --rm --net host --platform $PLATFORM -e DATABASE_URL -e AWS_REGION=eu-central-1 -e AWS_SKIP_CREDENTIALS=1 -v $PWD/tests:/tests --entrypoint /usr/local/bin/mbtiles $TAG"
           tests/test.sh
         env:

Cargo.toml

@@ -48,7 +48,6 @@ brotli = ">=5, <9"
 bytes = "1"
 clap = { version = "4", features = ["derive", "unstable-markdown", "wrap_help"] }
 criterion = { version = "0.8", features = ["async_futures", "async_tokio", "html_reports"] }
-ctor = "0.6.3"
 dashmap = { version = "6.1.0", features = ["serde", "inline", "rayon"] }
 deadpool-postgres = "0.14"
 enum-display = "0.2"
@@ -104,6 +103,10 @@ tiff = "0.10.1"
 tilejson = "0.4"
 tokio = { version = "1", features = ["macros"] }
 tokio-postgres-rustls = "0.13"
+tracing = "0.1.44"
+tracing-log = { version = "0.2.0", features = ["interest-cache"] }
+tracing-subscriber = { version = "0.3", default-features = false }
+tracing-test = "0.2"
 url = "2.5"
 walkdir = "2.5.0"
 xxhash-rust = { version = "0.8", features = ["xxh3"] }

docs/src/getting-involved.md

@@ -125,7 +125,7 @@ We add a breakpoint here in the [start of martin](https://github.com/maplibre/ma
 
 ```rust, ignore
 use clap::Parser;
-use log::{error, info, log_enabled};
+use tracing::{error, info};
 use martin::args::{Args, OsEnv};
 use martin::srv::new_server;
 use martin::{read_config, Config, MartinResult};

docs/src/pg-ssl-certificates.md

@@ -210,7 +210,7 @@ export PGSSLROOTCERT=./ca-cert.pem
 psql -h localhost -U postgres -d postgres -v
 
 # Debug Martin
-RUST_LOG=debug martin postgres://...
+RUST_LOG=debug RUST_LOG_FORMAT=pretty martin postgres://...
 ```
 
 These are the errors that can occur:

docs/src/troubleshooting.md

@@ -1,13 +1,14 @@
 ## Troubleshooting
 
-Log levels are controlled on a per-module basis, and by default all logging is disabled except for errors. Logging is
-controlled via the `RUST_LOG` environment variable. The value of this environment variable is a comma-separated list of
-logging directives.
+Log levels are controlled on a per-module basis, and by default all logging is disabled except for errors.
+Logging is controlled via the `RUST_LOG` environment variable.
+The value of this environment variable is a comma-separated list of logging directives.
 
 This will enable debug logging for all modules:
 
 ```bash
 export RUST_LOG=debug
+export RUST_LOG_FORMAT=pretty
 martin postgres://postgres@localhost/db
 ```
 
@@ -16,5 +17,9 @@ and `tokio_postgres` modules:
 
 ```bash
 export RUST_LOG=actix_web=info,martin=debug,tokio_postgres=debug
+export RUST_LOG_FORMAT=pretty
 martin postgres://postgres@localhost/db
 ```
+
+We also allow you to control the format of the logs via the `RUST_LOG_FORMAT` environment variable.
+For troubleshooting, `pretty` or `full` are likely the most useful formats.