Skip to content

Commit b12f581

Browse files
committed
fixed typo
Signed-off-by: SoumyaRaikwar <[email protected]>
1 parent 905c466 commit b12f581

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

cmd/jaeger/internal/extension/jaegerstorage/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ type AuthConfig struct {
7070

7171
// PrometheusConfiguration wraps the base Prometheus configuration with auth support.
7272
type PrometheusConfiguration struct {
73-
promCfg.Configuration `mapstructure:",squash"`
73+
promcfg.Configuration `mapstructure:",squash"`
7474
Auth *AuthConfig `mapstructure:"auth,omitempty"`
7575
}
7676

7777
// MetricBackend contains configuration for a single metric storage backend.
7878
type MetricBackend struct {
7979
Prometheus *PrometheusConfiguration `mapstructure:"prometheus"`
80-
Elasticsearch *esCfg.Configuration `mapstructure:"elasticsearch"`
81-
Opensearch *esCfg.Configuration `mapstructure:"opensearch"`
80+
Elasticsearch *escfg.Configuration `mapstructure:"elasticsearch"`
81+
Opensearch *escfg.Configuration `mapstructure:"opensearch"`
8282
}
8383

8484
// Unmarshal implements confmap.Unmarshaler. This allows us to provide

cmd/jaeger/internal/extension/jaegerstorage/extension_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func TestMetricBackends(t *testing.T) {
324324
MetricBackends: map[string]MetricBackend{
325325
"foo": {
326326
Prometheus: &PrometheusConfiguration{
327-
Configuration: promCfg.Configuration{
327+
Configuration: promcfg.Configuration{
328328
ServerURL: mockServer.URL,
329329
},
330330
},
@@ -405,7 +405,7 @@ func TestMetricStorageStartError(t *testing.T) {
405405
MetricBackends: map[string]MetricBackend{
406406
"foo": {
407407
Prometheus: &PrometheusConfiguration{
408-
Configuration: promCfg.Configuration{},
408+
Configuration: promcfg.Configuration{},
409409
},
410410
},
411411
},
@@ -569,7 +569,7 @@ func startStorageExtension(t *testing.T, memstoreName string, promstoreName stri
569569
MetricBackends: map[string]MetricBackend{
570570
promstoreName: {
571571
Prometheus: &PrometheusConfiguration{
572-
Configuration: promCfg.Configuration{
572+
Configuration: promcfg.Configuration{
573573
ServerURL: "localhost:12345",
574574
},
575575
},
@@ -641,7 +641,7 @@ func TestMetricBackendWithAuthenticator(t *testing.T) {
641641
MetricBackends: map[string]MetricBackend{
642642
"prometheus": {
643643
Prometheus: &PrometheusConfiguration{
644-
Configuration: promCfg.Configuration{
644+
Configuration: promcfg.Configuration{
645645
ServerURL: mockServer.URL,
646646
},
647647
Auth: &AuthConfig{
@@ -673,7 +673,7 @@ func TestMetricBackendWithInvalidAuthenticator(t *testing.T) {
673673
MetricBackends: map[string]MetricBackend{
674674
"prometheus": {
675675
Prometheus: &PrometheusConfiguration{
676-
Configuration: promCfg.Configuration{
676+
Configuration: promcfg.Configuration{
677677
ServerURL: mockServer.URL,
678678
},
679679
Auth: &AuthConfig{

internal/storage/metricstore/prometheus/factory_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func TestFailedTLSOptions(t *testing.T) {
136136
}
137137

138138
func TestEmptyFactoryConfig(t *testing.T) {
139-
cfg := promCfg.Configuration{}
139+
cfg := promcfg.Configuration{}
140140
_, err := NewFactoryWithConfig(cfg, telemetry.NoopSettings(), nil)
141141
require.Error(t, err)
142142
}
@@ -154,7 +154,7 @@ func TestNewFactoryWithConfigAndAuth(t *testing.T) {
154154
require.NoError(t, err)
155155
defer listener.Close()
156156

157-
cfg := promCfg.Configuration{
157+
cfg := promcfg.Configuration{
158158
ServerURL: "http://" + listener.Addr().String(),
159159
}
160160

@@ -176,7 +176,7 @@ func TestNewFactoryWithConfigAndAuth_NilAuthenticator(t *testing.T) {
176176
require.NoError(t, err)
177177
defer listener.Close()
178178

179-
cfg := promCfg.Configuration{
179+
cfg := promcfg.Configuration{
180180
ServerURL: "http://" + listener.Addr().String(),
181181
}
182182

@@ -191,7 +191,7 @@ func TestNewFactoryWithConfigAndAuth_NilAuthenticator(t *testing.T) {
191191
}
192192

193193
func TestNewFactoryWithConfigAndAuth_EmptyServerURL(t *testing.T) {
194-
cfg := promCfg.Configuration{
194+
cfg := promcfg.Configuration{
195195
ServerURL: "", // Empty URL should fail
196196
}
197197

@@ -203,7 +203,7 @@ func TestNewFactoryWithConfigAndAuth_EmptyServerURL(t *testing.T) {
203203
}
204204

205205
func TestNewFactoryWithConfigAndAuth_InvalidTLS(t *testing.T) {
206-
cfg := promCfg.Configuration{
206+
cfg := promcfg.Configuration{
207207
ServerURL: "https://localhost:9090",
208208
}
209209
cfg.TLS.CAFile = "/does/not/exist"

0 commit comments

Comments
 (0)