Skip to content

Commit bee3e6a

Browse files
authored
[chore] cleaning up references to logging exporter (#11011)
These should have been updated to debug some time ago, but they're low priority as they're just tests Signed-off-by: Alex Boten <[email protected]>
1 parent 5e29655 commit bee3e6a

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

confmap/internal/e2e/testdata/issue-10787-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ service:
1919
traces:
2020
receivers: [otlp]
2121
processors: [batch]
22-
exporters: [logging]
22+
exporters: [debug]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# ${hello.world}
2-
logging:
2+
debug:
33
verbosity: detailed

confmap/internal/e2e/types_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ func TestIssue10787(t *testing.T) {
422422
assert.Equal(t, conf.ToStringMap(),
423423
map[string]any{
424424
"exporters": map[string]any{
425-
"logging": map[string]any{
425+
"debug": map[string]any{
426426
"verbosity": "detailed",
427427
},
428428
},
@@ -444,7 +444,7 @@ func TestIssue10787(t *testing.T) {
444444
"service": map[string]any{
445445
"pipelines": map[string]any{
446446
"traces": map[string]any{
447-
"exporters": []any{"logging"},
447+
"exporters": []any{"debug"},
448448
"processors": []any{"batch"},
449449
"receivers": []any{"otlp"},
450450
},
@@ -462,16 +462,16 @@ func TestIssue10787(t *testing.T) {
462462
func TestStructMappingIssue10787(t *testing.T) {
463463
resolver := NewResolver(t, "types_expand.yaml")
464464
t.Setenv("ENV", `# this is a comment
465-
logging:
465+
debug:
466466
verbosity: detailed`)
467467
conf, err := resolver.Resolve(context.Background())
468468
require.NoError(t, err)
469469

470-
type Logging struct {
470+
type Debug struct {
471471
Verbosity string `mapstructure:"verbosity"`
472472
}
473473
type Exporters struct {
474-
Logging Logging `mapstructure:"logging"`
474+
Debug Debug `mapstructure:"debug"`
475475
}
476476
type Target struct {
477477
Field Exporters `mapstructure:"field"`
@@ -482,7 +482,7 @@ logging:
482482
require.NoError(t, err)
483483
require.Equal(t,
484484
Target{Field: Exporters{
485-
Logging: Logging{
485+
Debug: Debug{
486486
Verbosity: "detailed",
487487
},
488488
}},
@@ -495,7 +495,7 @@ logging:
495495
err = confStr.Unmarshal(&cfgStr)
496496
require.NoError(t, err)
497497
require.Equal(t, `# this is a comment
498-
logging:
498+
debug:
499499
verbosity: detailed`,
500500
cfgStr.Field,
501501
)
@@ -505,16 +505,16 @@ func TestStructMappingIssue10787_ExpandComment(t *testing.T) {
505505
resolver := NewResolver(t, "types_expand.yaml")
506506
t.Setenv("EXPAND_ME", "an expanded env var")
507507
t.Setenv("ENV", `# this is a comment with ${EXPAND_ME}
508-
logging:
508+
debug:
509509
verbosity: detailed`)
510510
conf, err := resolver.Resolve(context.Background())
511511
require.NoError(t, err)
512512

513-
type Logging struct {
513+
type Debug struct {
514514
Verbosity string `mapstructure:"verbosity"`
515515
}
516516
type Exporters struct {
517-
Logging Logging `mapstructure:"logging"`
517+
Debug Debug `mapstructure:"debug"`
518518
}
519519
type Target struct {
520520
Field Exporters `mapstructure:"field"`
@@ -525,7 +525,7 @@ logging:
525525
require.NoError(t, err)
526526
require.Equal(t,
527527
Target{Field: Exporters{
528-
Logging: Logging{
528+
Debug: Debug{
529529
Verbosity: "detailed",
530530
},
531531
}},
@@ -538,7 +538,7 @@ logging:
538538
err = confStr.Unmarshal(&cfgStr)
539539
require.NoError(t, err)
540540
require.Equal(t, `# this is a comment with an expanded env var
541-
logging:
541+
debug:
542542
verbosity: detailed`,
543543
cfgStr.Field,
544544
)

0 commit comments

Comments
 (0)