feat: migrate our log library to tracing by CommanderStorm · Pull Request #2494 · maplibre/martin

CommanderStorm · 2026-01-09T23:23:12Z

This PR is the next time I am trying to migrate from log to tracing.

This time, it is the simple implementation again with the only config being the MARTIN_LOG_FORMAT env-var options.
I chose to default to pretty in development and compact in release builds, since this likely matches most users preferences pretty well.

Adding this to the CLI would be really simple, but lets not do that now to prevent the previous bikeshedding.

Resolves Allow jsonl-style logging for servers #836
Unblocks Use indicatif or prodash crates for CLI status reporting #1024

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

martin/src/config/file/file_config.rs

martin/src/bin/martin-cp.rs

martin/src/bin/martin.rs

This reverts commit 601d94c.

justfile

.github/workflows/ci.yml

nyurik

Looks good! One request before you merge: I do not like custom env vars MARTIN_FORMAT / MARTIN_CP_FORMAT when they are right next to a standard RUST_LOG. I searched github and chatted - seems RUST_LOG_FORMAT is a fairly common one for this.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

nyurik

should init_tracing get the value from the env itself, rather than getting it via a parameter? I'm ok either way, just something to consider for simplicity

CommanderStorm · 2026-01-13T09:14:46Z

I think the "how does this work" is simpler to understand if we pull the env-var-parsing and changing one level up instead of abstracting it away.

What we are doing there is resonably non-standard imo.

## 🤖 New release * `martin-tile-utils`: 0.6.8 -> 0.6.9 (✓ API compatible changes) * `mbtiles`: 0.15.0 -> 0.15.1 (✓ API compatible changes) * `martin-core`: 0.2.5 -> 0.2.6 (✓ API compatible changes) * `martin`: 1.2.0 -> 1.3.0 <details><summary>Changelog</summary> ## `mbtiles` <blockquote> ## [0.15.1](mbtiles-v0.15.0...mbtiles-v0.15.1) - 2026-01-27 ### Added - add MLT decoding support ([#2512](#2512)) - migrate our log library to tracing ([#2494](#2494)) ### Other - unignore `diff_and_patch_bsdiff` test with unique SQLite database names ([#2480](#2480)) - *(mbtiles)* remove the prefix-ism around how files are named for binary diff copy and simpify their naming ([#2478](#2478)) - *(mbtiles)* add assertion messages what we are checking to the copy tests ([#2477](#2477)) </blockquote> ## `martin-core` <blockquote> ## [0.2.6](martin-core-v0.2.5...martin-core-v0.2.6) - 2026-01-27 ### Added - migrate our log library to tracing ([#2494](#2494)) - *(martin-core)* Allow glyph ranges more than 0xFFFF ([#2438](#2438)) ### Fixed - *(perf)* Remove FontSources.masks as they were consuming large amounts of memory even when no font sources were set ([#2519](#2519)) - improve error message if no SVG sprite files are present ([#2516](#2516)) ### Other - move our imports to tracing ([#2500](#2500)) - *(deps)* shear our dependencys ([#2497](#2497)) </blockquote> ## `martin` <blockquote> ## [1.3.0](martin-v1.2.0...martin-v1.3.0) - 2026-01-27 ### Added - *(srv)* Add `route_prefix` configuration for native subpath support without the need of a reverse proxy override ([#2523](#2523)) - add MLT decoding support ([#2512](#2512)) - migrate our log library to tracing ([#2494](#2494)) - improve martin-cp progress output time estimate ([#2491](#2491)) - *(pg)* include ID column info for tables ([#2485](#2485)) - *(pg)* support PostgreSQL materialized views ([#2279](#2279)) - *(martin-core)* Allow glyph ranges more than 0xFFFF ([#2438](#2438)) ### Fixed - *(ui)* clipboard copy for http://0.0.0.0:3000 and unify implementations ([#2487](#2487)) - the `Copy` icon displaying nicely, next to the text and with enough padding ot all items ([#2483](#2483)) - update copy text to include icon for better visibility ([#2482](#2482)) - *(perf)* Remove FontSources.masks as they were consuming large amounts of memory even when no font sources were set ([#2519](#2519)) - improve error message if no SVG sprite files are present ([#2516](#2516)) ### Other - move our request logging to tracing ([#2508](#2508)) - move our imports to tracing ([#2500](#2500)) - *(deps)* shear our dependencys ([#2497](#2497)) - *(ui)* adjust margin for copy icon in URL component ([#2489](#2489)) - unignore `diff_and_patch_bsdiff` test with unique SQLite database names ([#2480](#2480)) - *(mbtiles)* remove the prefix-ism around how files are named for binary diff copy and simpify their naming ([#2478](#2478)) - *(mbtiles)* add assertion messages what we are checking to the copy tests ([#2477](#2477)) </blockquote> </details> --- This PR was generated with [release-plz](https://github.com/release-plz/release-plz/). --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

CommanderStorm added 4 commits January 9, 2026 23:18

migrate to tracing

6dbb97f

remove ctor

0381c27

fmt

a3184cf

slight optimisation

6334750

CommanderStorm requested review from Copilot and nyurik January 9, 2026 23:23

Copilot started reviewing on behalf of CommanderStorm January 9, 2026 23:23 View session

CommanderStorm changed the title ~~feat: Tracing v5~~ feat: migrate our log library to tracing (attempt 5) Jan 9, 2026

CommanderStorm changed the title ~~feat: migrate our log library to tracing (attempt 5)~~ feat: migrate our log library to tracing Jan 9, 2026

fix fmt

8c04dea

This comment was marked as resolved.

Sign in to view

CommanderStorm and others added 5 commits January 10, 2026 00:34

fix clippy issues

6e21c10

various doc issues

ec718e9

add the bare format for tests

2240c12

adjust to the new, more stable log format

ba19df5

Merge branch 'main' into tracing-v5

9913607

CommanderStorm requested a review from Copilot January 10, 2026 01:05

Copilot started reviewing on behalf of CommanderStorm January 10, 2026 01:05 View session

Fix formatting in Cargo.toml for tracing-subscriber

3d72cf6

This comment was marked as resolved.

Sign in to view

CommanderStorm and others added 4 commits January 10, 2026 02:12

Update martin/src/logging.rs

e9a4fec

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update martin/src/logging.rs

0f26678

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

fix an issue noticed by copilot

7f2f50c

cleanup env var usage

b3c07cb

nyurik reviewed Jan 10, 2026

View reviewed changes

martin/src/config/file/file_config.rs Outdated Show resolved Hide resolved

remove another occurance

22d6b01

nyurik reviewed Jan 10, 2026

View reviewed changes

martin/src/bin/martin-cp.rs Outdated Show resolved Hide resolved

CommanderStorm commented Jan 10, 2026

View reviewed changes

martin/src/bin/martin-cp.rs Outdated Show resolved Hide resolved

CommanderStorm commented Jan 10, 2026

View reviewed changes

martin/src/bin/martin.rs Outdated Show resolved Hide resolved

Apply suggestions from code review

2af2bf9

CommanderStorm added 3 commits January 11, 2026 14:54

fix naming of env params

4b37fd0

Reapply "try if maybe the quoting is the issue?"

5043561

This reverts commit 601d94c.

make the just executable name more reliable

e0d3021

CommanderStorm commented Jan 11, 2026

View reviewed changes

justfile Outdated Show resolved Hide resolved

CommanderStorm added 2 commits January 11, 2026 15:05

revert to short names for constency

468bd13

fix typo with args after run-in-docker-image being missing

e84f64d

CommanderStorm commented Jan 12, 2026

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

Apply suggestion from @CommanderStorm

6ec4fe4

CommanderStorm mentioned this pull request Jan 12, 2026

chore(ci): move docker testing to just #2496

Draft

CommanderStorm marked this pull request as draft January 12, 2026 13:10

CommanderStorm and others added 4 commits January 12, 2026 17:54

minimise the CI change to another PR

b2328ac

add to docs

055add5

Merge branch 'main' into tracing-v5

400c504

how did this make it past CI????

08a6ea8

CommanderStorm commented Jan 12, 2026

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

Apply suggestion from @CommanderStorm

adb1032

CommanderStorm commented Jan 12, 2026

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

Apply suggestion from @CommanderStorm

d8330b0

CommanderStorm marked this pull request as ready for review January 13, 2026 00:35

CommanderStorm requested review from Copilot and nyurik January 13, 2026 00:35

nyurik approved these changes Jan 13, 2026

View reviewed changes

Copilot AI reviewed Jan 13, 2026

View reviewed changes

MARTIN_FORMAT -> RUST_LOG_FORMAT

45345de

CommanderStorm enabled auto-merge (squash) January 13, 2026 09:05

nyurik reviewed Jan 13, 2026

View reviewed changes

CommanderStorm merged commit 34a66dc into maplibre:main Jan 14, 2026
80 of 84 checks passed

CommanderStorm mentioned this pull request Jan 10, 2026

chore: release #2481

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: migrate our log library to tracing#2494

feat: migrate our log library to tracing#2494
CommanderStorm merged 41 commits intomaplibre:mainfrom
CommanderStorm:tracing-v5

CommanderStorm commented Jan 9, 2026 •

edited

Loading

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nyurik left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

nyurik left a comment

Uh oh!

CommanderStorm commented Jan 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

CommanderStorm commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nyurik left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

nyurik left a comment

Choose a reason for hiding this comment

Uh oh!

CommanderStorm commented Jan 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

CommanderStorm commented Jan 9, 2026 •

edited

Loading