Skip to content

Commit ced9cd7

Browse files
author
Ignacio Van Droogenbroeck
committed
arc: address PR review feedback
- Update fmt.Errorf messages to project gerund-form convention - Always skip "time" key in message fields regardless of timestamp_field value (reserved for extracted timestamp) - Fix lint: unused receiver, unused request params, testify GreaterOrEqual for length check
1 parent 29cf37d commit ced9cd7

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

internal/impl/arc/output.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,13 @@ func newArcOutput(conf *service.ParsedConfig, mgr *service.Resources) (*arcOutpu
213213
httpCfg.MetricPrefix = "arc_http"
214214

215215
if o.client, err = httpclient.NewClient(httpCfg, mgr); err != nil {
216-
return nil, fmt.Errorf("create HTTP client: %w", err)
216+
return nil, fmt.Errorf("creating HTTP client: %w", err)
217217
}
218218

219219
return o, nil
220220
}
221221

222-
func (o *arcOutput) Connect(_ context.Context) error {
222+
func (*arcOutput) Connect(_ context.Context) error {
223223
return nil
224224
}
225225

@@ -245,12 +245,12 @@ func (o *arcOutput) WriteBatch(ctx context.Context, batch service.MessageBatch)
245245

246246
data, err := msgpack.Marshal(payload)
247247
if err != nil {
248-
return fmt.Errorf("msgpack encoding: %w", err)
248+
return fmt.Errorf("encoding msgpack: %w", err)
249249
}
250250

251251
compressed, encoding, err := o.compress(data)
252252
if err != nil {
253-
return fmt.Errorf("compression: %w", err)
253+
return fmt.Errorf("compressing: %w", err)
254254
}
255255

256256
return o.sendRequest(ctx, compressed, encoding)
@@ -270,7 +270,7 @@ func (o *arcOutput) buildColumnarPayload(batch service.MessageBatch) (any, error
270270
for i, msg := range batch {
271271
measName, err := measExec.TryString(i)
272272
if err != nil {
273-
return nil, fmt.Errorf("measurement interpolation: %w", err)
273+
return nil, fmt.Errorf("interpolating measurement: %w", err)
274274
}
275275

276276
data, err := msg.AsStructuredMut()
@@ -294,7 +294,7 @@ func (o *arcOutput) buildColumnarPayload(batch service.MessageBatch) (any, error
294294

295295
rec.columns["time"] = append(rec.columns["time"], ts)
296296
for k, v := range dataMap {
297-
if k == o.timestampField || (o.timestampField == "" && k == "time") {
297+
if k == o.timestampField || k == "time" {
298298
continue
299299
}
300300
rec.columns[k] = append(rec.columns[k], v)
@@ -329,7 +329,7 @@ func (o *arcOutput) buildRowPayload(batch service.MessageBatch) (any, error) {
329329
for i, msg := range batch {
330330
measName, err := measExec.TryString(i)
331331
if err != nil {
332-
return nil, fmt.Errorf("measurement interpolation: %w", err)
332+
return nil, fmt.Errorf("interpolating measurement: %w", err)
333333
}
334334

335335
data, err := msg.AsStructuredMut()
@@ -347,7 +347,7 @@ func (o *arcOutput) buildRowPayload(batch service.MessageBatch) (any, error) {
347347
// Remove timestamp field from fields if present
348348
fields := make(map[string]any, len(dataMap))
349349
for k, v := range dataMap {
350-
if k == o.timestampField || (o.timestampField == "" && k == "time") {
350+
if k == o.timestampField || k == "time" {
351351
continue
352352
}
353353
fields[k] = v
@@ -363,12 +363,12 @@ func (o *arcOutput) buildRowPayload(batch service.MessageBatch) (any, error) {
363363
if tagsExec != nil {
364364
tagMsg, err := tagsExec.Query(i)
365365
if err != nil {
366-
return nil, fmt.Errorf("tags mapping: %w", err)
366+
return nil, fmt.Errorf("mapping tags: %w", err)
367367
}
368368
if tagMsg != nil {
369369
tagResult, err := tagMsg.AsStructured()
370370
if err != nil {
371-
return nil, fmt.Errorf("tags mapping result: %w", err)
371+
return nil, fmt.Errorf("reading tags mapping result: %w", err)
372372
}
373373
if tagMap, ok := tagResult.(map[string]any); ok {
374374
tags := make(map[string]string, len(tagMap))

internal/impl/arc/output_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ compression: gzip
269269
defer mu.Unlock()
270270

271271
assert.Equal(t, "gzip", headers.Get("Content-Encoding"))
272-
require.True(t, len(*received) >= 2)
272+
require.GreaterOrEqual(t, len(*received), 2)
273273
assert.Equal(t, byte(0x1f), (*received)[0])
274274
assert.Equal(t, byte(0x8b), (*received)[1])
275275

@@ -308,7 +308,7 @@ compression: none
308308
}
309309

310310
func TestArcOutput_ErrorResponse(t *testing.T) {
311-
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
311+
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
312312
w.Header().Set("Content-Type", "application/json")
313313
w.WriteHeader(http.StatusBadRequest)
314314
_ = json.NewEncoder(w).Encode(map[string]string{"error": "invalid measurement name"})
@@ -342,7 +342,7 @@ compression: none
342342
func TestArcOutput_EmptyBatch(t *testing.T) {
343343
var mu sync.Mutex
344344
called := false
345-
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
345+
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
346346
mu.Lock()
347347
called = true
348348
mu.Unlock()

0 commit comments

Comments
 (0)