add trace_id to metering events

metering.go

@@ -19,6 +19,7 @@ type Event struct {
 	UserID    string `json:"user_id"`
 	ApiKeyID  string `json:"api_key_id"`
 	IpAddress string `json:"ip_address"`
+	TraceId   string `json:"trace_id"`
 
 	Timestamp time.Time `json:"timestamp"`
 }
@@ -33,6 +34,9 @@ func (ev Event) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 	if ev.IpAddress != "" {
 		enc.AddString("ip_address", ev.IpAddress)
 	}
+	if ev.TraceId != "" {
+		enc.AddString("trace_id", ev.TraceId)
+	}
 
 	enc.AddString("endpoint", ev.Endpoint)
 	enc.AddTime("timestamp", ev.Timestamp)
@@ -52,6 +56,7 @@ func (ev Event) ToProto(network string) *pbmetering.Event {
 	pbev.UserId = ev.UserID
 	pbev.ApiKeyId = ev.ApiKeyID
 	pbev.IpAddress = ev.IpAddress
+	pbev.TraceId = ev.TraceId
 
 	pbev.Metrics = []*pbmetering.Metric{}
 	for k, v := range ev.Metrics {

pb/last_generate.txt

@@ -1,2 +1,2 @@
-generate.sh - Fri 28 Jul 2023 09:19:28 EDT - julien
-streamingfast/proto revision: cd783a0fb6717a2a1aa98db6b4cd4a8cf3568a3f
+generate.sh - Mon Aug  7 16:11:09 CEST 2023 - fred
+streamingfast/proto revision: e1df53e362aa4c4e9c884de5d51f5b671d8e93fa

proto/sf/metering/v1/metering.proto

@@ -17,7 +17,7 @@ message Events {
 
 message Event {
   string user_id = 1;
-  string api_key_id  = 2;
+  string api_key_id = 2;
   string ip_address = 3;
 
   // Defines the endpoint that emitted the event (sf.firehose.v1/Blocks ...)
@@ -26,6 +26,8 @@ message Event {
   // Defines the blockchain (eth-mainnet, sol-mainnet ...)
   string network = 5;
 
+  string trace_id = 6;
+
   repeated Metric metrics = 20;
 
   google.protobuf.Timestamp timestamp = 30;