record successful retrievals served (#59)

carserver/station_api_impl.go

@@ -43,10 +43,16 @@ func (s *StationAPIImpl) RecordRetrievalServed(ctx context.Context, bytesServed,
 	return s.createOrUpdateReqStatsUnlocked(ctx, func(r *station.ReqStats) {
 		r.TotalBytesUploaded = bytesServed
 		r.NContentRequests = 1
+		if nErrors == 0 {
+			r.NSuccessfulRetrievals = 1
+		}
 		r.NContentReqErrors = nErrors
 	}, func(r *station.ReqStats) {
 		r.TotalBytesUploaded += bytesServed
 		r.NContentRequests += 1
+		if nErrors == 0 {
+			r.NSuccessfulRetrievals += 1
+		}
 		r.NContentReqErrors += nErrors
 	})
 }

carserver/station_api_impl_test.go

@@ -54,9 +54,10 @@ func TestStationAPIImpl(t *testing.T) {
 			BytesCurrentlyStored: 790,
 		},
 		ReqStats: station.ReqStats{
-			TotalBytesUploaded:   100,
-			NContentRequests:     1,
-			TotalBytesDownloaded: 300,
+			TotalBytesUploaded:    100,
+			NContentRequests:      1,
+			TotalBytesDownloaded:  300,
+			NSuccessfulRetrievals: 1,
 		}}, as)
 
 	require.NoError(t, sapi.RecordRetrievalServed(ctx, 500, 2))
@@ -67,10 +68,11 @@ func TestStationAPIImpl(t *testing.T) {
 			BytesCurrentlyStored: 790,
 		},
 		ReqStats: station.ReqStats{
-			TotalBytesUploaded:   600,
-			NContentRequests:     2,
-			NContentReqErrors:    2,
-			TotalBytesDownloaded: 300,
+			TotalBytesUploaded:    600,
+			NContentRequests:      2,
+			NContentReqErrors:     2,
+			TotalBytesDownloaded:  300,
+			NSuccessfulRetrievals: 1,
 		}}, as)
 
 	// restart API -> we should still get the same values
@@ -84,11 +86,28 @@ func TestStationAPIImpl(t *testing.T) {
 			BytesCurrentlyStored: 790,
 		},
 		ReqStats: station.ReqStats{
-			TotalBytesUploaded:   600,
-			NContentRequests:     2,
-			NContentReqErrors:    2,
-			TotalBytesDownloaded: 300,
+			TotalBytesUploaded:    600,
+			NContentRequests:      2,
+			NContentReqErrors:     2,
+			NSuccessfulRetrievals: 1,
+			TotalBytesDownloaded:  300,
 		}}, as)
+
+	require.NoError(t, sapi.RecordRetrievalServed(ctx, 500, 0))
+	as, err = sapi.AllStats(ctx)
+	require.NoError(t, err)
+	require.Equal(t, station.StationStats{RPInfo: station.RPInfo{Version: Version},
+		StorageStats: station.StorageStats{
+			BytesCurrentlyStored: 790,
+		},
+		ReqStats: station.ReqStats{
+			TotalBytesUploaded:    1100,
+			NContentRequests:      3,
+			NContentReqErrors:     2,
+			NSuccessfulRetrievals: 2,
+			TotalBytesDownloaded:  300,
+		}}, as)
+
 }
 
 type mockStorageStatsFetcher struct {

cmd/saturn-l2/main.go

@@ -62,7 +62,7 @@ const (
 
 	// L1_DISCOVERY_URL_VAR configures the environment variable that determines the URL of the L1 Discovery API to invoke to
 	// get back the L1 nodes this L2 node will connect and serve CAR files to.
-	// Defaults to `defaultOrchestratorURL`.
+	// Defaults to `defaultL1DiscoveryURL`.
 	L1_DISCOVERY_URL_VAR = "L1_DISCOVERY_API_URL"
 
 	// MAX_L1s_VAR configures the environment variable that determines the maximum
@@ -111,7 +111,7 @@ var (
 	// DNS Hostname of Saturn L1 Nodes
 	saturn_l1_hostName = "strn.pl"
 
-	defaultOrchestratorURL = "https://orchestrator.strn.pl/nodes/nearby"
+	defaultL1DiscoveryURL = "https://orchestrator.strn.pl/nodes/nearby"
 )
 
 type config struct {
@@ -349,7 +349,7 @@ func mkConfig() (config, error) {
 		// parse L1 Discovery API URL
 		durl, exists = os.LookupEnv(L1_DISCOVERY_URL_VAR)
 		if !exists {
-			durl = defaultOrchestratorURL
+			durl = defaultL1DiscoveryURL
 		}
 		if _, err := url.Parse(durl); err != nil {
 			return config{}, fmt.Errorf("l1 discovery api url is invalid, failed to parse, err=%w", err)

station/station.go

@@ -29,8 +29,9 @@ type StorageStats struct {
 }
 
 type ReqStats struct {
-	TotalBytesUploaded   uint64
-	TotalBytesDownloaded uint64
-	NContentRequests     uint64
-	NContentReqErrors    uint64
+	TotalBytesUploaded    uint64
+	TotalBytesDownloaded  uint64
+	NContentRequests      uint64
+	NContentReqErrors     uint64
+	NSuccessfulRetrievals uint64
 }