Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix linting for internal #28590

Merged
merged 1 commit into from
Oct 24, 2023
Merged

fix linting for internal #28590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions internal/filter/filterlog/filterlog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,47 +30,47 @@ func createConfig(matchType filterset.MatchType) *filterset.Config {
func TestLogRecord_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
testcases := []struct {
name string
property filterconfig.MatchProperties
property *filterconfig.MatchProperties
errorString string
}{
{
name: "empty_property",
property: filterconfig.MatchProperties{},
property: &filterconfig.MatchProperties{},
errorString: filterconfig.ErrMissingRequiredLogField.Error(),
},
{
name: "empty_log_bodies_and_attributes",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
LogBodies: []string{},
LogSeverityTexts: []string{},
},
errorString: filterconfig.ErrMissingRequiredLogField.Error(),
},
{
name: "span_properties",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
SpanNames: []string{"span"},
},
errorString: filterconfig.ErrInvalidLogField.Error(),
},
{
name: "invalid_match_type",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig("wrong_match_type"),
Attributes: []filterconfig.Attribute{{Key: "abc", Value: "def"}},
},
errorString: "error creating attribute filters: unrecognized match_type: 'wrong_match_type', valid types are: [regexp strict]",
},
{
name: "missing_match_type",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Attributes: []filterconfig.Attribute{{Key: "abc", Value: "def"}},
},
errorString: "error creating attribute filters: unrecognized match_type: '', valid types are: [regexp strict]",
},
{
name: "invalid_regexp_pattern",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Attributes: []filterconfig.Attribute{{Key: "abc", Value: "["}},
},
Expand All @@ -79,7 +79,7 @@ func TestLogRecord_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
expr, err := newExpr(&tc.property)
expr, err := newExpr(tc.property)
assert.Nil(t, expr)
require.NotNil(t, err)
println(tc.name)
Expand Down
18 changes: 9 additions & 9 deletions internal/filter/filtermatcher/filtermatcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ func Test_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
version := "["
testcases := []struct {
name string
property filterconfig.MatchProperties
property *filterconfig.MatchProperties
errorString string
}{
{
name: "regexp_match_type_for_int_attribute",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Attributes: []filterconfig.Attribute{
{Key: "key", Value: 1},
Expand All @@ -40,7 +40,7 @@ func Test_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
},
{
name: "unknown_attribute_value",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Strict),
Attributes: []filterconfig.Attribute{
{Key: "key", Value: []string{}},
Expand All @@ -50,39 +50,39 @@ func Test_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
},
{
name: "invalid_regexp_pattern_attribute",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Attributes: []filterconfig.Attribute{{Key: "key", Value: "["}},
},
errorString: "error creating attribute filters: error parsing regexp: missing closing ]: `[`",
},
{
name: "invalid_regexp_pattern_resource",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Resources: []filterconfig.Attribute{{Key: "key", Value: "["}},
},
errorString: "error creating resource filters: error parsing regexp: missing closing ]: `[`",
},
{
name: "invalid_regexp_pattern_library_name",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Libraries: []filterconfig.InstrumentationLibrary{{Name: "["}},
},
errorString: "error creating library name filters: error parsing regexp: missing closing ]: `[`",
},
{
name: "invalid_regexp_pattern_library_version",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Libraries: []filterconfig.InstrumentationLibrary{{Name: "lib", Version: &version}},
},
errorString: "error creating library version filters: error parsing regexp: missing closing ]: `[`",
},
{
name: "empty_key_name_in_attributes_list",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Strict),
Services: []string{"a"},
Attributes: []filterconfig.Attribute{
Expand All @@ -96,7 +96,7 @@ func Test_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
output, err := NewMatcher(&tc.property)
output, err := NewMatcher(tc.property)
assert.Zero(t, output)
assert.EqualError(t, err, tc.errorString)
})
Expand Down
20 changes: 10 additions & 10 deletions internal/filter/filterspan/filterspan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,62 +32,62 @@ func createConfig(matchType filterset.MatchType) *filterset.Config {
func TestSpan_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
testcases := []struct {
name string
property filterconfig.MatchProperties
property *filterconfig.MatchProperties
errorString string
}{
{
name: "empty_property",
property: filterconfig.MatchProperties{},
property: &filterconfig.MatchProperties{},
errorString: filterconfig.ErrMissingRequiredField.Error(),
},
{
name: "empty_service_span_names_and_attributes",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Services: []string{},
},
errorString: filterconfig.ErrMissingRequiredField.Error(),
},
{
name: "log_properties",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
LogBodies: []string{"log"},
},
errorString: "log_bodies should not be specified for trace spans",
},
{
name: "invalid_match_type",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig("wrong_match_type"),
Services: []string{"abc"},
},
errorString: "error creating service name filters: unrecognized match_type: 'wrong_match_type', valid types are: [regexp strict]",
},
{
name: "missing_match_type",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Services: []string{"abc"},
},
errorString: "error creating service name filters: unrecognized match_type: '', valid types are: [regexp strict]",
},
{
name: "invalid_regexp_pattern_service",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
Services: []string{"["},
},
errorString: "error creating service name filters: error parsing regexp: missing closing ]: `[`",
},
{
name: "invalid_regexp_pattern_span",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Regexp),
SpanNames: []string{"["},
},
errorString: "error creating span name filters: error parsing regexp: missing closing ]: `[`",
},
{
name: "invalid_strict_span_kind_match",
property: filterconfig.MatchProperties{
property: &filterconfig.MatchProperties{
Config: *createConfig(filterset.Strict),
SpanKinds: []string{
"test_invalid_span_kind",
Expand All @@ -99,7 +99,7 @@ func TestSpan_validateMatchesConfiguration_InvalidConfig(t *testing.T) {
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
output, err := newExpr(&tc.property)
output, err := newExpr(tc.property)
assert.Nil(t, output)
assert.EqualError(t, err, tc.errorString)
})
Expand Down