Skip to content

Commit 243e8c3

Browse files
committed
remove needless variable allocation
Signed-off-by: perebaj <perebaj@gmail.com>
1 parent 2682725 commit 243e8c3

1 file changed

Lines changed: 10 additions & 19 deletions

File tree

receiver/prometheusreceiver/internal/transaction_test.go

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ func TestTransactionAppendResource(t *testing.T) {
131131
func testTransactionAppendResource(t *testing.T) {
132132
sink := new(consumertest.MetricsSink)
133133
tr := newTransaction(scrapeCtx, sink, labels.EmptyLabels(), receivertest.NewNopSettings(receivertest.NopType), nopObsRecv(t), false, true)
134-
w := tr
135134
_, err := tr.Append(0, labels.FromMap(map[string]string{
136135
model.InstanceLabel: "localhost:8080",
137136
model.JobLabel: "test",
@@ -144,7 +143,7 @@ func testTransactionAppendResource(t *testing.T) {
144143
model.MetricNameLabel: startTimeMetricName,
145144
}), 0, time.Now().UnixMilli(), 1.0, nil, nil, storage.AOptions{})
146145
assert.NoError(t, err)
147-
assert.NoError(t, w.Commit())
146+
assert.NoError(t, tr.Commit())
148147
expectedResource := CreateResource("test", "localhost:8080", labels.FromStrings(model.SchemeLabel, "http"))
149148
mds := sink.AllMetrics()
150149
require.Len(t, mds, 1)
@@ -159,7 +158,6 @@ func TestTransactionAppendMultipleResources(t *testing.T) {
159158
func testTransactionAppendMultipleResources(t *testing.T) {
160159
sink := new(consumertest.MetricsSink)
161160
tr := newTransaction(scrapeCtx, sink, labels.EmptyLabels(), receivertest.NewNopSettings(receivertest.NopType), nopObsRecv(t), false, true)
162-
w := tr
163161
_, err := tr.Append(0, labels.FromMap(map[string]string{
164162
model.InstanceLabel: "localhost:8080",
165163
model.JobLabel: "test-1",
@@ -172,7 +170,7 @@ func testTransactionAppendMultipleResources(t *testing.T) {
172170
model.MetricNameLabel: startTimeMetricName,
173171
}), 0, time.Now().UnixMilli(), 1.0, nil, nil, storage.AOptions{})
174172
assert.NoError(t, err)
175-
assert.NoError(t, w.Commit())
173+
assert.NoError(t, tr.Commit())
176174

177175
expectedResources := []pcommon.Resource{
178176
CreateResource("test-1", "localhost:8080", labels.FromStrings(model.SchemeLabel, "http")),
@@ -207,14 +205,13 @@ func TestReceiverVersionAndNameAreAttached(t *testing.T) {
207205
func testReceiverVersionAndNameAreAttached(t *testing.T) {
208206
sink := new(consumertest.MetricsSink)
209207
tr := newTransaction(scrapeCtx, sink, labels.EmptyLabels(), receivertest.NewNopSettings(receivertest.NopType), nopObsRecv(t), false, true)
210-
w := tr
211208
_, err := tr.Append(0, labels.FromMap(map[string]string{
212209
model.InstanceLabel: "localhost:8080",
213210
model.JobLabel: "test",
214211
model.MetricNameLabel: "counter_test",
215212
}), 0, time.Now().Unix()*1000, 1.0, nil, nil, storage.AOptions{})
216213
assert.NoError(t, err)
217-
assert.NoError(t, w.Commit())
214+
assert.NoError(t, tr.Commit())
218215

219216
expectedResource := CreateResource("test", "localhost:8080", labels.FromStrings(model.SchemeLabel, "http"))
220217
mds := sink.AllMetrics()
@@ -267,7 +264,6 @@ func testTransactionAppendHistogramNoLe(t *testing.T) {
267264
false,
268265
true,
269266
)
270-
w := tr
271267

272268
goodLabels := labels.FromStrings(
273269
model.InstanceLabel, "0.0.0.0:8855",
@@ -280,7 +276,7 @@ func testTransactionAppendHistogramNoLe(t *testing.T) {
280276
assert.Equal(t, 1, observedLogs.Len())
281277
assert.Equal(t, 1, observedLogs.FilterMessage("failed to add datapoint").Len())
282278

283-
assert.NoError(t, w.Commit())
279+
assert.NoError(t, tr.Commit())
284280
assert.Empty(t, sink.AllMetrics())
285281
}
286282

@@ -302,7 +298,6 @@ func testTransactionAppendSummaryNoQuantile(t *testing.T) {
302298
false,
303299
true,
304300
)
305-
w := tr
306301

307302
goodLabels := labels.FromStrings(
308303
model.InstanceLabel, "0.0.0.0:8855",
@@ -315,7 +310,7 @@ func testTransactionAppendSummaryNoQuantile(t *testing.T) {
315310
assert.Equal(t, 1, observedLogs.Len())
316311
assert.Equal(t, 1, observedLogs.FilterMessage("failed to add datapoint").Len())
317312

318-
assert.NoError(t, w.Commit())
313+
assert.NoError(t, tr.Commit())
319314
assert.Empty(t, sink.AllMetrics())
320315
}
321316

@@ -337,7 +332,6 @@ func testTransactionAppendValidAndInvalid(t *testing.T) {
337332
false,
338333
true,
339334
)
340-
w := tr
341335

342336
// a valid counter
343337
_, err := tr.Append(0, labels.FromMap(map[string]string{
@@ -360,7 +354,7 @@ func testTransactionAppendValidAndInvalid(t *testing.T) {
360354
assert.Equal(t, 1, observedLogs.Len())
361355
assert.Equal(t, 1, observedLogs.FilterMessage("failed to add datapoint").Len())
362356

363-
assert.NoError(t, w.Commit())
357+
assert.NoError(t, tr.Commit())
364358
expectedResource := CreateResource("test", "localhost:8080", labels.FromStrings(model.SchemeLabel, "http"))
365359
mds := sink.AllMetrics()
366360
require.Len(t, mds, 1)
@@ -674,16 +668,14 @@ func TestAppendHistogramStableSeriesRefEnablesSeriesDisappearanceTracking(t *tes
674668

675669
// Scrape #1: both series are present.
676670
tr1 := newTxn(t, false)
677-
w1 := tr1
678-
refA1, err := w1.Append(0, lsA, 0, ts, 0, tsdbutil.GenerateTestHistogram(1), nil, storage.AOptions{})
671+
refA1, err := tr1.Append(0, lsA, 0, ts, 0, tsdbutil.GenerateTestHistogram(1), nil, storage.AOptions{})
679672
require.NoError(t, err)
680-
refB1, err := w1.Append(0, lsB, 0, ts, 0, tsdbutil.GenerateTestHistogram(1), nil, storage.AOptions{})
673+
refB1, err := tr1.Append(0, lsB, 0, ts, 0, tsdbutil.GenerateTestHistogram(1), nil, storage.AOptions{})
681674
require.NoError(t, err)
682675

683676
// Scrape #2: only series A is present.
684677
tr2 := newTxn(t, false)
685-
w2 := tr2
686-
refA2, err := w2.Append(0, lsA, 0, ts+interval, 0, tsdbutil.GenerateTestHistogram(1), nil, storage.AOptions{})
678+
refA2, err := tr2.Append(0, lsA, 0, ts+interval, 0, tsdbutil.GenerateTestHistogram(1), nil, storage.AOptions{})
687679
require.NoError(t, err)
688680

689681
prev := map[storage.SeriesRef]struct{}{refA1: {}, refB1: {}}
@@ -1909,7 +1901,6 @@ func (tt buildTestData) run(t *testing.T) {
19091901
for i, page := range tt.inputs {
19101902
sink := new(consumertest.MetricsSink)
19111903
tr := newTransaction(scrapeCtx, sink, labels.EmptyLabels(), receivertest.NewNopSettings(receivertest.NopType), nopObsRecv(t), false, true)
1912-
w := tr
19131904
for _, pt := range page.pts {
19141905
// set ts for testing
19151906
pt.t = st
@@ -1918,7 +1909,7 @@ func (tt buildTestData) run(t *testing.T) {
19181909
})
19191910
assert.NoError(t, err)
19201911
}
1921-
assert.NoError(t, w.Commit())
1912+
assert.NoError(t, tr.Commit())
19221913
mds := sink.AllMetrics()
19231914
if wants[i].ResourceMetrics().Len() == 0 {
19241915
// Receiver does not emit empty metrics, so will not have anything in the sink.

0 commit comments

Comments
 (0)