Skip to content

Commit 5261786

Browse files
committed
Fix error wrapping
1 parent 391715f commit 5261786

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

client/nginx.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func NewNginxClient(httpClient *http.Client, apiEndpoint string) (*NginxClient,
4545
func (client *NginxClient) GetStubStats() (*StubStats, error) {
4646
resp, err := client.httpClient.Get(client.apiEndpoint)
4747
if err != nil {
48-
return nil, fmt.Errorf("failed to get %v: %v", client.apiEndpoint, err)
48+
return nil, fmt.Errorf("failed to get %v: %w", client.apiEndpoint, err)
4949
}
5050
defer resp.Body.Close()
5151

@@ -55,13 +55,13 @@ func (client *NginxClient) GetStubStats() (*StubStats, error) {
5555

5656
body, err := io.ReadAll(resp.Body)
5757
if err != nil {
58-
return nil, fmt.Errorf("failed to read the response body: %v", err)
58+
return nil, fmt.Errorf("failed to read the response body: %w", err)
5959
}
6060

6161
var stats StubStats
6262
err = parseStubStats(body, &stats)
6363
if err != nil {
64-
return nil, fmt.Errorf("failed to parse response body %q: %v", string(body), err)
64+
return nil, fmt.Errorf("failed to parse response body %q: %w", string(body), err)
6565
}
6666

6767
return &stats, nil
@@ -82,7 +82,7 @@ func parseStubStats(data []byte, stats *StubStats) error {
8282

8383
actCons, err := strconv.ParseInt(activeConsParts[2], 10, 64)
8484
if err != nil {
85-
return fmt.Errorf("invalid input for active connections %q: %v", activeConsParts[2], err)
85+
return fmt.Errorf("invalid input for active connections %q: %w", activeConsParts[2], err)
8686
}
8787
stats.Connections.Active = actCons
8888

@@ -93,19 +93,19 @@ func parseStubStats(data []byte, stats *StubStats) error {
9393

9494
acceptedCons, err := strconv.ParseInt(miscParts[0], 10, 64)
9595
if err != nil {
96-
return fmt.Errorf("invalid input for accepted connections %q: %v", miscParts[0], err)
96+
return fmt.Errorf("invalid input for accepted connections %q: %w", miscParts[0], err)
9797
}
9898
stats.Connections.Accepted = acceptedCons
9999

100100
handledCons, err := strconv.ParseInt(miscParts[1], 10, 64)
101101
if err != nil {
102-
return fmt.Errorf("invalid input for handled connections %q: %v", miscParts[1], err)
102+
return fmt.Errorf("invalid input for handled connections %q: %w", miscParts[1], err)
103103
}
104104
stats.Connections.Handled = handledCons
105105

106106
requests, err := strconv.ParseInt(miscParts[2], 10, 64)
107107
if err != nil {
108-
return fmt.Errorf("invalid input for requests %q: %v", miscParts[2], err)
108+
return fmt.Errorf("invalid input for requests %q: %w", miscParts[2], err)
109109
}
110110
stats.Requests = requests
111111

@@ -116,19 +116,19 @@ func parseStubStats(data []byte, stats *StubStats) error {
116116

117117
readingCons, err := strconv.ParseInt(consParts[1], 10, 64)
118118
if err != nil {
119-
return fmt.Errorf("invalid input for reading connections %q: %v", consParts[1], err)
119+
return fmt.Errorf("invalid input for reading connections %q: %w", consParts[1], err)
120120
}
121121
stats.Connections.Reading = readingCons
122122

123123
writingCons, err := strconv.ParseInt(consParts[3], 10, 64)
124124
if err != nil {
125-
return fmt.Errorf("invalid input for writing connections %q: %v", consParts[3], err)
125+
return fmt.Errorf("invalid input for writing connections %q: %w", consParts[3], err)
126126
}
127127
stats.Connections.Writing = writingCons
128128

129129
waitingCons, err := strconv.ParseInt(consParts[5], 10, 64)
130130
if err != nil {
131-
return fmt.Errorf("invalid input for waiting connections %q: %v", consParts[5], err)
131+
return fmt.Errorf("invalid input for waiting connections %q: %w", consParts[5], err)
132132
}
133133
stats.Connections.Waiting = waitingCons
134134

exporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func getListener(listenAddress string) (net.Listener, error) {
201201
if strings.HasPrefix(listenAddress, "unix:") {
202202
path, _, pathError := parseUnixSocketAddress(listenAddress)
203203
if pathError != nil {
204-
return listener, fmt.Errorf("parsing unix domain socket listen address %s failed: %v", listenAddress, pathError)
204+
return listener, fmt.Errorf("parsing unix domain socket listen address %s failed: %w", listenAddress, pathError)
205205
}
206206
listener, err = net.ListenUnix("unix", &net.UnixAddr{Name: path, Net: "unix"})
207207
} else {

0 commit comments

Comments
 (0)