Skip to content

Commit 406aeab

Browse files
sincejunesincejune
authored
[chore] Replace NewNopSettings with NewNopSettingsWithType (open-telemetry#38074)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Remove `NewNopSettings` introduced recently cc @mx-psi <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue open-telemetry/opentelemetry-collector#12305 <!--Describe what testing was performed and which tests were added.--> #### Testing n/a <!--Describe the documentation added.--> #### Documentation n/a <!--Please delete paragraphs that you did not use before submitting.-->
1 parent e4ac66c commit 406aeab

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎exporter/stefexporter/exporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func TestCancelBlockedExport(t *testing.T) {
355355
TLSSetting: configtls.ClientConfig{Insecure: true},
356356
}
357357

358-
set := exportertest.NewNopSettings()
358+
set := exportertest.NewNopSettingsWithType(exportertest.NopType)
359359
set.TelemetrySettings.Logger = logger
360360

361361
exp := newStefExporter(set.TelemetrySettings, cfg)
@@ -409,7 +409,7 @@ func TestCancelAfterExport(t *testing.T) {
409409
TLSSetting: configtls.ClientConfig{Insecure: true},
410410
}
411411

412-
set := exportertest.NewNopSettings()
412+
set := exportertest.NewNopSettingsWithType(exportertest.NopType)
413413
set.TelemetrySettings.Logger = logger
414414

415415
exp := newStefExporter(set.TelemetrySettings, cfg)

‎receiver/azuremonitorreceiver/scraper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ func TestAzureScraperScrapeHonorTimeGrain(t *testing.T) {
372372
clientMetricsValues: metricsValuesClientMock,
373373
mb: metadata.NewMetricsBuilder(
374374
metadata.DefaultMetricsBuilderConfig(),
375-
receivertest.NewNopSettings(),
375+
receivertest.NewNopSettingsWithType(receivertest.NopType),
376376
),
377377
mutex: &sync.Mutex{},
378378
resources: map[string]*azureResource{},

‎receiver/kafkametricsreceiver/receiver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestNewReceiver_invalid_auth_error(t *testing.T) {
6363
func TestNewReceiver_refresh_frequency(t *testing.T) {
6464
c := createDefaultConfig().(*Config)
6565
c.RefreshFrequency = 1
66-
r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopSettings(), nil)
66+
r, err := newMetricsReceiver(context.Background(), *c, receivertest.NewNopSettingsWithType(receivertest.NopType), nil)
6767
assert.NoError(t, err)
6868
assert.NotNil(t, r)
6969
}

‎receiver/prometheusreceiver/internal/transaction_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -599,23 +599,23 @@ func testAppendExemplarWithEmptyLabelArray(t *testing.T, enableNativeHistograms
599599

600600
func TestAppendCTZeroSampleNoLabels(t *testing.T) {
601601
sink := new(consumertest.MetricsSink)
602-
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
602+
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
603603

604604
_, err := tr.AppendCTZeroSample(0, labels.FromStrings(), 0, 100)
605605
assert.ErrorContains(t, err, "job or instance cannot be found from labels")
606606
}
607607

608608
func TestAppendHistogramCTZeroSampleNoLabels(t *testing.T) {
609609
sink := new(consumertest.MetricsSink)
610-
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
610+
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
611611

612612
_, err := tr.AppendHistogramCTZeroSample(0, labels.FromStrings(), 0, 100, nil, nil)
613613
assert.ErrorContains(t, err, "job or instance cannot be found from labels")
614614
}
615615

616616
func TestAppendCTZeroSampleDuplicateLabels(t *testing.T) {
617617
sink := new(consumertest.MetricsSink)
618-
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
618+
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
619619

620620
_, err := tr.AppendCTZeroSample(0, labels.FromStrings(
621621
model.InstanceLabel, "0.0.0.0:8855",
@@ -629,7 +629,7 @@ func TestAppendCTZeroSampleDuplicateLabels(t *testing.T) {
629629

630630
func TestAppendHistogramCTZeroSampleDuplicateLabels(t *testing.T) {
631631
sink := new(consumertest.MetricsSink)
632-
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
632+
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
633633

634634
_, err := tr.AppendHistogramCTZeroSample(0, labels.FromStrings(
635635
model.InstanceLabel, "0.0.0.0:8855",
@@ -643,7 +643,7 @@ func TestAppendHistogramCTZeroSampleDuplicateLabels(t *testing.T) {
643643

644644
func TestAppendCTZeroSampleEmptyMetricName(t *testing.T) {
645645
sink := new(consumertest.MetricsSink)
646-
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
646+
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
647647

648648
_, err := tr.AppendCTZeroSample(0, labels.FromStrings(
649649
model.InstanceLabel, "0.0.0.0:8855",
@@ -655,7 +655,7 @@ func TestAppendCTZeroSampleEmptyMetricName(t *testing.T) {
655655

656656
func TestAppendHistogramCTZeroSampleEmptyMetricName(t *testing.T) {
657657
sink := new(consumertest.MetricsSink)
658-
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
658+
tr := newTransaction(scrapeCtx, &startTimeAdjuster{startTime: startTimestamp}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
659659

660660
_, err := tr.AppendHistogramCTZeroSample(0, labels.FromStrings(
661661
model.InstanceLabel, "0.0.0.0:8855",
@@ -667,7 +667,7 @@ func TestAppendHistogramCTZeroSampleEmptyMetricName(t *testing.T) {
667667

668668
func TestAppendCTZeroSample(t *testing.T) {
669669
sink := new(consumertest.MetricsSink)
670-
tr := newTransaction(scrapeCtx, &nopAdjuster{}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, false)
670+
tr := newTransaction(scrapeCtx, &nopAdjuster{}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, false)
671671

672672
_, err := tr.AppendCTZeroSample(0, labels.FromStrings(
673673
model.InstanceLabel, "0.0.0.0:8855",
@@ -699,7 +699,7 @@ func TestAppendCTZeroSample(t *testing.T) {
699699

700700
func TestAppendHistogramCTZeroSample(t *testing.T) {
701701
sink := new(consumertest.MetricsSink)
702-
tr := newTransaction(scrapeCtx, &nopAdjuster{}, sink, labels.EmptyLabels(), receivertest.NewNopSettings(), nopObsRecv(t), false, true)
702+
tr := newTransaction(scrapeCtx, &nopAdjuster{}, sink, labels.EmptyLabels(), receivertest.NewNopSettingsWithType(receivertest.NopType), nopObsRecv(t), false, true)
703703

704704
_, err := tr.AppendHistogramCTZeroSample(0, labels.FromStrings(
705705
model.InstanceLabel, "0.0.0.0:8855",

0 commit comments

Comments
 (0)