Merge branch 'next' into tomasarrachea-bring-main

Author: TomasArrachea

.dockerignore

@@ -0,0 +1,22 @@
+# Rust
+target/
+debug/
+
+# Git
+.git/
+.github/
+
+# Docs build output
+book/
+
+# Node
+**/node_modules/
+**/package-lock.json
+**/pnpm-lock.yaml
+**/yarn.lock
+
+# Local env files
+.env
+
+# OS / editor
+.DS_Store

.github/workflows/build-docker.yml

@@ -0,0 +1,29 @@
+name: Docker Build Check
+
+on:
+  push:
+    branches: [main, next]
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  docker-build:
+    name: docker-build
+    runs-on: Linux-ARM64-Runner
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          file: ./Dockerfile
+          cache-from: type=gha
+          # Only save cache on push into next
+          cache-to: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' && 'type=gha,mode=max' || '' }}
+

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.13.1 (TBD)
+## 0.14.0 (TBD)
+
+- OpenTelemetry traces are now flushed before program termination on panic ([#222](https://github.com/0xMiden/miden-faucet/pull/222)).
+
+## 0.13.1 (2026-02-18)
 
 - Replaced hidden wallet icon with explicit "Connect Wallet" / "Disconnect" button next to recipient address input ([#228](https://github.com/0xMiden/miden-faucet/pull/228)).
 - Removed automatic wallet connection popup during private note minting ([#228](https://github.com/0xMiden/miden-faucet/pull/228)).

Cargo.lock

@@ -23,9 +23,9 @@ miden-faucet-lib       = { path = "crates/faucet", version = "0.13" }
 miden-pow-rate-limiter = { path = "crates/pow", version = "0.13" }
 
 # Miden dependencies.
-miden-client              = { version = "0.13" }
-miden-client-cli          = { version = "0.13" }
-miden-client-sqlite-store = { version = "0.13" }
+miden-client              = { branch = "next", git = "https://github.com/0xMiden/miden-client" }
+miden-client-cli          = { branch = "next", git = "https://github.com/0xMiden/miden-client" }
+miden-client-sqlite-store = { branch = "next", git = "https://github.com/0xMiden/miden-client" }
 
 # External dependencies
 anyhow                = { version = "1.0" }

Cargo.toml

@@ -35,6 +35,50 @@ miden-faucet start \
   --explorer-url https://testnet.midenscan.com \
   --network testnet
 ```
+## Docker
+
+```bash
+docker pull ghcr.io/0xmiden/miden-faucet:latest
+```
+
+**Data dir:** Store defaults to `/faucet/store.sqlite`. Mount a volume at `/faucet` for persistence.
+
+Run `init` first, then `start`. 
+
+**1. Init — new account (testnet):**
+
+```bash
+docker run --rm -v miden-faucet-data:/faucet \
+  -e MIDEN_FAUCET_NETWORK=testnet \
+  -e MIDEN_FAUCET_NODE_URL=https://rpc.testnet.miden.io \
+  -e MIDEN_FAUCET_TOKEN_SYMBOL=MIDEN \
+  -e MIDEN_FAUCET_DECIMALS=6 \
+  -e MIDEN_FAUCET_MAX_SUPPLY=100000000000000000 \
+  ghcr.io/0xmiden/miden-faucet:latest init
+```
+
+**2. Init — import existing account:**
+
+```bash
+docker run --rm -v miden-faucet-data:/faucet \
+  -e MIDEN_FAUCET_NETWORK=testnet \
+  -e MIDEN_FAUCET_NODE_URL=https://rpc.testnet.miden.io \
+  -e MIDEN_FAUCET_IMPORT_ACCOUNT_PATH=/faucet/accounts/faucet_miden.mac \
+  -v /path/to/your/accounts:/faucet/accounts:ro \
+  ghcr.io/0xmiden/miden-faucet:latest init
+```
+
+Put `faucet_miden.mac` in your local `./accounts` dir before running.
+
+**3. Start the faucet:**
+
+```bash
+docker run --rm -p 8000:8000 -p 8080:8080 \
+  -v miden-faucet-data:/faucet \
+  ghcr.io/0xmiden/miden-faucet:latest
+```
+
+See `bin/faucet/.env` for all options.
 
 ## Requesting tokens from a live faucet
 

README.md

@@ -1,4 +1,5 @@
 use std::str::FromStr;
+use std::sync::OnceLock;
 
 use anyhow::Result;
 use opentelemetry::trace::TracerProvider as _;
@@ -10,6 +11,12 @@ use tracing_opentelemetry::OpenTelemetryLayer;
 use tracing_subscriber::layer::{Filter, SubscriberExt};
 use tracing_subscriber::{Layer, Registry};
 
+/// Global tracer provider for flushing traces on panic.
+///
+/// This is necessary because the panic hook needs access to the tracer provider to flush
+/// pending spans before the program terminates.
+static TRACER_PROVIDER: OnceLock<SdkTracerProvider> = OnceLock::new();
+
 /// Configures [`setup_tracing`] to enable or disable the open-telemetry exporter.
 #[derive(Clone, Copy)]
 pub enum OpenTelemetry {
@@ -58,7 +65,15 @@ pub fn setup_tracing(otel: OpenTelemetry) -> Result<Option<OtelGuard>> {
     // `then_some`) to avoid crashing sync callers (with OpenTelemetry::Disabled set). Examples of
     // such callers are tests with logging enabled.
     let tracer_provider = if otel.is_enabled() {
-        Some(init_tracer_provider()?)
+        let provider = init_tracer_provider()?;
+
+        // Store the provider globally so the panic hook can flush it.
+        // SdkTracerProvider is internally reference-counted, so cloning is cheap.
+        TRACER_PROVIDER
+            .set(provider.clone())
+            .expect("setup_tracing should only be called once");
+
+        Some(provider)
     } else {
         None
     };
@@ -72,8 +87,21 @@ pub fn setup_tracing(otel: OpenTelemetry) -> Result<Option<OtelGuard>> {
     tracing::subscriber::set_global_default(subscriber).map_err(Into::<anyhow::Error>::into)?;
 
     // Register panic hook now that tracing is initialized.
-    std::panic::set_hook(Box::new(|info| {
+    // This chains with the default panic hook to preserve backtrace printing.
+    let default_hook = std::panic::take_hook();
+    std::panic::set_hook(Box::new(move |info| {
         tracing::error!(panic = true, "{info}");
+
+        // Flush traces before the program terminates.
+        // This ensures the panic trace is exported even though the OtelGuard won't be dropped.
+        if let Some(provider) = TRACER_PROVIDER.get()
+            && let Err(err) = provider.force_flush()
+        {
+            eprintln!("Failed to flush traces on panic: {err:?}");
+        }
+
+        // Call the default hook to print the backtrace.
+        default_hook(info);
     }));
 
     Ok(tracer_provider.map(|tracer_provider| OtelGuard { tracer_provider }))