diff --git a/disperser/dataapi/operators_info_handlers.go b/disperser/dataapi/operators_info_handlers.go index 127cf12b62..72af27abc5 100644 --- a/disperser/dataapi/operators_info_handlers.go +++ b/disperser/dataapi/operators_info_handlers.go @@ -47,7 +47,7 @@ func (s *server) getDeregisteredOperatorForDays(ctx context.Context, days int32) } // Log the time taken - s.logger.Info("Time taken to get deregistered operators for days: %v", time.Since(startTime)) + s.logger.Info("Time taken to get deregistered operators for days", "duration", time.Since(startTime)) sort.Slice(DeregisteredOperatorMetadata, func(i, j int) bool { return DeregisteredOperatorMetadata[i].BlockNumber < DeregisteredOperatorMetadata[j].BlockNumber }) @@ -86,9 +86,9 @@ func checkIsOnlineAndProcessOperator(operatorStatus OperatorOnlineStatus, operat // Log the online status if isOnline { - logger.Debug("Operator %v is online at %s", operatorStatus.IndexedOperatorInfo, socket) + logger.Debug("Operator is online", "operatorInfo", operatorStatus.IndexedOperatorInfo, "socket", socket) } else { - logger.Debug("Operator %v is offline at %s", operatorStatus.IndexedOperatorInfo, socket) + logger.Debug("Operator is offline", "operatorInfo", operatorStatus.IndexedOperatorInfo, "socket", socket) } // Create the metadata regardless of online status diff --git a/disperser/dataapi/server_test.go b/disperser/dataapi/server_test.go index ad33777c96..2cafffb85d 100644 --- a/disperser/dataapi/server_test.go +++ b/disperser/dataapi/server_test.go @@ -604,10 +604,10 @@ func TestFetchDeregisteredOperatorOffline(t *testing.T) { mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorState, nil) - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil) r.ServeHTTP(w, req) res := w.Result() @@ -715,10 +715,10 @@ func TestFetchDeregisteredOperatorInvalidDaysQueryParam(t *testing.T) { mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorStates, nil) - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=ten", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=ten", nil) r.ServeHTTP(w, req) res := w.Result() @@ -757,10 +757,10 @@ func TestFetchDeregisteredOperatorQueryDaysGreaterThan30(t *testing.T) { mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorState, nil) - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=31", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=31", nil) r.ServeHTTP(w, req) res := w.Result() @@ -803,10 +803,10 @@ func TestFetchDeregisteredOperatorsMultipleOffline(t *testing.T) { mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorStates, nil) - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil) r.ServeHTTP(w, req) res := w.Result() @@ -868,10 +868,10 @@ func TestFetchDeregisteredOperatorOnline(t *testing.T) { } defer closeServer() // Ensure the server is closed after the test - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil) r.ServeHTTP(w, req) res := w.Result() @@ -924,10 +924,10 @@ func TestFetchDeregisteredOperatorsMultipleOfflineOnline(t *testing.T) { } defer closeServer() - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil) r.ServeHTTP(w, req) res := w.Result() @@ -998,10 +998,10 @@ func TestFetchDeregisteredOperatorsMultipleOnline(t *testing.T) { } defer closeServer2() // Ensure the server is closed after the test - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil) r.ServeHTTP(w, req) res := w.Result() @@ -1059,10 +1059,10 @@ func TestFetchDeregisteredOperatorsMultipleOfflineSameBlock(t *testing.T) { mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorStates, nil) - r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators) + r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators) w := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil) + req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil) r.ServeHTTP(w, req) res := w.Result()