fix: flow_process_nf_delay_seconds metric is not observed (update) (#339

) Co-authored-by: Muhammad Iqbal Alaydrus <[email protected]>
netsampler · Jul 18, 2024 · c9d3242 · c9d3242
1 parent bd9694c
commit c9d3242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/metrics/decoder.go b/metrics/decoder.go
@@ -58,7 +58,7 @@ func PromDecoderWrapper(wrapped utils.DecoderFunc, name string) utils.DecoderFun
 			prometheus.Labels{
 				"name": name,
 			}).
-			Observe(float64((timeTrackStop.Sub(timeTrackStart)).Nanoseconds()) / 1000000000)
+			Observe(float64((timeTrackStop.Sub(timeTrackStart)).Nanoseconds()) / 1e9)
 
 		if err != nil {
 			if errors.Is(err, netflow.ErrorTemplateNotFound) {

diff --git a/metrics/producer.go b/metrics/producer.go
@@ -6,8 +6,8 @@ import (
 	"github.com/netsampler/goflow2/v2/decoders/netflow"
 	"github.com/netsampler/goflow2/v2/decoders/netflowlegacy"
 	"github.com/netsampler/goflow2/v2/decoders/sflow"
-	flowmessage "github.com/netsampler/goflow2/v2/pb"
 	"github.com/netsampler/goflow2/v2/producer"
+	"github.com/netsampler/goflow2/v2/producer/proto"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -116,17 +116,18 @@ func (p *PromProducerWrapper) Produce(msg interface{}, args *producer.ProduceArg
 
 	if nfvariant {
 		for _, msg := range flowMessageSet {
-			fmsg, ok := msg.(*flowmessage.FlowMessage)
+			fmsg, ok := msg.(*protoproducer.ProtoProducerMessage)
 			if !ok {
 				continue
 			}
 			timeDiff := fmsg.TimeReceivedNs - fmsg.TimeFlowEndNs
+
 			NetFlowTimeStatsSum.With(
 				prometheus.Labels{
 					"router":  key,
 					"version": versionStr,
 				}).
-				Observe(float64(timeDiff))
+				Observe(float64(timeDiff) / 1e9)
 		}
 	}