try to add tx tracing for observer (#219)

Signed-off-by: Sam Yuan <[email protected]>

pkg/infra/observer/commitObserver.go

@@ -68,9 +68,31 @@ func (o *CommitObserver) Start() {
 		if r == nil {
 			panic("Received nil message, but expect a valid block instead. You could look into your peer logs for more info")
 		}
-		tx := len(r.GetBlock().Data.Data)
+		block := r.GetBlock()
+		tx := len(block.Data.Data)
 		n += tx
 		fmt.Printf("From Orderer Time %8.2fs\tBlock %6d\t Tx %6d\n", time.Since(o.Now).Seconds(), n, tx)
+		for _, data := range block.Data.Data {
+			txID := ""
+			env, err := protoutil.GetEnvelopeFromBlock(data)
+			if err != nil {
+				continue
+			}
+			payload, err := protoutil.UnmarshalPayload(env.Payload)
+			if err != nil {
+				continue
+			}
+			chdr, err := protoutil.UnmarshalChannelHeader(payload.Header.ChannelHeader)
+			if err != nil {
+				continue
+			}
+			if common.HeaderType(chdr.Type) == common.HeaderType_ENDORSER_TRANSACTION {
+				txID = chdr.TxId
+			}
+			if txID != "" {
+				basic.LogEvent(o.logger, string(txID), "BlockFromOrderer")
+			}
+		}
 		if o.n > 0 {
 			if n >= o.n {
 				close(o.finishCh)

pkg/infra/observer/observer.go

@@ -95,6 +95,9 @@ func (o *Observer) Start(errorCh chan error, blockCh chan<- *AddressedBlock, now
 		}
 
 		fb := r.Type.(*peer.DeliverResponse_FilteredBlock)
+		for _, b := range fb.FilteredBlock.FilteredTransactions {
+			basic.LogEvent(o.logger, b.Txid, "CommitAtPeer")
+		}
 		o.logger.Debugf("receivedTime %8.2fs\tBlock %6d\tTx %6d\t Address %s\n", time.Since(now).Seconds(), fb.FilteredBlock.Number, len(fb.FilteredBlock.FilteredTransactions), o.Address)
 
 		blockCh <- &AddressedBlock{fb.FilteredBlock, o.index, time.Since(now)}