Extract getEventType() helper in HibernatableWebSocketCustomEvent

Author: mar-cf

src/workerd/api/hibernatable-web-socket.c++

@@ -184,54 +184,48 @@ HibernatableWebSocketCustomEvent::HibernatableWebSocketCustomEvent(
       params(kj::mv(params)),
       manager(manager) {}
 
-// TODO(cleanup): Try to reduce duplication with consumeParams()
-kj::Maybe<tracing::EventInfo> HibernatableWebSocketCustomEvent::getEventInfo() const {
-  // Try to extract event type from params if available
+tracing::HibernatableWebSocketEventInfo::Type HibernatableWebSocketCustomEvent::getEventType()
+    const {
   KJ_SWITCH_ONEOF(params) {
     KJ_CASE_ONEOF(socketParams, HibernatableSocketParams) {
       KJ_SWITCH_ONEOF(socketParams.eventType) {
-        KJ_CASE_ONEOF(text, HibernatableSocketParams::Text) {
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Message()));
+        KJ_CASE_ONEOF(_, HibernatableSocketParams::Text) {
+          return tracing::HibernatableWebSocketEventInfo::Message{};
         }
-        KJ_CASE_ONEOF(data, HibernatableSocketParams::Data) {
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Message()));
+        KJ_CASE_ONEOF(_, HibernatableSocketParams::Data) {
+          return tracing::HibernatableWebSocketEventInfo::Message{};
         }
         KJ_CASE_ONEOF(close, HibernatableSocketParams::Close) {
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Close{close.code, close.wasClean}));
+          return tracing::HibernatableWebSocketEventInfo::Close{close.code, close.wasClean};
         }
-        KJ_CASE_ONEOF(error, HibernatableSocketParams::Error) {
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Error()));
+        KJ_CASE_ONEOF(_, HibernatableSocketParams::Error) {
+          return tracing::HibernatableWebSocketEventInfo::Error{};
         }
       }
     }
     KJ_CASE_ONEOF(reader, kj::Own<HibernationReader>) {
-      // Parse the HibernationReader to determine the actual event type
       auto payload = reader->getMessage().getPayload();
       switch (payload.which()) {
         case rpc::HibernatableWebSocketEventMessage::Payload::TEXT:
         case rpc::HibernatableWebSocketEventMessage::Payload::DATA:
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Message()));
+          return tracing::HibernatableWebSocketEventInfo::Message{};
         case rpc::HibernatableWebSocketEventMessage::Payload::CLOSE: {
           auto close = payload.getClose();
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Close{
-                close.getCode(), close.getWasClean()}));
+          return tracing::HibernatableWebSocketEventInfo::Close{
+            close.getCode(), close.getWasClean()};
         }
         case rpc::HibernatableWebSocketEventMessage::Payload::ERROR:
-          return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(
-              tracing::HibernatableWebSocketEventInfo::Error()));
+          return tracing::HibernatableWebSocketEventInfo::Error{};
       }
-      KJ_UNREACHABLE;
     }
   }
   KJ_UNREACHABLE;
 }
 
+kj::Maybe<tracing::EventInfo> HibernatableWebSocketCustomEvent::getEventInfo() const {
+  return tracing::EventInfo(tracing::HibernatableWebSocketEventInfo(getEventType()));
+}
+
 HibernatableSocketParams HibernatableWebSocketCustomEvent::consumeParams() {
   KJ_IF_SOME(p, params.tryGet<kj::Own<HibernationReader>>()) {
     kj::Maybe<HibernatableSocketParams> eventParameters;

src/workerd/api/hibernatable-web-socket.h

@@ -88,6 +88,9 @@ class HibernatableWebSocketCustomEvent final: public WorkerInterface::CustomEven
   // HibernatableSocketParams first.
   HibernatableSocketParams consumeParams();
 
+  // Peeks at params to extract the event type for tracing, without consuming them.
+  tracing::HibernatableWebSocketEventInfo::Type getEventType() const;
+
   uint16_t typeId;
   kj::OneOf<HibernatableSocketParams, kj::Own<HibernationReader>> params;
   kj::Maybe<uint32_t> timeoutMs;