Skip to content

Commit f2dd1e9

Browse files
pradeepitm12pradeepitm12
authored
fix golang ci lint issue (#46)
this fixes golang ci lint
1 parent 5763b75 commit f2dd1e9

File tree

4 files changed

+77
-24
lines changed

4 files changed

+77
-24
lines changed

‎cmd/server/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ import (
1616
func main() {
1717
cfg, err := config.LoadConfig()
1818
if err != nil {
19-
fmt.Fprintln(os.Stderr, fmt.Sprintf("Failed to load config: %v", err))
19+
fmt.Fprintf(os.Stderr, "Failed to load config: %v\n", err)
2020
os.Exit(1)
2121
}
2222

2323
if err := cfg.ValidateConfig(); err != nil {
24-
fmt.Fprintln(os.Stderr, fmt.Sprintf("Configuration validation failed: %v", err))
24+
fmt.Fprintf(os.Stderr, "Configuration validation failed: %v\n", err)
2525
os.Exit(1)
2626
}
2727

2828
log, err := logger.NewLogger(logger.LogLevel(cfg.LogLevel))
2929
if err != nil {
30-
fmt.Fprintln(os.Stderr, fmt.Sprintf("Failed to initialize logger: %v", err))
30+
fmt.Fprintf(os.Stderr, "Failed to initialize logger: %v\n", err)
3131
os.Exit(1)
3232
}
3333

‎internal/client/client.go‎

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ func (s *SigNoz) ListMetricKeys(ctx context.Context) (json.RawMessage, error) {
5151
s.logger.Error("HTTP request failed", zap.String("url", url), zap.Error(err))
5252
return nil, fmt.Errorf("failed to do request: %w", err)
5353
}
54-
defer resp.Body.Close()
54+
defer func() {
55+
if err := resp.Body.Close(); err != nil {
56+
s.logger.Warn("Failed to close response body", zap.Error(err))
57+
}
58+
}()
5559

5660
body, err := io.ReadAll(resp.Body)
5761
if err != nil {
@@ -90,7 +94,11 @@ func (s *SigNoz) SearchMetricByText(ctx context.Context, searchText string) (jso
9094
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("searchText", searchText), zap.Error(err))
9195
return nil, fmt.Errorf("failed to do request: %w", err)
9296
}
93-
defer resp.Body.Close()
97+
defer func() {
98+
if err := resp.Body.Close(); err != nil {
99+
s.logger.Warn("Failed to close response body", zap.Error(err))
100+
}
101+
}()
94102

95103
body, err := io.ReadAll(resp.Body)
96104
if err != nil {
@@ -129,7 +137,11 @@ func (s *SigNoz) ListAlerts(ctx context.Context) (json.RawMessage, error) {
129137
s.logger.Error("HTTP request failed", zap.String("url", url), zap.Error(err))
130138
return nil, fmt.Errorf("failed to do request: %w", err)
131139
}
132-
defer resp.Body.Close()
140+
defer func() {
141+
if err := resp.Body.Close(); err != nil {
142+
s.logger.Warn("Failed to close response body", zap.Error(err))
143+
}
144+
}()
133145

134146
body, err := io.ReadAll(resp.Body)
135147
if err != nil {
@@ -167,7 +179,11 @@ func (s *SigNoz) GetAlertByRuleID(ctx context.Context, ruleID string) (json.RawM
167179
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("ruleID", ruleID), zap.Error(err))
168180
return nil, fmt.Errorf("request error: %w", err)
169181
}
170-
defer resp.Body.Close()
182+
defer func() {
183+
if err := resp.Body.Close(); err != nil {
184+
s.logger.Warn("Failed to close response body", zap.Error(err))
185+
}
186+
}()
171187

172188
body, err := io.ReadAll(resp.Body)
173189
if err != nil {
@@ -208,7 +224,11 @@ func (s *SigNoz) ListDashboards(ctx context.Context) (json.RawMessage, error) {
208224
s.logger.Error("HTTP request failed", zap.String("url", url), zap.Error(err))
209225
return nil, fmt.Errorf("failed to do request: %w", err)
210226
}
211-
defer resp.Body.Close()
227+
defer func() {
228+
if err := resp.Body.Close(); err != nil {
229+
s.logger.Warn("Failed to close response body", zap.Error(err))
230+
}
231+
}()
212232

213233
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
214234
body, _ := io.ReadAll(resp.Body)
@@ -301,7 +321,11 @@ func (s *SigNoz) GetDashboard(ctx context.Context, uuid string) (json.RawMessage
301321
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("uuid", uuid), zap.Error(err))
302322
return nil, fmt.Errorf("failed to do request: %w", err)
303323
}
304-
defer resp.Body.Close()
324+
defer func() {
325+
if err := resp.Body.Close(); err != nil {
326+
s.logger.Warn("Failed to close response body", zap.Error(err))
327+
}
328+
}()
305329

306330
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
307331
body, _ := io.ReadAll(resp.Body)
@@ -346,7 +370,11 @@ func (s *SigNoz) ListServices(ctx context.Context, start, end string) (json.RawM
346370
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("start", start), zap.String("end", end), zap.Error(err))
347371
return nil, fmt.Errorf("failed to do request: %w", err)
348372
}
349-
defer resp.Body.Close()
373+
defer func() {
374+
if err := resp.Body.Close(); err != nil {
375+
s.logger.Warn("Failed to close response body", zap.Error(err))
376+
}
377+
}()
350378

351379
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
352380
body, _ := io.ReadAll(resp.Body)
@@ -393,7 +421,11 @@ func (s *SigNoz) GetServiceTopOperations(ctx context.Context, start, end, servic
393421
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("start", start), zap.String("end", end), zap.String("service", service), zap.Error(err))
394422
return nil, fmt.Errorf("failed to do request: %w", err)
395423
}
396-
defer resp.Body.Close()
424+
defer func() {
425+
if err := resp.Body.Close(); err != nil {
426+
s.logger.Warn("Failed to close response body", zap.Error(err))
427+
}
428+
}()
397429

398430
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
399431
body, _ := io.ReadAll(resp.Body)
@@ -432,7 +464,11 @@ func (s *SigNoz) QueryBuilderV5(ctx context.Context, body []byte) (json.RawMessa
432464
if err != nil {
433465
return nil, fmt.Errorf("failed to do request: %w", err)
434466
}
435-
defer resp.Body.Close()
467+
defer func() {
468+
if err := resp.Body.Close(); err != nil {
469+
s.logger.Warn("Failed to close response body", zap.Error(err))
470+
}
471+
}()
436472

437473
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
438474
b, _ := io.ReadAll(resp.Body)
@@ -480,7 +516,11 @@ func (s *SigNoz) GetAlertHistory(ctx context.Context, ruleID string, req types.A
480516
s.logger.Error("HTTP request failed", zap.String("url", url), zap.Error(err))
481517
return nil, fmt.Errorf("failed to do request: %w", err)
482518
}
483-
defer resp.Body.Close()
519+
defer func() {
520+
if err := resp.Body.Close(); err != nil {
521+
s.logger.Warn("Failed to close response body", zap.Error(err))
522+
}
523+
}()
484524

485525
body, err := io.ReadAll(resp.Body)
486526
if err != nil {
@@ -521,7 +561,11 @@ func (s *SigNoz) ListLogViews(ctx context.Context) (json.RawMessage, error) {
521561
s.logger.Error("HTTP request failed", zap.String("url", url), zap.Error(err))
522562
return nil, fmt.Errorf("failed to do request: %w", err)
523563
}
524-
defer resp.Body.Close()
564+
defer func() {
565+
if err := resp.Body.Close(); err != nil {
566+
s.logger.Warn("Failed to close response body", zap.Error(err))
567+
}
568+
}()
525569

526570
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
527571
body, _ := io.ReadAll(resp.Body)
@@ -561,7 +605,11 @@ func (s *SigNoz) GetLogView(ctx context.Context, viewID string) (json.RawMessage
561605
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("viewID", viewID), zap.Error(err))
562606
return nil, fmt.Errorf("failed to do request: %w", err)
563607
}
564-
defer resp.Body.Close()
608+
defer func() {
609+
if err := resp.Body.Close(); err != nil {
610+
s.logger.Warn("Failed to close response body", zap.Error(err))
611+
}
612+
}()
565613

566614
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
567615
body, _ := io.ReadAll(resp.Body)
@@ -601,7 +649,11 @@ func (s *SigNoz) GetTraceFieldValues(ctx context.Context, fieldName string, sear
601649
s.logger.Error("HTTP request failed", zap.String("url", url), zap.String("fieldName", fieldName), zap.Error(err))
602650
return nil, fmt.Errorf("failed to do request: %w", err)
603651
}
604-
defer resp.Body.Close()
652+
defer func() {
653+
if err := resp.Body.Close(); err != nil {
654+
s.logger.Warn("Failed to close response body", zap.Error(err))
655+
}
656+
}()
605657

606658
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
607659
body, _ := io.ReadAll(resp.Body)

‎internal/client/client_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestGetAlertByRuleID(t *testing.T) {
8383

8484
w.WriteHeader(tt.statusCode)
8585
responseBody, _ := json.Marshal(tt.resp)
86-
w.Write(responseBody)
86+
_, _ = w.Write(responseBody)
8787
}))
8888
defer server.Close()
8989

@@ -173,7 +173,7 @@ func TestListMetricKeys(t *testing.T) {
173173

174174
w.WriteHeader(tt.statusCode)
175175
responseBody, _ := json.Marshal(tt.resp)
176-
w.Write(responseBody)
176+
_, _ = w.Write(responseBody)
177177
}))
178178
defer server.Close()
179179

@@ -293,7 +293,7 @@ func TestListDashboards(t *testing.T) {
293293

294294
w.WriteHeader(tt.statusCode)
295295
responseBody, _ := json.Marshal(tt.resp)
296-
w.Write(responseBody)
296+
_, _ = w.Write(responseBody)
297297
}))
298298
defer server.Close()
299299

@@ -422,7 +422,7 @@ func TestListServices(t *testing.T) {
422422

423423
w.WriteHeader(tt.statusCode)
424424
responseBody, _ := json.Marshal(tt.resp)
425-
w.Write(responseBody)
425+
_, _ = w.Write(responseBody)
426426
}))
427427
defer server.Close()
428428

@@ -608,7 +608,7 @@ func TestGetAlertHistory(t *testing.T) {
608608

609609
w.WriteHeader(tt.statusCode)
610610
responseBody, _ := json.Marshal(tt.resp)
611-
w.Write(responseBody)
611+
_, _ = w.Write(responseBody)
612612
}))
613613
defer server.Close()
614614

@@ -773,7 +773,7 @@ func TestQueryBuilderV5(t *testing.T) {
773773

774774
w.WriteHeader(tt.statusCode)
775775
responseBody, _ := json.Marshal(tt.resp)
776-
w.Write(responseBody)
776+
_, _ = w.Write(responseBody)
777777
}))
778778
defer server.Close()
779779

‎internal/handler/tools/handler.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,9 +915,10 @@ func (h *Handler) RegisterTracesHandlers(s *server.MCPServer) {
915915
}
916916

917917
if errorFilter, ok := args["error"].(string); ok && errorFilter != "" {
918-
if errorFilter == "true" {
918+
switch errorFilter {
919+
case "true":
919920
filterExpression += " AND hasError = true"
920-
} else if errorFilter == "false" {
921+
case "false":
921922
filterExpression += " AND hasError = false"
922923
}
923924
}

0 commit comments

Comments
 (0)