Skip to content

Commit 275a446

Browse files
SimonCroppCodeBlanch
SimonCropp
and
CodeBlanch
authored
[repo] remove redundant interpolation (open-telemetry#6098)
Co-authored-by: Mikel Blanchard <[email protected]>
1 parent 8fa00cb commit 275a446

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎docs/metrics/extending-the-sdk/MyExporter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public override ExportResult Export(in Batch<Metric> batch)
2828
sb.Append(", ");
2929
}
3030

31-
sb.Append($"{metric.Name}");
31+
sb.Append(metric.Name);
3232

3333
foreach (ref readonly var metricPoint in metric.GetMetricPoints())
3434
{

‎test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpMetricsExporterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ public void MetricsSerialization_ExpandsBufferForMetricsAndSerializes()
917917
new("key2", "value2"),
918918
};
919919

920-
using var meter = new Meter(name: $"{Utils.GetCurrentMethodName()}", version: "0.0.1", tags: meterTags);
920+
using var meter = new Meter(name: Utils.GetCurrentMethodName(), version: "0.0.1", tags: meterTags);
921921
using var provider = Sdk.CreateMeterProviderBuilder()
922922
.AddMeter(meter.Name)
923923
.AddInMemoryExporter(metrics)

‎test/OpenTelemetry.Tests/Metrics/MetricApiTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void MetricUnitIsExportedCorrectly(string? unit)
125125
{
126126
var exportedItems = new List<Metric>();
127127

128-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
128+
using var meter = new Meter(Utils.GetCurrentMethodName());
129129

130130
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
131131
.AddMeter(meter.Name)
@@ -147,7 +147,7 @@ public void MetricDescriptionIsExportedCorrectly(string? description)
147147
{
148148
var exportedItems = new List<Metric>();
149149

150-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
150+
using var meter = new Meter(Utils.GetCurrentMethodName());
151151

152152
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
153153
.AddMeter(meter.Name)
@@ -173,7 +173,7 @@ public void MetricInstrumentationScopeIsExportedCorrectly()
173173
"MeterTagKey",
174174
"MeterTagValue"),
175175
};
176-
using var meter = new Meter($"{meterName}", meterVersion, meterTags);
176+
using var meter = new Meter(meterName, meterVersion, meterTags);
177177
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
178178
.AddMeter(meter.Name)
179179
.AddInMemoryExporter(exportedItems));
@@ -264,7 +264,7 @@ public void DuplicateInstrumentRegistration_NoViews_IdenticalInstruments()
264264
{
265265
var exportedItems = new List<Metric>();
266266

267-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
267+
using var meter = new Meter(Utils.GetCurrentMethodName());
268268

269269
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
270270
.AddMeter(meter.Name)
@@ -297,7 +297,7 @@ public void DuplicateInstrumentRegistration_NoViews_DuplicateInstruments_Differe
297297
{
298298
var exportedItems = new List<Metric>();
299299

300-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
300+
using var meter = new Meter(Utils.GetCurrentMethodName());
301301

302302
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
303303
.AddMeter(meter.Name)
@@ -343,7 +343,7 @@ public void DuplicateInstrumentRegistration_NoViews_DuplicateInstruments_Differe
343343
{
344344
var exportedItems = new List<Metric>();
345345

346-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
346+
using var meter = new Meter(Utils.GetCurrentMethodName());
347347

348348
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
349349
.AddMeter(meter.Name)
@@ -389,7 +389,7 @@ public void DuplicateInstrumentRegistration_NoViews_DuplicateInstruments_Differe
389389
{
390390
var exportedItems = new List<Metric>();
391391

392-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
392+
using var meter = new Meter(Utils.GetCurrentMethodName());
393393

394394
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
395395
.AddMeter(meter.Name)
@@ -433,7 +433,7 @@ public void DuplicateInstrumentRegistration_NoViews_DuplicateInstruments_Differe
433433
{
434434
var exportedItems = new List<Metric>();
435435

436-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
436+
using var meter = new Meter(Utils.GetCurrentMethodName());
437437

438438
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
439439
.AddMeter(meter.Name)
@@ -478,8 +478,8 @@ public void DuplicateInstrumentNamesFromDifferentMetersWithSameNameDifferentVers
478478
{
479479
var exportedItems = new List<Metric>();
480480

481-
using var meter1 = new Meter($"{Utils.GetCurrentMethodName()}", "1.0");
482-
using var meter2 = new Meter($"{Utils.GetCurrentMethodName()}", "2.0");
481+
using var meter1 = new Meter(Utils.GetCurrentMethodName(), "1.0");
482+
using var meter2 = new Meter(Utils.GetCurrentMethodName(), "2.0");
483483

484484
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
485485
.AddMeter(meter1.Name)
@@ -1592,7 +1592,7 @@ public void SetupSdkProviderWithNoReader(bool hasViews)
15921592
[Fact]
15931593
public void UnsupportedMetricInstrument()
15941594
{
1595-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1595+
using var meter = new Meter(Utils.GetCurrentMethodName());
15961596
var exportedItems = new List<Metric>();
15971597

15981598
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
@@ -1627,7 +1627,7 @@ public void GaugeIsExportedCorrectly()
16271627
{
16281628
var exportedItems = new List<Metric>();
16291629

1630-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1630+
using var meter = new Meter(Utils.GetCurrentMethodName());
16311631

16321632
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
16331633
.AddMeter(meter.Name)
@@ -1656,7 +1656,7 @@ public void GaugeHandlesNoNewMeasurementsCorrectlyWithTemporality(MetricReaderTe
16561656
{
16571657
var exportedMetrics = new List<Metric>();
16581658

1659-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1659+
using var meter = new Meter(Utils.GetCurrentMethodName());
16601660
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
16611661
.AddMeter(meter.Name)
16621662
.AddInMemoryExporter(exportedMetrics, metricReaderOptions =>

‎test/OpenTelemetry.Tests/Metrics/MetricExemplarTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void TestExemplarsCounter(MetricReaderTemporalityPreference temporality)
6969
DateTime testStartTime = DateTime.UtcNow;
7070
var exportedItems = new List<Metric>();
7171

72-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
72+
using var meter = new Meter(Utils.GetCurrentMethodName());
7373
var counterDouble = meter.CreateCounter<double>("testCounterDouble");
7474
var counterLong = meter.CreateCounter<long>("testCounterLong");
7575

@@ -192,7 +192,7 @@ public void TestExemplarsObservable(MetricReaderTemporalityPreference temporalit
192192

193193
int measurementIndex = 0;
194194

195-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
195+
using var meter = new Meter(Utils.GetCurrentMethodName());
196196
var gaugeDouble = meter.CreateObservableGauge("testGaugeDouble", () => measurementValues[measurementIndex].Value);
197197
var gaugeLong = meter.CreateObservableGauge("testGaugeLong", () => (long)measurementValues[measurementIndex].Value);
198198
var counterDouble = meter.CreateObservableCounter("counterDouble", () => measurementValues[measurementIndex].Value);
@@ -275,7 +275,7 @@ public void TestExemplarsHistogramWithBuckets(MetricReaderTemporalityPreference
275275
DateTime testStartTime = DateTime.UtcNow;
276276
var exportedItems = new List<Metric>();
277277

278-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
278+
using var meter = new Meter(Utils.GetCurrentMethodName());
279279
var histogramWithBucketsAndMinMaxDouble = meter.CreateHistogram<double>("histogramWithBucketsAndMinMaxDouble");
280280
var histogramWithBucketsDouble = meter.CreateHistogram<double>("histogramWithBucketsDouble");
281281
var histogramWithBucketsAndMinMaxLong = meter.CreateHistogram<long>("histogramWithBucketsAndMinMaxLong");
@@ -425,7 +425,7 @@ public void TestExemplarsHistogramWithoutBuckets(MetricReaderTemporalityPreferen
425425
DateTime testStartTime = DateTime.UtcNow;
426426
var exportedItems = new List<Metric>();
427427

428-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
428+
using var meter = new Meter(Utils.GetCurrentMethodName());
429429
var histogramWithoutBucketsAndMinMaxDouble = meter.CreateHistogram<double>("histogramWithoutBucketsAndMinMaxDouble");
430430
var histogramWithoutBucketsDouble = meter.CreateHistogram<double>("histogramWithoutBucketsDouble");
431431
var histogramWithoutBucketsAndMinMaxLong = meter.CreateHistogram<long>("histogramWithoutBucketsAndMinMaxLong");
@@ -553,7 +553,7 @@ public void TestExemplarsExponentialHistogram(MetricReaderTemporalityPreference
553553
DateTime testStartTime = DateTime.UtcNow;
554554
var exportedItems = new List<Metric>();
555555

556-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
556+
using var meter = new Meter(Utils.GetCurrentMethodName());
557557
var exponentialHistogramWithMinMaxDouble = meter.CreateHistogram<double>("exponentialHistogramWithMinMaxDouble");
558558
var exponentialHistogramDouble = meter.CreateHistogram<double>("exponentialHistogramDouble");
559559
var exponentialHistogramWithMinMaxLong = meter.CreateHistogram<long>("exponentialHistogramWithMinMaxLong");
@@ -674,7 +674,7 @@ public void TestTraceBasedExemplarFilter(bool enableTracing)
674674
{
675675
var exportedItems = new List<Metric>();
676676

677-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
677+
using var meter = new Meter(Utils.GetCurrentMethodName());
678678

679679
var counter = meter.CreateCounter<long>("testCounter");
680680

@@ -721,7 +721,7 @@ public void TestExemplarsFilterTags(bool enableTagFiltering)
721721
{
722722
var exportedItems = new List<Metric>();
723723

724-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
724+
using var meter = new Meter(Utils.GetCurrentMethodName());
725725

726726
var histogram = meter.CreateHistogram<double>("testHistogram");
727727

‎test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ public void ViewConflict_OneInstrument_DifferentDescription()
10491049
{
10501050
var exportedItems = new List<Metric>();
10511051

1052-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1052+
using var meter = new Meter(Utils.GetCurrentMethodName());
10531053

10541054
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
10551055
.AddMeter(meter.Name)
@@ -1152,7 +1152,7 @@ public void ViewConflict_TwoDistinctInstruments_ThreeStreams()
11521152
{
11531153
var exportedItems = new List<Metric>();
11541154

1155-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1155+
using var meter = new Meter(Utils.GetCurrentMethodName());
11561156

11571157
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
11581158
.AddMeter(meter.Name)
@@ -1216,7 +1216,7 @@ public void ViewConflict_TwoIdenticalInstruments_TwoViews_DifferentTags()
12161216
{
12171217
var exportedItems = new List<Metric>();
12181218

1219-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1219+
using var meter = new Meter(Utils.GetCurrentMethodName());
12201220

12211221
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
12221222
.AddMeter(meter.Name)
@@ -1263,7 +1263,7 @@ public void ViewConflict_TwoIdenticalInstruments_TwoViews_SameTags()
12631263
{
12641264
var exportedItems = new List<Metric>();
12651265

1266-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1266+
using var meter = new Meter(Utils.GetCurrentMethodName());
12671267

12681268
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
12691269
.AddMeter(meter.Name)
@@ -1311,7 +1311,7 @@ public void ViewConflict_TwoIdenticalInstruments_TwoViews_DifferentHistogramBoun
13111311
{
13121312
var exportedItems = new List<Metric>();
13131313

1314-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1314+
using var meter = new Meter(Utils.GetCurrentMethodName());
13151315

13161316
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
13171317
.AddMeter(meter.Name)
@@ -1388,7 +1388,7 @@ public void ViewConflict_TwoInstruments_OneMatchesView()
13881388
{
13891389
var exportedItems = new List<Metric>();
13901390

1391-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1391+
using var meter = new Meter(Utils.GetCurrentMethodName());
13921392

13931393
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
13941394
.AddMeter(meter.Name)
@@ -1441,7 +1441,7 @@ public void ViewConflict_TwoInstruments_ConflictAvoidedBecauseSecondInstrumentIs
14411441
{
14421442
var exportedItems = new List<Metric>();
14431443

1444-
using var meter = new Meter($"{Utils.GetCurrentMethodName()}");
1444+
using var meter = new Meter(Utils.GetCurrentMethodName());
14451445

14461446
using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
14471447
.AddMeter(meter.Name)

0 commit comments

Comments
 (0)