Skip to content

Commit

Permalink
Merge branch 'main' into ratelimit-data-race
Browse files Browse the repository at this point in the history
  • Loading branch information
mauri870 committed Feb 28, 2025
2 parents 2a24573 + e41d266 commit 72bbf51
Show file tree
Hide file tree
Showing 45 changed files with 43 additions and 5,291 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- main
- 7.1*
- 8.*
- 9.*

permissions:
contents: read
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]
- Add support for specifying a custom endpoint for GCP service clients. {issue}40848[40848] {pull}40918[40918]
- Fix incorrect handling of types in SQL module. {issue}40090[40090] {pull}41607[41607]
- Remove kibana.settings metricset since the API was removed in 8.0 {issue}30592[30592] {pull}42937[42937]
- Removed support for the Enterprise Search module {pull}42915[42915]

*Osquerybeat*

Expand Down
6 changes: 6 additions & 0 deletions dev-tools/mage/module_changeset.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ func shouldIgnore(file string) bool {
return true
}
}

// if the file has been removed, we should ignore it
if _, err := os.Stat(file); os.IsNotExist(err) {
return true
}

return false
}

Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/ratelimit/rate_limit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,6 @@ func BenchmarkRateLimit(b *testing.B) {

b.ResetTimer()
for i := 0; i < b.N; i++ {
p.Run(&event)
p.Run(&event) //nolint:errcheck // ignore
}
}
Loading

0 comments on commit 72bbf51

Please sign in to comment.