@@ -22,15 +22,17 @@ var libp2pToXatuEventMap = map[string]string{
2222 pubsubpb .TraceEvent_REJECT_MESSAGE .String (): xatu .Event_LIBP2P_TRACE_REJECT_MESSAGE .String (),
2323 pubsubpb .TraceEvent_DUPLICATE_MESSAGE .String (): xatu .Event_LIBP2P_TRACE_DUPLICATE_MESSAGE .String (),
2424 pubsubpb .TraceEvent_DELIVER_MESSAGE .String (): xatu .Event_LIBP2P_TRACE_DELIVER_MESSAGE .String (),
25- pubsubpb .TraceEvent_ADD_PEER .String (): xatu .Event_LIBP2P_TRACE_ADD_PEER .String (),
26- pubsubpb .TraceEvent_REMOVE_PEER .String (): xatu .Event_LIBP2P_TRACE_REMOVE_PEER .String (),
27- pubsubpb .TraceEvent_RECV_RPC .String (): xatu .Event_LIBP2P_TRACE_RECV_RPC .String (),
28- pubsubpb .TraceEvent_SEND_RPC .String (): xatu .Event_LIBP2P_TRACE_SEND_RPC .String (),
29- pubsubpb .TraceEvent_DROP_RPC .String (): xatu .Event_LIBP2P_TRACE_DROP_RPC .String (),
30- pubsubpb .TraceEvent_JOIN .String (): xatu .Event_LIBP2P_TRACE_JOIN .String (),
31- pubsubpb .TraceEvent_LEAVE .String (): xatu .Event_LIBP2P_TRACE_LEAVE .String (),
32- pubsubpb .TraceEvent_GRAFT .String (): xatu .Event_LIBP2P_TRACE_GRAFT .String (),
33- pubsubpb .TraceEvent_PRUNE .String (): xatu .Event_LIBP2P_TRACE_PRUNE .String (),
25+ // ADD_PEER / REMOVE_PEER were removed from the gossipsub tracer in go-libp2p-pubsub v0.16
26+ // (replaced by per-stream ON_NEW_OUTBOUND_STREAM / ON_CLOSED_OUTBOUND_STREAM events), so they
27+ // are no longer mapped here. Peer connect/disconnect remains available via the host notifee
28+ // (CONNECTED / DISCONNECTED).
29+ pubsubpb .TraceEvent_RECV_RPC .String (): xatu .Event_LIBP2P_TRACE_RECV_RPC .String (),
30+ pubsubpb .TraceEvent_SEND_RPC .String (): xatu .Event_LIBP2P_TRACE_SEND_RPC .String (),
31+ pubsubpb .TraceEvent_DROP_RPC .String (): xatu .Event_LIBP2P_TRACE_DROP_RPC .String (),
32+ pubsubpb .TraceEvent_JOIN .String (): xatu .Event_LIBP2P_TRACE_JOIN .String (),
33+ pubsubpb .TraceEvent_LEAVE .String (): xatu .Event_LIBP2P_TRACE_LEAVE .String (),
34+ pubsubpb .TraceEvent_GRAFT .String (): xatu .Event_LIBP2P_TRACE_GRAFT .String (),
35+ pubsubpb .TraceEvent_PRUNE .String (): xatu .Event_LIBP2P_TRACE_PRUNE .String (),
3436}
3537
3638// handleHermesLibp2pEvent handles libp2p pubsub protocol level events.
@@ -54,21 +56,6 @@ func (p *Processor) handleHermesLibp2pEvent(
5456 networkStr := getNetworkID (clientMeta )
5557
5658 switch xatuEvent {
57- case xatu .Event_LIBP2P_TRACE_ADD_PEER .String ():
58- if ! p .events .AddPeerEnabled {
59- return nil
60- }
61-
62- // Record that we received this event
63- p .metrics .AddEvent (xatuEvent , networkStr )
64-
65- // Check if we should process this event based on trace/sharding config.
66- if ! p .ShouldTraceMessage (event , clientMeta , xatuEvent ) {
67- return nil
68- }
69-
70- return p .handleAddPeerEvent (ctx , clientMeta , traceMeta , event )
71-
7259 case xatu .Event_LIBP2P_TRACE_RECV_RPC .String ():
7360 // Always process RPC events to extract child events, even if parent is disabled
7461 // This allows child events (like IHAVE) to be captured independently
@@ -84,21 +71,6 @@ func (p *Processor) handleHermesLibp2pEvent(
8471 // This allows child events (like IHAVE) to be captured independently
8572 return p .handleSendRPCEvent (ctx , clientMeta , traceMeta , event , xatuEvent , networkStr )
8673
87- case xatu .Event_LIBP2P_TRACE_REMOVE_PEER .String ():
88- if ! p .events .RemovePeerEnabled {
89- return nil
90- }
91-
92- // Record that we received this event
93- p .metrics .AddEvent (xatuEvent , networkStr )
94-
95- // Check if we should process this event based on trace/sharding config.
96- if ! p .ShouldTraceMessage (event , clientMeta , xatuEvent ) {
97- return nil
98- }
99-
100- return p .handleRemovePeerEvent (ctx , clientMeta , traceMeta , event )
101-
10274 case xatu .Event_LIBP2P_TRACE_JOIN .String ():
10375 if ! p .events .JoinEnabled {
10476 return nil
@@ -216,45 +188,6 @@ func (p *Processor) handleHermesLibp2pEvent(
216188 return nil
217189}
218190
219- func (p * Processor ) handleRemovePeerEvent (
220- ctx context.Context ,
221- clientMeta * xatu.ClientMeta ,
222- traceMeta * libp2p.TraceEventMetadata ,
223- event * TraceEvent ,
224- ) error {
225- data , err := TraceEventToRemovePeer (event )
226- if err != nil {
227- return errors .Wrapf (err , "failed to convert event to remove peer event" )
228- }
229-
230- metadata , ok := proto .Clone (clientMeta ).(* xatu.ClientMeta )
231- if ! ok {
232- return fmt .Errorf ("failed to clone client metadata" )
233- }
234-
235- metadata .AdditionalData = & xatu.ClientMeta_Libp2PTraceRemovePeer {
236- Libp2PTraceRemovePeer : & xatu.ClientMeta_AdditionalLibP2PTraceRemovePeerData {
237- Metadata : traceMeta ,
238- },
239- }
240-
241- decoratedEvent := & xatu.DecoratedEvent {
242- Event : & xatu.Event {
243- Name : xatu .Event_LIBP2P_TRACE_REMOVE_PEER ,
244- DateTime : timestamppb .New (event .Timestamp .Add (p .clockDrift )),
245- Id : uuid .New ().String (),
246- },
247- Meta : & xatu.Meta {
248- Client : metadata ,
249- },
250- Data : & xatu.DecoratedEvent_Libp2PTraceRemovePeer {
251- Libp2PTraceRemovePeer : data ,
252- },
253- }
254-
255- return p .output .HandleDecoratedEvent (ctx , decoratedEvent )
256- }
257-
258191func (p * Processor ) handleJoinEvent (
259192 ctx context.Context ,
260193 clientMeta * xatu.ClientMeta ,
@@ -500,45 +433,6 @@ func (p *Processor) handleSendRPCEvent(
500433 return nil
501434}
502435
503- func (p * Processor ) handleAddPeerEvent (
504- ctx context.Context ,
505- clientMeta * xatu.ClientMeta ,
506- traceMeta * libp2p.TraceEventMetadata ,
507- event * TraceEvent ,
508- ) error {
509- data , err := TraceEventToAddPeer (event )
510- if err != nil {
511- return errors .Wrapf (err , "failed to convert event to add_peer event" )
512- }
513-
514- metadata , ok := proto .Clone (clientMeta ).(* xatu.ClientMeta )
515- if ! ok {
516- return fmt .Errorf ("failed to clone client metadata" )
517- }
518-
519- metadata .AdditionalData = & xatu.ClientMeta_Libp2PTraceAddPeer {
520- Libp2PTraceAddPeer : & xatu.ClientMeta_AdditionalLibP2PTraceAddPeerData {
521- Metadata : traceMeta ,
522- },
523- }
524-
525- decoratedEvent := & xatu.DecoratedEvent {
526- Event : & xatu.Event {
527- Name : xatu .Event_LIBP2P_TRACE_ADD_PEER ,
528- DateTime : timestamppb .New (event .Timestamp .Add (p .clockDrift )),
529- Id : uuid .New ().String (),
530- },
531- Meta : & xatu.Meta {
532- Client : metadata ,
533- },
534- Data : & xatu.DecoratedEvent_Libp2PTraceAddPeer {
535- Libp2PTraceAddPeer : data ,
536- },
537- }
538-
539- return p .output .HandleDecoratedEvent (ctx , decoratedEvent )
540- }
541-
542436func (p * Processor ) handleRecvRPCEvent (
543437 ctx context.Context ,
544438 clientMeta * xatu.ClientMeta ,
0 commit comments