test ocr_telemetry_feed_message_report_req_median metric (#107)

* add median test

* lint

* fix

* change retry to eventually

* lint

Author: gheorghestrimtu

Makefile

@@ -78,4 +78,8 @@ test_contract: ## run contract tests
 
 .PHONY: test_vrf
 test_vrf: ## run vrf tests
-	ginkgo -r --focus=@vrf
+	ginkgo -r --focus=@vrf
+
+.PHONY: test_observability
+test_observability: # run observability tests
+	ginkgo -r --focus=@observability

client/mockserver.go

@@ -0,0 +1,88 @@
+package client
+
+import (
+	"net/http"
+)
+
+// MockserverClient mockserver client
+type MockserverClient struct {
+	*BasicHTTPClient
+	Config *MockserverConfig
+}
+
+// MockserverConfig holds config information for MockserverClient
+type MockserverConfig struct {
+	LocalURL   string
+	ClusterURL string
+}
+
+// NewMockserverClient returns a mockserver client
+func NewMockserverClient(cfg *MockserverConfig) *MockserverClient {
+	return &MockserverClient{
+		Config:          cfg,
+		BasicHTTPClient: NewBasicHTTPClient(&http.Client{}, cfg.LocalURL),
+	}
+}
+
+// PutExpectations sets the expectations (i.e. mocked responses)
+func (em *MockserverClient) PutExpectations(body interface{}) error {
+	_, err := em.do(http.MethodPut, "/expectation", &body, nil, http.StatusCreated)
+	return err
+}
+
+// ClearExpectation clears expectations
+func (em *MockserverClient) ClearExpectation(body interface{}) error {
+	_, err := em.do(http.MethodPut, "/clear", &body, nil, http.StatusOK)
+	return err
+}
+
+// PathSelector represents the json object used to find expectations by path
+type PathSelector struct {
+	Path string `json:"path"`
+}
+
+// HttpRequest represents the httpRequest json object used in the mockserver initializer
+type HttpRequest struct {
+	Path string `json:"path"`
+}
+
+// HttpResponse represents the httpResponse json object used in the mockserver initializer
+type HttpResponse struct {
+	Body interface{} `json:"body"`
+}
+
+// HttpInitializer represents an element of the initializer array used in the mockserver initializer
+type HttpInitializer struct {
+	Request  HttpRequest  `json:"httpRequest"`
+	Response HttpResponse `json:"httpResponse"`
+}
+
+// For OTPE - weiwatchers
+
+// NodeInfoJSON represents an element of the nodes array used to deliver configs to otpe
+type NodeInfoJSON struct {
+	ID          string   `json:"id"`
+	NodeAddress []string `json:"nodeAddress"`
+}
+
+// ContractInfoJSON represents an element of the contracts array used to deliver configs to otpe
+type ContractInfoJSON struct {
+	ContractAddress string `json:"contractAddress"`
+	ContractVersion int    `json:"contractVersion"`
+	Path            string `json:"path"`
+	Status          string `json:"status"`
+}
+
+// For Adapter endpoints
+
+// AdapterResult represents an int result for an adapter
+type AdapterResult struct {
+	Result int `json:"result"`
+}
+
+// AdapterResponse represents a response from an adapter
+type AdapterResponse struct {
+	Id    string        `json:"id"`
+	Data  AdapterResult `json:"data"`
+	Error interface{}   `json:"error"`
+}

client/prometheus.go

@@ -105,4 +105,13 @@ func (p *Prometheus) GetAlerts() (v1.AlertsResult, error) {
 		return v1.AlertsResult{}, err
 	}
 	return alerts, nil
-}
+}
+
+// GetQuery returns the result of applying a PromQL query
+func (p *Prometheus) GetQuery(query string) (model.Value, error) {
+	value, _, err := p.API.Query(context.Background(), query, time.Now())
+	if err != nil {
+		return nil, err
+	}
+	return value, nil
+}

environment/charts/mockserver/mockserver_types.go

@@ -66,6 +66,18 @@ func GetPrometheusClientFromEnv(env Environment) (*client.Prometheus, error) {
 	return client.NewPrometheusClient(sd.LocalURL.String())
 }
 
+// GetMockserverClientFromEnv returns a Mockserver client
+func GetMockserverClientFromEnv(env Environment) (*client.MockserverClient, error) {
+	sd, err := env.GetServiceDetails(MockserverAPIPort)
+	if err != nil {
+		return nil, err
+	}
+	return client.NewMockserverClient(&client.MockserverConfig{
+		LocalURL:   sd.LocalURL.String(),
+		ClusterURL: sd.RemoteURL.String(),
+	}), nil
+}
+
 // GetChainlinkClients will return all instantiated Chainlink clients for a given environment
 func GetChainlinkClients(env Environment) ([]client.Chainlink, error) {
 	var clients []client.Chainlink

environment/environment.go

@@ -27,6 +27,7 @@ const (
 	MinersRPCPort     = 9545
 	ExplorerAPIPort   = 8080
 	PrometheusAPIPort = 9090
+	MockserverAPIPort = 1080
 )
 
 // NewAdapterManifest is the k8s manifest that when used will deploy an external adapter to an environment
@@ -280,6 +281,16 @@ func NewGanacheManifest() *K8sManifest {
 
 // NewChainlinkCluster is a basic environment that deploys hardhat with a chainlink cluster and an external adapter
 func NewChainlinkCluster(nodeCount int) K8sEnvSpecInit {
+	mockserverConfigDependencyGroup := &K8sManifestGroup{
+		id:        "MockserverConfigDependencyGroup",
+		manifests: []K8sEnvResource{NewMockserverConfigHelmChart()},
+	}
+
+	mockserverDependencyGroup := &K8sManifestGroup{
+		id:        "MockserverDependencyGroup",
+		manifests: []K8sEnvResource{NewMockserverHelmChart()},
+	}
+
 	chainlinkGroup := &K8sManifestGroup{
 		id:        "chainlinkCluster",
 		manifests: []K8sEnvResource{},
@@ -292,13 +303,23 @@ func NewChainlinkCluster(nodeCount int) K8sEnvSpecInit {
 
 	dependencyGroup := getBasicDependencyGroup()
 	addPostgresDbsToDependencyGroup(dependencyGroup, nodeCount)
-	dependencyGroups := []*K8sManifestGroup{dependencyGroup}
+	dependencyGroups := []*K8sManifestGroup{mockserverConfigDependencyGroup, mockserverDependencyGroup, dependencyGroup}
 	return addNetworkManifestToDependencyGroup("basic-chainlink", chainlinkGroup, dependencyGroups)
 }
 
-// NewChainlinkClusterForAlertsTesting is a basic environment that deploys a chainlink cluster with dependencies
-// for testing alerts
-func NewChainlinkClusterForAlertsTesting(nodeCount int) K8sEnvSpecInit {
+// NewChainlinkClusterForObservabilityTesting is a basic environment that deploys a chainlink cluster with dependencies
+// for testing observability
+func NewChainlinkClusterForObservabilityTesting(nodeCount int) K8sEnvSpecInit {
+	mockserverConfigDependencyGroup := &K8sManifestGroup{
+		id:        "MockserverConfigDependencyGroup",
+		manifests: []K8sEnvResource{NewMockserverConfigHelmChart()},
+	}
+
+	mockserverDependencyGroup := &K8sManifestGroup{
+		id:        "MockserverDependencyGroup",
+		manifests: []K8sEnvResource{NewMockserverHelmChart()},
+	}
+
 	chainlinkGroup := &K8sManifestGroup{
 		id:        "chainlinkCluster",
 		manifests: []K8sEnvResource{},
@@ -315,16 +336,26 @@ func NewChainlinkClusterForAlertsTesting(nodeCount int) K8sEnvSpecInit {
 	}
 
 	dependencyGroup := getBasicDependencyGroup()
-	addServicesForTestingAlertsToDependencyGroup(dependencyGroup, nodeCount)
+	dependencyGroup.manifests = append(dependencyGroup.manifests, NewExplorerManifest(nodeCount))
 	addPostgresDbsToDependencyGroup(dependencyGroup, nodeCount)
-	dependencyGroups := []*K8sManifestGroup{kafkaDependecyGroup, dependencyGroup}
+	dependencyGroups := []*K8sManifestGroup{mockserverConfigDependencyGroup, mockserverDependencyGroup, kafkaDependecyGroup, dependencyGroup}
 
 	return addNetworkManifestToDependencyGroup("basic-chainlink", chainlinkGroup, dependencyGroups)
 }
 
 // NewMixedVersionChainlinkCluster mixes the currently latest chainlink version (as defined by the config file) with
 // a number of past stable versions (defined by pastVersionsCount), ensuring that at least one of each is deployed
 func NewMixedVersionChainlinkCluster(nodeCount, pastVersionsCount int) K8sEnvSpecInit {
+	mockserverConfigDependencyGroup := &K8sManifestGroup{
+		id:        "MockserverConfigDependencyGroup",
+		manifests: []K8sEnvResource{NewMockserverConfigHelmChart()},
+	}
+
+	mockserverDependencyGroup := &K8sManifestGroup{
+		id:        "MockserverDependencyGroup",
+		manifests: []K8sEnvResource{NewMockserverHelmChart()},
+	}
+
 	if nodeCount < 3 {
 		log.Warn().
 			Int("Provided Node Count", nodeCount).
@@ -358,7 +389,7 @@ func NewMixedVersionChainlinkCluster(nodeCount, pastVersionsCount int) K8sEnvSpe
 
 	dependencyGroup := getBasicDependencyGroup()
 	addPostgresDbsToDependencyGroup(dependencyGroup, nodeCount)
-	dependencyGroups := []*K8sManifestGroup{dependencyGroup}
+	dependencyGroups := []*K8sManifestGroup{mockserverConfigDependencyGroup, mockserverDependencyGroup, dependencyGroup}
 	return addNetworkManifestToDependencyGroup("mixed-version-chainlink", chainlinkGroup, dependencyGroups)
 }
 
@@ -499,28 +530,10 @@ func addPostgresDbsToDependencyGroup(dependencyGroup *K8sManifestGroup, postgres
 	}
 }
 
-// addServicesForTestingAlertsToDependencyGroup adds services necessary for testing alerts to the dependency group
-func addServicesForTestingAlertsToDependencyGroup(dependencyGroup *K8sManifestGroup, nodeCount int) {
-	dependencyGroup.manifests = append(dependencyGroup.manifests, NewExplorerManifest(nodeCount))
-}
-
-// OtpeGroup contains manifests for mockserver, mockserver-config, and otpe
+// OtpeGroup contains manifests for otpe
 func OtpeGroup() K8sEnvSpecInit {
 	return func(config *config.NetworkConfig) (string, K8sEnvSpecs) {
 		var specs K8sEnvSpecs
-		mockserverConfigDependencyGroup := &K8sManifestGroup{
-			id:        "MockserverConfigDependencyGroup",
-			manifests: []K8sEnvResource{NewMockserverConfigHelmChart()},
-		}
-
-		mockserverDependencyGroup := &K8sManifestGroup{
-			id:        "MockserverDependencyGroup",
-			manifests: []K8sEnvResource{NewMockserverHelmChart()},
-		}
-
-		specs = append(specs, mockserverConfigDependencyGroup)
-		specs = append(specs, mockserverDependencyGroup)
-
 		otpeDependencyGroup := &K8sManifestGroup{
 			id:        "OTPEDependencyGroup",
 			manifests: []K8sEnvResource{NewOTPEManifest()},

environment/environment_templates.go

@@ -2,11 +2,8 @@ package contracts
 
 import (
 	"fmt"
-
-	"github.com/avast/retry-go"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/pkg/errors"
 	"github.com/smartcontractkit/integrations-framework/actions"
 	"github.com/smartcontractkit/integrations-framework/client"
 	"github.com/smartcontractkit/integrations-framework/environment"
@@ -56,20 +53,17 @@ var _ = Describe("Cronjob suite @cron", func() {
 
 	Describe("with Cron job", func() {
 		It("runs 5 times with no errors", func() {
-			err = retry.Do(func() error {
+			Eventually(func(g Gomega){
 				jobRuns, err := nodes[0].ReadRunsByJob(job.Data.ID)
-				if err != nil {
-					return err
-				}
-				if len(jobRuns.Data) != 5 {
-					return errors.New("not all jobs are completed")
-				}
+				g.Expect(err).ShouldNot(HaveOccurred())
+
+				g.Expect(len(jobRuns.Data)).Should(BeNumerically("==", 5))
+
 				for _, jr := range jobRuns.Data {
-					Expect(jr.Attributes.Errors).Should(Equal([]interface{}{nil}))
+					g.Expect(jr.Attributes.Errors).Should(Equal([]interface{}{nil}))
 				}
-				return nil
-			})
-			Expect(err).ShouldNot(HaveOccurred())
+			}, "2m", "1s").Should(Succeed())
+
 		})
 	})
 

suite/contracts/contracts_cron_test.go

@@ -2,10 +2,8 @@ package contracts
 
 import (
 	"context"
-	"errors"
 	"math/big"
 
-	"github.com/avast/retry-go"
 	"github.com/ethereum/go-ethereum/common"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -149,18 +147,12 @@ var _ = Describe("Keeper suite @keeper", func() {
 	})
 	Describe("with Keeper job", func() {
 		It("performs upkeep of a target contract", func() {
-			err = retry.Do(func() error {
+			Eventually(func(g Gomega){
 				cnt, err := consumer.Counter(context.Background())
-				if err != nil {
-					return err
-				}
-				if cnt.Int64() == 0 {
-					return errors.New("awaiting for upkeep")
-				}
+				g.Expect(err).ShouldNot(HaveOccurred())
+				g.Expect(cnt.Int64()).Should(BeNumerically(">", 0))
 				log.Info().Int64("Upkeep counter", cnt.Int64()).Msg("Upkeeps performed")
-				return nil
-			})
-			Expect(err).ShouldNot(HaveOccurred())
+			}, "2m", "1s").Should(Succeed())
 		})
 	})
 	AfterEach(func() {