[nfc] slight tracing simplifications

Author: fhanau

src/workerd/io/trace.c++

@@ -200,7 +200,7 @@ InvocationSpanContext InvocationSpanContext::newForInvocation(
     kj::Maybe<kj::EntropySource&> entropySource) {
   kj::Maybe<const InvocationSpanContext&> parent;
   auto traceId = triggerContext
-                     .map([&](auto& ctx) mutable -> TraceId {
+                     .map([&](auto& ctx) mutable {
     parent = ctx;
     return ctx.traceId;
   }).orDefault([&] { return TraceId::fromEntropy(entropySource); });
@@ -470,16 +470,12 @@ EmailEventInfo EmailEventInfo::clone() const {
 namespace {
 kj::Vector<TraceEventInfo::TraceItem> getTraceItemsFromTraces(
     kj::ArrayPtr<const kj::Own<Trace>> traces) {
-  return KJ_MAP(t, traces) -> TraceEventInfo::TraceItem {
-    return TraceEventInfo::TraceItem(mapCopyString(t->scriptName));
-  };
+  return KJ_MAP(t, traces) { return TraceEventInfo::TraceItem(mapCopyString(t->scriptName)); };
 }
 
 kj::Vector<TraceEventInfo::TraceItem> getTraceItemsFromReader(
     rpc::Trace::TraceEventInfo::Reader reader) {
-  return KJ_MAP(r,
-             reader
-                 .getTraces()) -> TraceEventInfo::TraceItem { return TraceEventInfo::TraceItem(r); };
+  return KJ_MAP(r, reader.getTraces()) { return TraceEventInfo::TraceItem(r); };
 }
 }  // namespace
 

src/workerd/io/tracer.c++

@@ -39,22 +39,22 @@ void TailStreamWriter::report(
   auto& s = KJ_UNWRAP_OR_RETURN(state);
 
   // The onset event must be first and must only happen once.
-  if (event.is<tracing::Onset>()) {
+  if (event.is<Onset>()) {
     KJ_ASSERT(!onsetSeen, "Tail stream onset already provided");
     onsetSeen = true;
   } else {
     KJ_ASSERT(onsetSeen, "Tail stream onset was not reported");
-    if (event.is<tracing::Outcome>()) {
+    if (event.is<Outcome>()) {
       outcomeSeen = true;
     }
   }
 
   // A zero spanId at the TailEvent level signifies that no spanId should be provided to the tail
   // worker (for Onset events). We go to great lengths to rule out getting an all-zero spanId by
   // chance (see SpanId::fromEntropy()), so this should be safe.
-  tracing::TailEvent tailEvent(context.getTraceId(), context.getInvocationId(),
-      context.getSpanId() == tracing::SpanId::nullId ? kj::none : kj::Maybe(context.getSpanId()),
-      timestamp, s.sequence++, kj::mv(event));
+  TailEvent tailEvent(context.getTraceId(), context.getInvocationId(),
+      context.getSpanId() == SpanId::nullId ? kj::none : kj::Maybe(context.getSpanId()), timestamp,
+      s.sequence++, kj::mv(event));
 
   // If the reporter returns false, then we will treat it as a close signal.
   if (!s.reporter(kj::mv(tailEvent))) state = kj::none;