feat(telemetry)_: include device type in metrics

protocol/messenger.go

@@ -555,7 +555,10 @@ func NewMessenger(
 
 	var telemetryClient *telemetry.Client
 	if c.telemetryServerURL != "" {
-		telemetryClient = telemetry.NewClient(logger, c.telemetryServerURL, c.account.KeyUID, nodeName, version, telemetry.WithPeerID(peerId.String()))
+		options := []telemetry.TelemetryClientOption{
+			telemetry.WithPeerID(peerId.String()),
+		}
+		telemetryClient = telemetry.NewClient(logger, c.telemetryServerURL, c.account.KeyUID, nodeName, version, options...)
 		if c.wakuService != nil {
 			c.wakuService.SetStatusTelemetryClient(telemetryClient)
 		}

protocol/messenger_pairing_and_syncing.go

@@ -415,6 +415,13 @@ func (m *Messenger) InitInstallations() error {
 		return err
 	}
 
+	if m.telemetryClient != nil {
+		installation, ok := m.allInstallations.Load(m.installationID)
+		if ok {
+			m.telemetryClient.SetDeviceType(installation.InstallationMetadata.DeviceType)
+		}
+	}
+
 	return nil
 }
 

telemetry/client.go

@@ -109,6 +109,7 @@ type Client struct {
 	sendPeriod           time.Duration
 	lastPeerCount        int
 	lastPeerConnFailures map[string]int
+	deviceType           string
 }
 
 type TelemetryClientOption func(*Client)
@@ -125,6 +126,12 @@ func WithPeerID(peerId string) TelemetryClientOption {
 	}
 }
 
+func WithDeviceType(deviceType string) TelemetryClientOption {
+	return func(c *Client) {
+		c.deviceType = deviceType
+	}
+}
+
 func NewClient(logger *zap.Logger, serverURL string, keyUID string, nodeName string, version string, opts ...TelemetryClientOption) *Client {
 	serverURL = strings.TrimRight(serverURL, "/")
 	client := &Client{
@@ -152,6 +159,10 @@ func NewClient(logger *zap.Logger, serverURL string, keyUID string, nodeName str
 	return client
 }
 
+func (c *Client) SetDeviceType(deviceType string) {
+	c.deviceType = deviceType
+}
+
 func (c *Client) Start(ctx context.Context) {
 	go func() {
 
@@ -299,6 +310,7 @@ func (c *Client) ProcessReceivedMessages(receivedMessages ReceivedMessages) *jso
 			"nodeName":       c.nodeName,
 			"messageSize":    len(receivedMessages.SSHMessage.Payload),
 			"statusVersion":  c.version,
+			"deviceType":     c.deviceType,
 		})
 	}
 	body, _ := json.Marshal(postBody)
@@ -316,6 +328,7 @@ func (c *Client) ProcessReceivedEnvelope(envelope *v2protocol.Envelope) *json.Ra
 		"peerId":         c.peerId,
 		"nodeName":       c.nodeName,
 		"statusVersion":  c.version,
+		"deviceType":     c.deviceType,
 	}
 	body, _ := json.Marshal(postBody)
 	jsonRawMessage := json.RawMessage(body)
@@ -333,6 +346,7 @@ func (c *Client) ProcessSentEnvelope(sentEnvelope wakuv2.SentEnvelope) *json.Raw
 		"nodeName":      c.nodeName,
 		"publishMethod": sentEnvelope.PublishMethod.String(),
 		"statusVersion": c.version,
+		"deviceType":    c.deviceType,
 	}
 	body, _ := json.Marshal(postBody)
 	jsonRawMessage := json.RawMessage(body)
@@ -351,6 +365,7 @@ func (c *Client) ProcessErrorSendingEnvelope(errorSendingEnvelope wakuv2.ErrorSe
 		"publishMethod": errorSendingEnvelope.SentEnvelope.PublishMethod.String(),
 		"statusVersion": c.version,
 		"error":         errorSendingEnvelope.Error.Error(),
+		"deviceType":    c.deviceType,
 	}
 	body, _ := json.Marshal(postBody)
 	jsonRawMessage := json.RawMessage(body)
@@ -365,6 +380,7 @@ func (c *Client) ProcessPeerCount(peerCount PeerCount) *json.RawMessage {
 		"peerId":        c.peerId,
 		"statusVersion": c.version,
 		"timestamp":     time.Now().Unix(),
+		"deviceType":    c.deviceType,
 	}
 	body, _ := json.Marshal(postBody)
 	jsonRawMessage := json.RawMessage(body)
@@ -380,6 +396,7 @@ func (c *Client) ProcessPeerConnFailure(peerConnFailure PeerConnFailure) *json.R
 		"peerId":        c.peerId,
 		"statusVersion": c.version,
 		"timestamp":     time.Now().Unix(),
+		"deviceType":    c.deviceType,
 	}
 	body, _ := json.Marshal(postBody)
 	jsonRawMessage := json.RawMessage(body)
@@ -402,6 +419,7 @@ func (c *Client) UpdateEnvelopeProcessingError(shhMessage *types.Message, proces
 		"peerId":          c.peerId,
 		"nodeName":        c.nodeName,
 		"processingError": errorString,
+		"deviceType":      c.deviceType,
 	}
 	body, _ := json.Marshal(postBody)
 	_, err := c.httpClient.Post(url, "application/json", bytes.NewBuffer(body))

wakuv2/waku.go

@@ -109,6 +109,7 @@ type ErrorSendingEnvelope struct {
 }
 
 type ITelemetryClient interface {
+	SetDeviceType(deviceType string)
 	PushReceivedEnvelope(receivedEnvelope *protocol.Envelope)
 	PushSentEnvelope(sentEnvelope SentEnvelope)
 	PushErrorSendingEnvelope(errorSendingEnvelope ErrorSendingEnvelope)