Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
41e08bb
move the tracing to its own crate
CommanderStorm Mar 12, 2025
d1cc621
Merge branch 'main' into martin-tracing
CommanderStorm Mar 12, 2025
1bdadb1
fix wrong dependency definition in cargo.toml
CommanderStorm Mar 12, 2025
ec4f664
Merge branch 'main' into martin-tracing
CommanderStorm Mar 15, 2025
ff5da15
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 15, 2025
8e3513b
clairify why test_log_level_env_var 'can' use std::env::set_var
CommanderStorm Mar 15, 2025
e387890
Merge branch 'maplibre:main' into martin-tracing
CommanderStorm Mar 25, 2025
53fd8e0
Merge branch 'main' into martin-tracing
CommanderStorm May 5, 2025
5c76696
cargo update
CommanderStorm May 5, 2025
99331ae
cargo update
CommanderStorm May 5, 2025
e16e32d
update the testcases and allow dot notation for accessing strings
CommanderStorm May 5, 2025
26f48db
fix clippy issue
CommanderStorm May 5, 2025
810d16c
Merge branch 'main' into martin-tracing
CommanderStorm May 10, 2025
8063a4c
fix typo in README spotted by copilot
CommanderStorm May 10, 2025
b82224e
fix another typo found by copilot
CommanderStorm May 10, 2025
7d8e5b6
Merge branch 'main' into martin-tracing
CommanderStorm May 26, 2025
b88c159
Merge branch 'main' into martin-tracing
CommanderStorm Jun 18, 2025
4bb285d
fix clippy lint
CommanderStorm Jun 18, 2025
d33ac05
Merge branch 'main' into martin-tracing
CommanderStorm Jul 9, 2025
54dc089
Merge branch 'main' into martin-tracing
CommanderStorm Jul 10, 2025
5186f33
apply formatting changes and do cargo update
CommanderStorm Jul 10, 2025
f957800
Merge branch 'main' into martin-tracing
CommanderStorm Nov 20, 2025
e212e87
fix lockfile
CommanderStorm Nov 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 132 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
resolver = "3"
members = ["martin", "martin-core", "martin-tile-utils", "mbtiles"]
members = ["martin", "martin-core", "martin-tracing-utils", "martin-tile-utils", "mbtiles"]

[workspace.package]
edition = "2024"
Expand Down Expand Up @@ -104,6 +104,10 @@ tiff = "0.10.1"
tilejson = "0.4"
tokio = { version = "1", features = ["macros"] }
tokio-postgres-rustls = "0.13"
tracing = { version = "0.1.41", features = ["log"] }
tracing-log = { version ="0.2.0", features = ["interest-cache"] }
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
tracing-test = { version = "0.2.5",features = ["no-env-filter"] }
url = "2.5"
walkdir = "2.5.0"
xxhash-rust = { version = "0.8", features = ["xxh3"] }
Expand Down
26 changes: 26 additions & 0 deletions martin-tracing-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[package]
name = "martin-tracing-utils"
version = "0.1.0"
authors = ["Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
description = "Utilities to help with tracing. Used by the MapLibre's Martin tile server."
keywords = ["tracing", "mvt", "tileserver"]
categories = ["science::geo", "web-programming"]
edition.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true
homepage.workspace = true

[dependencies]
clap.workspace = true
serde.workspace = true
serde_yaml.workspace = true
tracing-log.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true

[dev-dependencies]
tempfile.workspace = true

[lints]
workspace = true
24 changes: 24 additions & 0 deletions martin-tracing-utils/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# martin-tracing-utils

[![docs.rs docs](https://docs.rs/martin-tracing-utils/badge.svg)](https://docs.rs/martin-tracing-utils)
[![](https://img.shields.io/badge/Slack-%23maplibre--martin-blueviolet?logo=slack)](https://slack.openstreetmap.us/)
[![GitHub](https://img.shields.io/badge/github-maplibre/martin-8da0cb?logo=github)](https://github.com/maplibre/martin)
[![crates.io version](https://img.shields.io/crates/v/martin-tracing-utils.svg)](https://crates.io/crates/martin-tracing-utils)
[![CI build](https://github.com/maplibre/martin/actions/workflows/ci.yml/badge.svg)](https://github.com/maplibre/martin/actions)

A library to help tile servers like [Martin](https://maplibre.org/martin) do tracing ("logging, but slightly fancier").

## License

Licensed under either of

* Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
at your option.

### Contribution

Unless you explicitly state otherwise, any contribution intentionally
submitted for inclusion in the work by you, as defined in the
Apache-2.0 license, shall be dual licensed as above, without any
additional terms or conditions.
Loading
Loading