Merge pull request #111 from mysteriumnetwork/add-packet-loss

add packetLoss parameter to Quality
mysteriumnetwork · Oct 24, 2024 · 7611167 · 7611167
2 parents fc8bd99 + 1db99db
commit 7611167
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/ci/e2e/e2e.go b/ci/e2e/e2e.go
@@ -8,7 +8,7 @@ import (
 )
 
 func Run() error {
-	defer sh.RunV("docker-compose", "-f", e2e.DockerFile, "down", "-v")
+	defer sh.RunV("docker", "compose", "-f", e2e.DockerFile, "down", "-v")
 	err := UpDevDependencies()
 	if err != nil {
 		return err
@@ -34,7 +34,7 @@ func UpDevDependencies() error {
 }
 
 func upDependencies() error {
-	err := sh.RunV("docker-compose", "-f", e2e.DockerFile, "up", "-d", "dev")
+	err := sh.RunV("docker", "compose", "-f", e2e.DockerFile, "up", "-d", "dev")
 	if err != nil {
 		return err
 	}
@@ -43,5 +43,5 @@ func upDependencies() error {
 }
 
 func upApp() error {
-	return sh.RunV("docker-compose", "-f", e2e.DockerFile, "up", "--build", "-d", "discovery", "discopricer")
+	return sh.RunV("docker", "compose", "-f", e2e.DockerFile, "up", "--build", "-d", "discovery", "discopricer")
 }
diff --git a/proposal/metrics/enhancer.go b/proposal/metrics/enhancer.go
@@ -67,6 +67,7 @@ func EnhanceWithMetrics(proposals []v3.Proposal, or map[string]*oracleapi.Detail
 		p.Quality.Latency = q.Latency
 		p.Quality.Bandwidth = q.Bandwidth
 		p.Quality.Uptime = q.Uptime
+		p.Quality.PacketLoss = q.PacketLoss
 		p.Quality.MonitoringFailed = q.MonitoringFailed
 
 		if !matchPreset(f.PresetID, p) {

diff --git a/proposal/v3/metadata_json.go b/proposal/v3/metadata_json.go
diff --git a/proposal/v3/proposal.go b/proposal/v3/proposal.go
@@ -111,6 +111,8 @@ type Quality struct {
 	Bandwidth float64 `json:"bandwidth"`
 	// Uptime in hours per day
 	Uptime float64 `json:"uptime"`
+	// PacketLoss in percantage
+	PacketLoss float64 `json:"packetLoss"`
 	// MonitoringFailed did monitoring agent succeed to connect to the node.
 	MonitoringFailed bool `json:"monitoring_failed,omitempty"`
 }
diff --git a/proposal/v3/proposal_json.go b/proposal/v3/proposal_json.go
diff --git a/proposal/v3/proposal_test.go b/proposal/v3/proposal_test.go
@@ -2,13 +2,14 @@ package v3_test
 
 import (
 	"encoding/json"
-	v3 "github.com/mysteriumnetwork/discovery/proposal/v3"
 	"reflect"
 	"testing"
+
+	v3 "github.com/mysteriumnetwork/discovery/proposal/v3"
 )
 
 func TestProposal_MarshalBinary(t *testing.T) {
-	proposalJson := `{"id":0,"format":"service-proposal/v3","compatibility":2,"provider_id":"0x55d9995cf3482ee0628fe25e3c95a95899f23cad","service_type":"scraping","location":{"continent":"EU","country":"PL","region":"Malopolskie","city":"Nowy Sacz","asn":5617,"isp":"Orange Polska Spolka Akcyjna","ip_type":"residential"},"contacts":[{"type":"nats/p2p/v1","definition":{"broker_addresses":["nats://broker.mysterium.network:4222","nats://broker.mysterium.network:4222","nats://51.15.22.197:4222","nats://51.15.23.12:4222","nats://51.15.23.14:4222","nats://51.15.23.16:4222"]}}],"access_policies":[{"id":"mysterium","source":"https://trust.mysterium.network/api/v1/access-policies/mysterium"}],"quality":{"quality":2.0250000000000004,"latency":824.898867,"bandwidth":10.275812,"uptime":24}}`
+	proposalJson := `{"id":0,"format":"service-proposal/v3","compatibility":2,"provider_id":"0x55d9995cf3482ee0628fe25e3c95a95899f23cad","service_type":"scraping","location":{"continent":"EU","country":"PL","region":"Malopolskie","city":"Nowy Sacz","asn":5617,"isp":"Orange Polska Spolka Akcyjna","ip_type":"residential"},"contacts":[{"type":"nats/p2p/v1","definition":{"broker_addresses":["nats://broker.mysterium.network:4222","nats://broker.mysterium.network:4222","nats://51.15.22.197:4222","nats://51.15.23.12:4222","nats://51.15.23.14:4222","nats://51.15.23.16:4222"]}}],"access_policies":[{"id":"mysterium","source":"https://trust.mysterium.network/api/v1/access-policies/mysterium"}],"quality":{"quality":2.0250000000000004,"latency":824.898867,"bandwidth":10.275812,"uptime":24,"packetLoss":0.5}}`
 	def := json.RawMessage(`{
 			"broker_addresses": [
 				"nats://broker.mysterium.network:4222",
@@ -51,6 +52,7 @@ func TestProposal_MarshalBinary(t *testing.T) {
 			Latency:          824.898867,
 			Bandwidth:        10.275812,
 			Uptime:           24,
+			PacketLoss:       0.5,
 			MonitoringFailed: false,
 		},
 	}
@@ -97,6 +99,7 @@ func BenchmarkProposal_UnmarshalBinary(b *testing.B) {
 			Latency:          497.234331,
 			Bandwidth:        1.825416,
 			Uptime:           24,
+			PacketLoss:       0.5,
 			MonitoringFailed: true,
 		},
 	}

diff --git a/quality/oracleapi/oracle.go b/quality/oracleapi/oracle.go
@@ -57,6 +57,7 @@ type DetailedQuality struct {
 	Latency          float64 `json:"latency" example:"75.5"`
 	Uptime           float64 `json:"uptime" example:"7.7"`
 	Bandwidth        float64 `json:"bandwidth" example:"15.5"`
+	PacketLoss       float64 `json:"packetLoss" example:"0.5"`
 }
 
 // CountryLoad represents the ratio of providers to active sessions for country.