Skip to content

Commit b81f0f1

Browse files
committed
Fix golangci-lint failures
- exporter: remove unused telemetryPayload struct (deadcode) - exporter, aggregator: restore logger.Trace in recover blocks (SA9003 empty branch) - benchmark_test: add _ = to unchecked releaseClient calls (errcheck) - integration_test: add _ = to unchecked json.Encode/Unmarshal calls (errcheck) Co-authored-by: Isaac
1 parent 1c7c572 commit b81f0f1

4 files changed

Lines changed: 11 additions & 17 deletions

File tree

telemetry/aggregator.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ func (agg *metricsAggregator) recordMetric(ctx context.Context, metric *telemetr
6565
// Swallow all errors
6666
defer func() {
6767
if r := recover(); r != nil {
68-
// Log at trace level only
69-
// logger.Trace().Msgf("telemetry: recordMetric panic: %v", r)
68+
logger.Trace().Msgf("telemetry: recordMetric panic: %v", r)
7069
}
7170
}()
7271

@@ -141,7 +140,7 @@ func (agg *metricsAggregator) recordMetric(ctx context.Context, metric *telemetr
141140
func (agg *metricsAggregator) completeStatement(ctx context.Context, statementID string, failed bool) {
142141
defer func() {
143142
if r := recover(); r != nil {
144-
// Log at trace level only
143+
logger.Trace().Msgf("telemetry: completeStatement panic: %v", r)
145144
}
146145
}()
147146

@@ -229,7 +228,7 @@ func (agg *metricsAggregator) flushUnlocked(ctx context.Context) {
229228
defer func() {
230229
<-agg.exportSem
231230
if r := recover(); r != nil {
232-
// Log at trace level only
231+
logger.Trace().Msgf("telemetry: async export panic: %v", r)
233232
}
234233
}()
235234
agg.exporter.export(ctx, metrics)

telemetry/benchmark_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func BenchmarkConcurrentConnections_PerHostSharing(b *testing.B) {
145145
_ = client
146146

147147
// Release client
148-
mgr.releaseClient(host)
148+
_ = mgr.releaseClient(host)
149149
}
150150
})
151151
}
@@ -212,7 +212,7 @@ func TestLoadTesting_ConcurrentConnections(t *testing.T) {
212212
}
213213

214214
// Release client
215-
mgr.releaseClient(host)
215+
_ = mgr.releaseClient(host)
216216
}()
217217
}
218218

telemetry/exporter.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import (
99
"net/http"
1010
"strings"
1111
"time"
12+
13+
"github.com/databricks/databricks-sql-go/logger"
1214
)
1315

1416
const (
@@ -39,11 +41,6 @@ type telemetryMetric struct {
3941
tags map[string]interface{}
4042
}
4143

42-
// telemetryPayload is the JSON structure sent to Databricks.
43-
type telemetryPayload struct {
44-
Metrics []*exportedMetric `json:"metrics"`
45-
}
46-
4744
// exportedMetric is a single metric in the payload.
4845
type exportedMetric struct {
4946
MetricType string `json:"metric_type"`
@@ -81,8 +78,7 @@ func (e *telemetryExporter) export(ctx context.Context, metrics []*telemetryMetr
8178
// Swallow all errors and panics
8279
defer func() {
8380
if r := recover(); r != nil {
84-
// Log at trace level only
85-
// logger.Trace().Msgf("telemetry: export panic: %v", r)
81+
logger.Trace().Msgf("telemetry: export panic: %v", r)
8682
}
8783
}()
8884

@@ -97,8 +93,7 @@ func (e *telemetryExporter) export(ctx context.Context, metrics []*telemetryMetr
9793
}
9894

9995
if err != nil {
100-
// Log at trace level only
101-
// logger.Trace().Msgf("telemetry: export error: %v", err)
96+
logger.Trace().Msgf("telemetry: export error: %v", err)
10297
}
10398
}
10499

telemetry/integration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func TestIntegration_OptInPriority_ExplicitOptOut(t *testing.T) {
167167
"databricks.partnerplatform.clientConfigsFeatureFlags.enableTelemetryForGoDriver": true,
168168
},
169169
}
170-
json.NewEncoder(w).Encode(resp)
170+
_ = json.NewEncoder(w).Encode(resp)
171171
}))
172172
defer server.Close()
173173

@@ -241,7 +241,7 @@ func TestIntegration_FieldMapping(t *testing.T) {
241241
var capturedRequest TelemetryRequest
242242
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
243243
body, _ := io.ReadAll(r.Body)
244-
json.Unmarshal(body, &capturedRequest)
244+
_ = json.Unmarshal(body, &capturedRequest)
245245
w.WriteHeader(http.StatusOK)
246246
}))
247247
defer server.Close()

0 commit comments

Comments
 (0)