Skip to content

Commit 3356157

Browse files
fix original typo
1 parent 1198642 commit 3356157

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

modules/generator/overrides_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (m *mockOverrides) MetricsGeneratorGenerateNativeHistograms(string) histogr
7373
return m.nativeHistograms
7474
}
7575

76-
func (m *mockOverrides) MetricsGenerationTraceIDLabelName(string) string {
76+
func (m *mockOverrides) MetricsGeneratorTraceIDLabelName(string) string {
7777
return ""
7878
}
7979

modules/generator/registry/overrides.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type Overrides interface {
1313
MetricsGeneratorCollectionInterval(userID string) time.Duration
1414
MetricsGeneratorDisableCollection(userID string) bool
1515
MetricsGeneratorGenerateNativeHistograms(userID string) histograms.HistogramMethod
16-
MetricsGenerationTraceIDLabelName(userID string) string
16+
MetricsGeneratorTraceIDLabelName(userID string) string
1717
MetricsGeneratorNativeHistogramBucketFactor(userID string) float64
1818
MetricsGeneratorNativeHistogramMaxBucketNumber(userID string) uint32
1919
MetricsGeneratorNativeHistogramMinResetDuration(userID string) time.Duration

modules/generator/registry/registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (r *ManagedRegistry) NewCounter(name string) Counter {
161161
}
162162

163163
func (r *ManagedRegistry) NewHistogram(name string, buckets []float64, histogramOverride HistogramMode) (h Histogram) {
164-
traceIDLabelName := r.overrides.MetricsGenerationTraceIDLabelName(r.tenant)
164+
traceIDLabelName := r.overrides.MetricsGeneratorTraceIDLabelName(r.tenant)
165165

166166
// TODO: Temporary switch: use the old implementation when native histograms
167167
// are disabled, eventually the new implementation can handle all cases

modules/generator/registry/registry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ func (m *mockOverrides) MetricsGeneratorGenerateNativeHistograms(_ string) histo
480480
return m.generateNativeHistograms
481481
}
482482

483-
func (m *mockOverrides) MetricsGenerationTraceIDLabelName(string) string {
483+
func (m *mockOverrides) MetricsGeneratorTraceIDLabelName(string) string {
484484
return ""
485485
}
486486

modules/overrides/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type Interface interface {
5252
MetricsGeneratorCollectionInterval(userID string) time.Duration
5353
MetricsGeneratorDisableCollection(userID string) bool
5454
MetricsGeneratorGenerateNativeHistograms(userID string) histograms.HistogramMethod
55-
MetricsGenerationTraceIDLabelName(userID string) string
55+
MetricsGeneratorTraceIDLabelName(userID string) string
5656
MetricsGeneratorRemoteWriteHeaders(userID string) map[string]string
5757
MetricsGeneratorForwarderQueueSize(userID string) int
5858
MetricsGeneratorForwarderWorkers(userID string) int

modules/overrides/runtime_config_overrides.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,9 @@ func (o *runtimeConfigOverridesManager) MetricsGeneratorNativeHistogramMinResetD
460460
return o.defaultLimits.MetricsGenerator.NativeHistogramMinResetDuration
461461
}
462462

463-
// MetricsGenerationTraceIDLabelName is the label name used for the trace ID in metrics.
463+
// MetricsGeneratorTraceIDLabelName is the label name used for the trace ID in metrics.
464464
// "TraceID" is used if no value is provided.
465-
func (o *runtimeConfigOverridesManager) MetricsGenerationTraceIDLabelName(userID string) string {
465+
func (o *runtimeConfigOverridesManager) MetricsGeneratorTraceIDLabelName(userID string) string {
466466
return o.getOverridesForUser(userID).MetricsGenerator.TraceIDLabelName
467467
}
468468

0 commit comments

Comments
 (0)