Skip to content

Commit

Permalink
[chore]: enable early-return from revive
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu MOREL <[email protected]>
  • Loading branch information
mmorel-35 committed Jan 9, 2025
1 parent 3132112 commit 0c3a2ca
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ linters-settings:
- name: context-keys-type
# Importing with `.` makes the programs much harder to understand
- name: dot-imports
- name: early-return
arguments:
- "preserveScope"
# Empty blocks make code less readable and could be a symptom of a bug or unfinished refactoring.
- name: empty-block
# for better readability, variables of type `error` must be named with the prefix `err`.
Expand All @@ -137,6 +140,8 @@ linters-settings:
- name: redefines-builtin-id
# redundant else-blocks that can be eliminated from the code.
- name: superfluous-else
arguments:
- "preserveScope"
# prevent confusing name for variables when using `time` package
- name: time-naming
# warns when an exported function or method returns a value of an un-exported type.
Expand Down
7 changes: 3 additions & 4 deletions processor/memorylimiterprocessor/internal/mock_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@ func (e *MockExporter) Capabilities() consumer.Capabilities {
func (e *MockExporter) ConsumeLogs(ctx context.Context, ld plog.Logs) error {
e.acceptedLogCount.Add(int64(ld.LogRecordCount()))

if e.destAvailable.Load() {
// Destination is available, immediately deliver.
e.deliveredLogCount.Add(int64(ld.LogRecordCount()))
} else {
if !e.destAvailable.Load() {
// Destination is not available. Queue the logs in the exporter.
return e.Logs.ConsumeLogs(ctx, ld)
}
// Destination is available, immediately deliver.
e.deliveredLogCount.Add(int64(ld.LogRecordCount()))
return nil
}

Expand Down
6 changes: 3 additions & 3 deletions service/extensions/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ func computeOrder(exts *Extensions) ([]component.ID, error) {
n := nodes[extID]
if dep, ok := ext.(extensioncapabilities.Dependent); ok {
for _, depID := range dep.Dependencies() {
if d, ok := nodes[depID]; ok {
graph.SetEdge(graph.NewEdge(d, n))
} else {
d, ok := nodes[depID]
if !ok {
return nil, fmt.Errorf("unable to find extension %s on which extension %s depends", depID, extID)
}
graph.SetEdge(graph.NewEdge(d, n))
}
}
}
Expand Down

0 comments on commit 0c3a2ca

Please sign in to comment.