Fix cache meta trace tags

Currently the meta is attempted to be logged in a hit span that may or
may not exist (or has not started) depending on the cache phase.

1 files changed, 4 insertions, 3 deletions

diff --git a/pingora-cache/src/lib.rs b/pingora-cache/src/lib.rs
index a82c799..6bebbd3 100644
--- a/pingora-cache/src/lib.rs
+++ b/pingora-cache/src/lib.rs
@@ -492,14 +492,14 @@ impl HttpCache {
                         inner.lock = Some(lock.lock(key));
                     }
                 }
-                inner.traces.log_meta(&meta);
+                inner.traces.start_hit_span(phase, hit_status);
+                inner.traces.log_meta_in_hit_span(&meta);
                 if let Some(eviction) = inner.eviction {
                     // TODO: make access() accept CacheKey
                     let cache_key = key.to_compact();
                     // FIXME: get size
                     eviction.access(&cache_key, 0, meta.0.internal.fresh_until);
                 }
-                inner.traces.start_hit_span(phase, hit_status);
                 inner.meta = Some(meta);
                 inner.body_reader = Some(hit_handler);
             }
@@ -717,7 +717,8 @@ impl HttpCache {
             // TODO: store the staled meta somewhere else for future use?
             CachePhase::Stale | CachePhase::Miss => {
                 let inner = self.inner_mut();
-                inner.traces.log_meta(&meta);
+                // TODO: have a separate expired span?
+                inner.traces.log_meta_in_miss_span(&meta);
                 inner.meta = Some(meta);
             }
             _ => panic!("wrong phase {:?}", self.phase),