Merge branch 'main' into superfluffy/forma-restart-logic

astriaorg · Feb 10, 2025 · b2af17c · b2af17c
2 parents 1e1668e + 60eefa9
commit b2af17c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/reusable-docker-build.yml b/.github/workflows/reusable-docker-build.yml
@@ -67,7 +67,8 @@ jobs:
           tags: |
             type=ref,event=pr
             type=match,pattern=refs/tags/${{ inputs.binary-name }}-v(.*),group=1,enable=${{ startsWith(env.FULL_REF, 'refs/tags/') }},value=${{ env.FULL_REF }}
-            type=sha
+            type=sha,format=short
+            type=sha,format=long
             # set the actual commit SHA from the PR head instead of from the PR merge commit (alternatively, we could checkout the PR head in actions/checkout)
             type=raw,value=sha-${{ github.event.pull_request.head.sha || github.sha }},enable=${{ startsWith(env.FULL_REF, 'refs/pull/') }}
             # set latest tag for `main` branch

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -5,7 +5,7 @@ astria-bridge-withdrawer/ @SuperFluffy @joroshiba
 astria-build-info/ @SuperFluffy @joroshiba
 astria-cli/ @SuperFluffy @joroshiba
 astria-composer/ @SuperFluffy @joroshiba
-astria-conductor/ @SuperFluffy @joroshiba
+astria-conductor/ @SuperFluffy @ethanoroshiba @joroshiba
 astria-config/ @SuperFluffy @joroshiba
 astria-core/ @SuperFluffy @fraser999
 astria-core-address/ @SuperFluffy @fraser999

diff --git a/crates/astria-telemetry/CHANGELOG.md b/crates/astria-telemetry/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Emit events on span construction or deletion in human readable logs
+  [#1947](https://github.com/astriaorg/astria/pull/1947).
+
 ### Added
 
 - Initial release.
diff --git a/crates/astria-telemetry/src/lib.rs b/crates/astria-telemetry/src/lib.rs
@@ -34,6 +34,7 @@ use tracing_subscriber::{
         LevelFilter,
         ParseError,
     },
+    fmt::format::FmtSpan,
     layer::SubscriberExt as _,
     util::{
         SubscriberInitExt as _,
@@ -229,7 +230,11 @@ impl Config {
         let mut pretty_printer = None;
         if force_stdout || std::io::stdout().is_terminal() {
             if pretty_print {
-                pretty_printer = Some(tracing_subscriber::fmt::layer().compact());
+                pretty_printer = Some(
+                    tracing_subscriber::fmt::layer()
+                        .compact()
+                        .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE),
+                );
             } else {
                 tracer_provider = tracer_provider.with_simple_exporter(
                     SpanExporter::builder()