feat_: log status version in all telemetry calls

status-im · Jun 12, 2024 · e514242 · e514242
1 parent 145d139
commit e514242
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/cmd/status-cli/util.go b/cmd/status-cli/util.go
@@ -63,7 +63,7 @@ func start(name string, port int, apiModules string, telemetryUrl string, useExi
 	}
 
 	if telemetryUrl != "" {
-		telemetryClient := telemetry.NewClient(nlog.Desugar(), telemetryUrl, backend.SelectedAccountKeyID(), name)
+		telemetryClient := telemetry.NewClient(nlog.Desugar(), telemetryUrl, backend.SelectedAccountKeyID(), name, "cli")
 		backend.StatusNode().WakuV2Service().SetStatusTelemetryClient(telemetryClient)
 	}
 	wakuAPI := wakuv2ext.NewPublicAPI(wakuService)

diff --git a/protocol/messenger.go b/protocol/messenger.go
@@ -299,6 +299,7 @@ func NewMessenger(
 	node types.Node,
 	installationID string,
 	peerStore *mailservers.PeerStore,
+	version string,
 	opts ...Option,
 ) (*Messenger, error) {
 	var messenger *Messenger
@@ -428,7 +429,7 @@ func NewMessenger(
 
 	var telemetryClient *telemetry.Client
 	if c.telemetryServerURL != "" {
-		telemetryClient = telemetry.NewClient(logger, c.telemetryServerURL, c.account.KeyUID, nodeName)
+		telemetryClient = telemetry.NewClient(logger, c.telemetryServerURL, c.account.KeyUID, nodeName, version)
 		if c.wakuService != nil {
 			c.wakuService.SetStatusTelemetryClient(telemetryClient)
 		}

diff --git a/protocol/messenger_builder_test.go b/protocol/messenger_builder_test.go
@@ -92,6 +92,7 @@ func newTestMessenger(waku types.Waku, config testMessengerConfig) (*Messenger,
 		&testNode{shh: waku},
 		uuid.New().String(),
 		nil,
+		"testVersion",
 		options...,
 	)
 	if err != nil {

diff --git a/services/ext/service.go b/services/ext/service.go
@@ -174,6 +174,7 @@ func (s *Service) InitProtocol(nodeName string, identity *ecdsa.PrivateKey, appD
 		s.n,
 		s.config.ShhextConfig.InstallationID,
 		s.peerStore,
+		params.Version,
 		options...,
 	)
 	if err != nil {

diff --git a/telemetry/client.go b/telemetry/client.go
@@ -23,15 +23,17 @@ type Client struct {
 	logger     *zap.Logger
 	keyUID     string
 	nodeName   string
+	version    string
 }
 
-func NewClient(logger *zap.Logger, serverURL string, keyUID string, nodeName string) *Client {
+func NewClient(logger *zap.Logger, serverURL string, keyUID string, nodeName string, version string) *Client {
 	return &Client{
 		serverURL:  serverURL,
 		httpClient: &http.Client{Timeout: time.Minute},
 		logger:     logger,
 		keyUID:     keyUID,
 		nodeName:   nodeName,
+		version:    version,
 	}
 }
 
@@ -51,6 +53,7 @@ func (c *Client) PushReceivedMessages(filter transport.Filter, sshMessage *types
 			"receiverKeyUID": c.keyUID,
 			"nodeName":       c.nodeName,
 			"messageSize":    len(sshMessage.Payload),
+			"statusVersion":  c.version,
 		})
 	}
 	body, _ := json.Marshal(postBody)
@@ -71,6 +74,7 @@ func (c *Client) PushReceivedEnvelope(envelope *v2protocol.Envelope) {
 		"topic":          envelope.Message().ContentTopic,
 		"receiverKeyUID": c.keyUID,
 		"nodeName":       c.nodeName,
+		"statusVersion":  c.version,
 	}
 	body, _ := json.Marshal(postBody)
 	_, err := c.httpClient.Post(url, "application/json", bytes.NewBuffer(body))
@@ -91,6 +95,7 @@ func (c *Client) PushSentEnvelope(envelope *v2protocol.Envelope, publishMethod w
 		"senderKeyUID":  c.keyUID,
 		"nodeName":      c.nodeName,
 		"publishMethod": publishMethod.String(),
+		"statusVersion": c.version,
 	}
 	body, _ := json.Marshal(postBody)
 	_, err := c.httpClient.Post(url, "application/json", bytes.NewBuffer(body))