Merge branch 'main' into cog_web_5

Author: CommanderStorm

Cargo.lock

@@ -31,6 +31,7 @@ actix-http = "3"
 actix-middleware-etag = "0.4.4"
 actix-rt = "2"
 actix-web = "4"
+actix-web-prom = "0.10.0"
 actix-web-static-files = "4"
 anyhow = "1.0"
 approx = "0.5.1"
@@ -56,13 +57,13 @@ itertools = "0.14"
 json-patch = "4"
 lambda-web = { version = "0.2.1", features = ["actix4"] }
 log = "0.4"
-martin-tile-utils = { path = "./martin-tile-utils", version = "0.6.1" }
+martin-tile-utils = { path = "./martin-tile-utils", version = "0.6.2" }
 mbtiles = { path = "./mbtiles", version = "0.12.2" }
-md5 = "0.7.0"
+md5 = "0.8.0"
 moka = { version = "0.12", features = ["future"] }
 num_cpus = "1"
 pbf_font_tools = { version = "2.5.1", features = ["freetype"] }
-pmtiles = { version = "0.14", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots", "aws-s3-async"] }
+pmtiles = { version = "0.15", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots", "aws-s3-async"] }
 png = "0.17.14"
 postgis = "0.9"
 postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }
@@ -71,7 +72,7 @@ pprof = { version = "0.15", features = ["flamegraph", "criterion"] }
 pretty_assertions = "1"
 regex = "1"
 rstest = "0.25"
-rustls = "0.23.28"
+rustls = "0.23.29"
 # ring feature does not require NASM windows executable, but works slower
 #rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12", "ring"] }
 rustls-native-certs = "0.8"
@@ -91,7 +92,7 @@ subst = { version = "0.3", features = ["yaml"] }
 tempfile = "3.20.0"
 testcontainers-modules = { version = "0.12.1", features = ["postgres"] }
 thiserror = "2"
-tiff = "0.9.1"
+tiff = "0.10.0"
 tilejson = "0.4"
 tokio = { version = "1", features = ["macros"] }
 tokio-postgres-rustls = "0.13"

Cargo.toml

@@ -44,6 +44,14 @@ preferred_encoding: gzip
 # Enable or disable Martin web UI. At the moment, only allows `enable-for-all` which enables the web UI for all connections. This may be undesirable in a production environment. [default: disable]
 web_ui: disable
 
+# Advanced monitoring options
+observability:
+  # Configure metrics reported under `/_/metrics`
+  metrics:
+    # Add these labels to every metric
+    # Example: `{ env: prod, server: martin }`
+    add_labels: {}
+
 # CORS Configuration
 #
 # Defaults to `cors: true`, which allows all origins.
@@ -196,7 +204,7 @@ postgres:
 pmtiles:
   # Allows forcing path style URLs for S3 buckets [default: false]
   #
-  # A path style URL is a URL that uses the bucket name as part of the path like mys3.com/somebucket instead of the hostname somebucket.mys3.com
+  # A path style URL is a URL that uses the bucket name as part of the path like example.org/some_bucket instead of the hostname some_bucket.example.org
   force_path_style: false
   # Skip loading credentials for S3 buckets [default: false]
   #

docs/src/config-file.md

@@ -45,7 +45,7 @@ pmtiles:
 
 We also support forcing path style URLs for S3 buckets via the environment variable `AWS_S3_FORCE_PATH_STYLE=1` or configuration key `force_path_style: true`.
 This allows you to use this functionality for [`MinIO`](https://min.io/) or similar s3-compatible instances which use path style URLs.
-A path style URL is a URL that uses the bucket name as part of the path (`mys3.com/somebucket`) instead of the hostname (`somebucket.mys3.com`).
+A path style URL is a URL that uses the bucket name as part of the path (`example.org/some_bucket`) instead of the hostname (`some_bucket.example.org`).
 
 Example configuration:
 

docs/src/sources-files.md

@@ -16,6 +16,7 @@ Martin data is available via the HTTP `GET` endpoints:
 | `/font/{font1},…,{fontN}/{start}-{end}`  | [Composite Font source](sources-fonts.md)      |
 | `/style/{style}`                         | [Style source](sources-styles.md)              |
 | `/health`                                | Martin server health check: returns 200 `OK`   |
+| `/_/metrics`                             | Martin server Prometheus metrics               |
 
 ### Duplicate Source ID
 

docs/src/using.md

@@ -55,8 +55,8 @@ bench-http:  (cargo-install 'oha')
 bench-server: start
     cargo run --release -- tests/fixtures/mbtiles tests/fixtures/pmtiles
 
-# Run integration tests and save its output as the new expected output (ordering is important, but in some cases run `bless-tests` before others)
-bless: restart clean-test bless-insta-martin bless-insta-mbtiles bless-tests bless-int
+# Run integration tests and save its output as the new expected output (ordering is important)
+bless: restart clean-test bless-insta-martin bless-insta-mbtiles bless-int
 
 # Run integration tests and save its output as the new expected output
 bless-insta-cp *args:  (cargo-install 'cargo-insta')
@@ -77,10 +77,6 @@ bless-int:
     tests/test.sh
     rm -rf tests/expected && mv tests/output tests/expected
 
-# Run test with bless-tests feature
-bless-tests:
-    cargo test -p martin --features bless-tests
-
 # Build and open mdbook documentation
 book:  (cargo-install 'mdbook')
     mdbook serve docs --open --port 8321
@@ -92,11 +88,10 @@ check:
     cargo check --all-targets -p mbtiles --no-default-features
     cargo check --all-targets -p martin
     cargo check --all-targets -p martin --no-default-features
-    cargo check --all-targets -p martin --no-default-features --features fonts
-    cargo check --all-targets -p martin --no-default-features --features mbtiles
-    cargo check --all-targets -p martin --no-default-features --features pmtiles
-    cargo check --all-targets -p martin --no-default-features --features postgres
-    cargo check --all-targets -p martin --no-default-features --features sprites
+    for feature in $({{just_executable()}} get-features); do \
+        echo "Checking '$feature' feature" >&2 ;\
+        cargo check --all-targets -p martin --no-default-features --features $feature ;\
+    done
 
 # Verify doc build
 check-doc:
@@ -192,6 +187,10 @@ fmt-md:
 fmt-sql:
     docker run -it --rm -v $PWD:/sql sqlfluff/sqlfluff:latest fix --dialect=postgres --exclude-rules=AL07,LT05,LT12
 
+# Get all testable features of the main crate as space-separated list
+get-features:
+    cargo metadata --format-version=1 --no-deps --manifest-path Cargo.toml | jq -r '.packages[] | select(.name == "{{main_crate}}") | .features | keys[] | select(. != "default")' | tr '\n' ' '
+
 # Do any git command, ensuring that the testing environment is set up. Accepts the same arguments as git.
 [no-exit-message]
 git *args: start

justfile

@@ -1,6 +1,6 @@
 [package]
 name = "martin-tile-utils"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
 description = "Utilities to help with map tile processing, such as type and compression detection. Used by the MapLibre's Martin tile server."
 keywords = ["maps", "tiles", "mvt", "tileserver"]

martin-tile-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "martin"
-version = "0.17.0"
+version = "0.18.0"
 authors = ["Stepan Kuzmin <[email protected]>", "Yuri Astrakhan <[email protected]>", "MapLibre contributors"]
 description = "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support"
 keywords = ["maps", "tiles", "mbtiles", "pmtiles", "postgis"]
@@ -52,23 +52,24 @@ name = "bench"
 harness = false
 
 [features]
-default = ["webui", "fonts", "lambda", "mbtiles", "pmtiles", "cog", "postgres", "sprites", "styles"]
-webui = ["dep:actix-web-static-files", "dep:static-files", "dep:walkdir"]
+default = ["cog", "fonts", "lambda", "mbtiles", "metrics", "pmtiles", "postgres", "sprites", "styles", "webui"]
+cog = ["dep:image", "dep:imageproc", "dep:png", "dep:tiff"]
 fonts = ["dep:bit-set", "dep:pbf_font_tools"]
 lambda = ["dep:lambda-web"]
 mbtiles = ["dep:mbtiles"]
+metrics = ["dep:actix-web-prom"]
 pmtiles = ["dep:pmtiles"]
-cog = ["dep:tiff", "dep:png", "dep:image", "dep:imageproc"]
-styles = ["dep:walkdir", "tokio/fs"]
 postgres = ["dep:deadpool-postgres", "dep:json-patch", "dep:postgis", "dep:postgres", "dep:postgres-protocol", "dep:semver", "dep:tokio-postgres-rustls"]
 sprites = ["dep:spreet", "tokio/fs"]
-bless-tests = []
+styles = ["dep:walkdir", "tokio/fs"]
+webui = ["dep:actix-web-static-files", "dep:static-files", "dep:walkdir"]
 
 [dependencies]
 actix-cors.workspace = true
 actix-http.workspace = true
 actix-middleware-etag.workspace = true
 actix-rt.workspace = true
+actix-web-prom = { workspace = true, optional = true }
 actix-web-static-files = { workspace = true, optional = true }
 actix-web.workspace = true
 async-trait.workspace = true
@@ -101,10 +102,10 @@ rustls-native-certs.workspace = true
 rustls-pemfile.workspace = true
 rustls.workspace = true
 semver = { workspace = true, optional = true }
+serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
 serde_yaml.workspace = true
-serde.workspace = true
 spreet = { workspace = true, optional = true }
 static-files = { workspace = true, optional = true }
 subst.workspace = true
@@ -118,8 +119,8 @@ walkdir = { workspace = true, optional = true }
 xxhash-rust.workspace = true
 
 [build-dependencies]
-walkdir = { workspace = true, optional = true }
 static-files = { workspace = true, optional = true }
+walkdir = { workspace = true, optional = true }
 
 [dev-dependencies]
 anyhow.workspace = true
@@ -130,8 +131,8 @@ indoc.workspace = true
 insta = { workspace = true, features = ["json", "yaml"] }
 pprof.workspace = true
 rstest.workspace = true
-testcontainers-modules.workspace = true
 tempfile.workspace = true
+testcontainers-modules.workspace = true
 
 [lints]
 workspace = true

martin/Cargo.toml

@@ -4,15 +4,32 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="icon" type="image/x-icon" href="/_/assets/favicon.ico">
-    <meta property="og:url" content="https://maplibre.org"/>
-    <meta property="og:title" content="Martin — vector tiles server"/>
-    <meta property="og:description"
-          content="Blazing fast and lightweight PostGIS, MBtiles and PMtiles tile server, tile generation, and mbtiles tooling."/>
-    <meta property="og:image" content="/martin.png"/>
+    <title>Martin Tileserver Dashboard</title>
+    <meta property="description" content="Blazing fast and lightweight PostGIS, MBtiles and PMtiles tile server, tile generation, and mbtiles tooling."/>
     <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="/_/assets/favicons/ms-icon-144x144.png">
-    <meta name="theme-color" content="#ffffff">
-    <title>Martin — vector tiles server</title>
+    <meta name="theme-color" content="#7300ff">
+    <meta name="keywords" content="vector tiles, PostGIS, PMTiles, MBTiles, tile server, mapping, GIS, PostgreSQL, Rust, MapLibre" />
+    <meta name="author" content="Stepan Kuzmin, Yuri Astrakhan, and MapLibre contributors" />
+    <meta name="copyright" content="Copyright (c) 2018 Urbica, Copyright (c) 2022 MapLibre contributors" />
+
+    <!-- Open Graph / Facebook -->
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="https://martin.maplibre.org/" />
+    <meta property="og:site_name" content="Martin Tileserver" />
+    <meta property="og:locale" content="en_US" />
+    <meta property="og:title" content="Martin Tileserver Dashboard" />
+    <meta property="og:description" content="Blazing fast and lightweight PostGIS, MBtiles and PMtiles tile server, tile generation, and mbtiles tooling" />
+    <meta property="og:image" content="/_/assets/og-image.png" />
+    <meta property="og:image:alt" content="Martin Tileserver logo and dashboard interface" />
+    <meta property="og:image:width" content="1200" />
+    <meta property="og:image:height" content="630" />
+
+    <!-- Twitter -->
+    <meta property="twitter:card" content="summary_large_image" />
+    <meta property="twitter:title" content="Martin Tileserver Dashboard" />
+    <meta property="twitter:description" content="Blazing fast and lightweight PostGIS, MBtiles and PMtiles tile server, tile generation, and mbtiles tooling" />
+    <meta property="twitter:image" content="/_/assets/og-image.png" />
+    <meta property="twitter:image:alt" content="Martin Tileserver logo and dashboard interface" />
 </head>
 <body>
 <noscript>