fix interfaces

Author: Tofel

wasp/benchspy/report.go

@@ -24,7 +24,7 @@ func (b *StandardReport) Load() error {
 	return b.LocalStorage.Load(b.TestName, b.CommitOrTag, b)
 }
 
-func (b *StandardReport) Fetch(ctx context.Context) error {
+func (b *StandardReport) FetchData(ctx context.Context) error {
 	basicErr := b.BasicData.Validate()
 	if basicErr != nil {
 		return basicErr
@@ -60,18 +60,24 @@ func (b *StandardReport) Fetch(ctx context.Context) error {
 	return nil
 }
 
-func (b *StandardReport) IsComparable(otherReport StandardReport) error {
-	basicErr := b.BasicData.IsComparable(otherReport.BasicData)
+func (b *StandardReport) IsComparable(otherReport Reporter) error {
+	if _, ok := otherReport.(*StandardReport); !ok {
+		return fmt.Errorf("expected type %s, got %T", "*StandardReport", otherReport)
+	}
+
+	asStandardReport := otherReport.(*StandardReport)
+
+	basicErr := b.BasicData.IsComparable(asStandardReport.BasicData)
 	if basicErr != nil {
 		return basicErr
 	}
 
-	if resourceErr := b.CompareResources(&otherReport.ResourceReporter); resourceErr != nil {
+	if resourceErr := b.CompareResources(&asStandardReport.ResourceReporter); resourceErr != nil {
 		return resourceErr
 	}
 
 	for i, queryExecutor := range b.QueryExecutors {
-		queryErr := queryExecutor.IsComparable(otherReport.QueryExecutors[i])
+		queryErr := queryExecutor.IsComparable(asStandardReport.QueryExecutors[i])
 		if queryErr != nil {
 			return queryErr
 		}

wasp/benchspy/types.go

@@ -12,19 +12,25 @@ type Storer interface {
 	Load() error
 }
 
-type Fetcher interface {
+type DataFetcher interface {
 	// Fetch populates the report with the data from the test
-	Fetch() error
+	FetchData(ctx context.Context) error
 }
 
 type Comparator interface {
 	// IsComparable checks whether both reports can be compared (e.g. test config is the same, app's resources are the same, queries or metrics used are the same, etc.), and an error if any difference is found
 	IsComparable(otherReport Reporter) error
 }
 
+type ResourceFetcher interface {
+	// FetchResources fetches the resources used by the AUT (e.g. CPU, memory, etc.)
+	FetchResources(ctx context.Context) error
+}
+
 type Reporter interface {
 	Storer
-	Fetcher
+	DataFetcher
+	ResourceFetcher
 	Comparator
 }
 

wasp/benchspy_test.go

@@ -66,7 +66,7 @@ func TestBenchSpyWithLokiQuery(t *testing.T) {
 	fetchCtx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancelFn()
 
-	fetchErr := currentReport.Fetch(fetchCtx)
+	fetchErr := currentReport.FetchData(fetchCtx)
 	require.NoError(t, fetchErr, "failed to fetch current report")
 
 	// path, storeErr := currentReport.Store()
@@ -84,7 +84,7 @@ func TestBenchSpyWithLokiQuery(t *testing.T) {
 	loadErr := previousReport.Load()
 	require.NoError(t, loadErr, "failed to load previous report")
 
-	isComparableErrs := previousReport.IsComparable(currentReport)
+	isComparableErrs := previousReport.IsComparable(&currentReport)
 	require.Empty(t, isComparableErrs, "reports were not comparable", isComparableErrs)
 	require.NotEmpty(t, currentReport.QueryExecutors[0].Results()["vu_over_time"], "vu_over_time results were missing from current report")
 	require.NotEmpty(t, previousReport.QueryExecutors[0].Results()["vu_over_time"], "vu_over_time results were missing from current report")
@@ -169,7 +169,7 @@ func TestBenchSpyWithTwoLokiQueries(t *testing.T) {
 	fetchCtx, cancelFn := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancelFn()
 
-	fetchErr := currentReport.Fetch(fetchCtx)
+	fetchErr := currentReport.FetchData(fetchCtx)
 	require.NoError(t, fetchErr, "failed to fetch current report")
 
 	// path, storeErr := currentReport.Store()
@@ -187,7 +187,7 @@ func TestBenchSpyWithTwoLokiQueries(t *testing.T) {
 	loadErr := previousReport.Load()
 	require.NoError(t, loadErr, "failed to load previous report")
 
-	isComparableErrs := previousReport.IsComparable(currentReport)
+	isComparableErrs := previousReport.IsComparable(&currentReport)
 	require.Empty(t, isComparableErrs, "reports were not comparable", isComparableErrs)
 	// vu over time
 	require.NotEmpty(t, currentReport.QueryExecutors[0].Results()["vu_over_time"], "vu_over_time results were missing from current report")