Merge pull request #786 from forta-network/revert-785-ali/forta-1076-…

…add-subscription-info-to-combiner-metrics Revert "Add subscription info to subscription action metrics"
forta-network · Jul 10, 2023 · 70f3627 · 70f3627
2 parents 54c7faa + 7663a50
commit 70f3627
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/services/components/botio/bot_client.go b/services/components/botio/bot_client.go
@@ -503,7 +503,7 @@ func (bot *botClient) processTransaction(ctx context.Context, lg *log.Entry, req
 		// truncate findings
 		if len(resp.Findings) > MaxFindings {
 			dropped := len(resp.Findings) - MaxFindings
-			droppedMetric := metrics.CreateAgentMetric(botConfig, metrics.MetricFindingsDropped, float64(dropped), "")
+			droppedMetric := metrics.CreateAgentMetric(botConfig, metrics.MetricFindingsDropped, float64(dropped))
 			bot.msgClient.PublishProto(
 				messaging.SubjectMetricAgent,
 				&protocol.AgentMetricList{Metrics: []*protocol.AgentMetric{droppedMetric}},
@@ -572,7 +572,7 @@ func (bot *botClient) processBlock(ctx context.Context, lg *log.Entry, request *
 		if len(resp.Findings) > MaxFindings {
 			dropped := len(resp.Findings) - MaxFindings
 			droppedMetric := metrics.CreateAgentMetric(
-				botConfig, metrics.MetricFindingsDropped, float64(dropped), "",
+				botConfig, metrics.MetricFindingsDropped, float64(dropped),
 			)
 			bot.msgClient.PublishProto(
 				messaging.SubjectMetricAgent,
@@ -665,7 +665,7 @@ func (bot *botClient) processCombinationAlert(ctx context.Context, lg *log.Entry
 	// truncate findings
 	if len(resp.Findings) > MaxFindings {
 		dropped := len(resp.Findings) - MaxFindings
-		droppedMetric := metrics.CreateAgentMetric(botConfig, metrics.MetricFindingsDropped, float64(dropped), "")
+		droppedMetric := metrics.CreateAgentMetric(botConfig, metrics.MetricFindingsDropped, float64(dropped))
 		bot.msgClient.PublishProto(
 			messaging.SubjectMetricAgent, &protocol.AgentMetricList{Metrics: []*protocol.AgentMetric{droppedMetric}},
 		)

diff --git a/services/components/botio/sender.go b/services/components/botio/sender.go
@@ -115,7 +115,7 @@ func (rs *requestSender) SendEvaluateTxRequest(req *protocol.EvaluateTxRequest)
 		}:
 		default: // do not try to send if the buffer is full
 			lg.WithField("bot", botConfig.ID).Debug("agent tx request buffer is full - skipping")
-			metricsList = append(metricsList, metrics.CreateAgentMetric(botConfig, metrics.MetricTxDrop, 1, ""))
+			metricsList = append(metricsList, metrics.CreateAgentMetric(botConfig, metrics.MetricTxDrop, 1))
 		}
 		lg.WithFields(log.Fields{
 			"bot":      botConfig.ID,
@@ -164,7 +164,7 @@ func (rs *requestSender) SendEvaluateBlockRequest(req *protocol.EvaluateBlockReq
 		}:
 		default: // do not try to send if the buffer is full
 			lg.WithField("bot", botConfig.ID).Warn("agent block request buffer is full - skipping")
-			metricsList = append(metricsList, metrics.CreateAgentMetric(botConfig, metrics.MetricBlockDrop, 1, ""))
+			metricsList = append(metricsList, metrics.CreateAgentMetric(botConfig, metrics.MetricBlockDrop, 1))
 		}
 		lg.WithFields(
 			log.Fields{
@@ -249,7 +249,7 @@ func (rs *requestSender) SendEvaluateAlertRequest(req *protocol.EvaluateAlertReq
 	}:
 	default: // do not try to send if the buffer is full
 		lg.WithField("bot", botConfig.ID).Warn("agent alert request buffer is full - skipping")
-		metricsList = append(metricsList, metrics.CreateAgentMetric(botConfig, metrics.MetricCombinerDrop, 1, ""))
+		metricsList = append(metricsList, metrics.CreateAgentMetric(botConfig, metrics.MetricCombinerDrop, 1))
 	}
 
 	lg.WithFields(

diff --git a/services/components/metrics/lifecycle.go b/services/components/metrics/lifecycle.go
@@ -196,7 +196,7 @@ func (lc *lifecycle) HealthCheckError(err error, botConfigs ...config.AgentConfi
 
 func fromBotSubscriptions(action string, subscriptions []domain.CombinerBotSubscription) (metrics []*protocol.AgentMetric) {
 	for _, botSub := range subscriptions {
-		metrics = append(metrics, CreateAgentMetric(config.AgentConfig{ID: botSub.Subscriber.BotID}, action, 1, fmt.Sprintf("botId=%s", botSub.Subscription.BotId)))
+		metrics = append(metrics, CreateAgentMetric(config.AgentConfig{ID: botSub.Subscriber.BotID}, action, 1))
 	}
 	return
 }

diff --git a/services/components/metrics/metrics.go b/services/components/metrics/metrics.go
@@ -52,14 +52,13 @@ func SendAgentMetrics(client clients.MessageClient, ms []*protocol.AgentMetric)
 	}
 }
 
-func CreateAgentMetric(agt config.AgentConfig, metric string, value float64, details string) *protocol.AgentMetric {
+func CreateAgentMetric(agt config.AgentConfig, metric string, value float64) *protocol.AgentMetric {
 	return &protocol.AgentMetric{
 		AgentId:   agt.ID,
 		Timestamp: time.Now().Format(time.RFC3339),
 		Name:      metric,
 		Value:     value,
 		ShardId:   agt.ShardID(),
-		Details:   details,
 	}
 }