Skip to content

Commit 3496b02

Browse files
Arta AsadiArta Asadi
Arta Asadi
authored and
Arta Asadi
committed
fix: record error on send telemetry failure
1 parent 763619e commit 3496b02

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

jobs/checkup-job/job.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (j Job) Do(integrationClient client.IntegrationServiceClient, authClient au
118118
err = j.SendTelemetry(context.Background(), logger, config, integrationClient, authClient, coreClient)
119119
if err != nil {
120120
status = api.CheckupJobFailed
121-
errMsg = fmt.Sprintf("%s \n failed to check integration healthcheck: %s", errMsg, err.Error())
121+
errMsg = fmt.Sprintf("%s \n failed to send telemetry: %s", errMsg, err.Error())
122122
}
123123

124124
return JobResult{
@@ -139,7 +139,7 @@ func (j *Job) SendTelemetry(ctx context.Context, logger *zap.Logger, workerConfi
139139
pluginsResponse, err := integrationClient.ListPlugins(&httpCtx)
140140
if err != nil {
141141
logger.Error("failed to list sources", zap.Error(err))
142-
return err
142+
return fmt.Errorf("failed to list sources: %w", err)
143143
}
144144
for _, p := range pluginsResponse.Items {
145145
plugins = append(plugins, shared_entities.UsageTrackerPluginInfo{
@@ -152,18 +152,18 @@ func (j *Job) SendTelemetry(ctx context.Context, logger *zap.Logger, workerConfi
152152
users, err := authClient.ListUsers(&httpCtx)
153153
if err != nil {
154154
logger.Error("failed to list users", zap.Error(err))
155-
return err
155+
return fmt.Errorf("failed to list users: %w", err)
156156
}
157157
keys, err := authClient.ListApiKeys(&httpCtx)
158158
if err != nil {
159159
logger.Error("failed to list api keys", zap.Error(err))
160-
return err
160+
return fmt.Errorf("failed to list api keys: %w", err)
161161
}
162162

163163
about, err := coreClient.GetAbout(&httpCtx)
164164
if err != nil {
165165
logger.Error("failed to get about", zap.Error(err))
166-
return err
166+
return fmt.Errorf("failed to get about: %w", err)
167167
}
168168

169169
req := shared_entities.UsageTrackerRequest{
@@ -179,12 +179,12 @@ func (j *Job) SendTelemetry(ctx context.Context, logger *zap.Logger, workerConfi
179179
reqBytes, err := json.Marshal(req)
180180
if err != nil {
181181
logger.Error("failed to marshal telemetry request", zap.Error(err))
182-
return err
182+
return fmt.Errorf("failed to marshal telemetry request: %w", err)
183183
}
184184
var resp any
185185
if statusCode, err := httpclient.DoRequest(httpCtx.Ctx, http.MethodPost, UsageTrackerEndpoint, httpCtx.ToHeaders(), reqBytes, &resp); err != nil {
186186
logger.Error("failed to send telemetry", zap.Error(err), zap.Int("status_code", statusCode), zap.String("url", UsageTrackerEndpoint), zap.Any("req", req), zap.Any("resp", resp))
187-
return err
187+
return fmt.Errorf("failed to send telemetry request: %w", err)
188188
}
189189

190190
logger.Info("sent telemetry", zap.String("url", UsageTrackerEndpoint))

0 commit comments

Comments
 (0)