Skip to content

Commit 21cb6c6

Browse files
sindrerh2ybelMekk
andcommitted
fix: return correct sorting from the intersection func
Co-authored-by: ybelmekk <[email protected]> Co-authored-by: Carl Hedgren<[email protected]>
1 parent c331e8f commit 21cb6c6

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

pkg/metrics/otel.go

+8-10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package metrics
22

33
import (
44
"context"
5+
"fmt"
56
"github.com/urfave/cli/v2"
67
"log"
78
"os"
@@ -52,6 +53,7 @@ func newMeterProvider(res *resource.Resource) *metric.MeterProvider {
5253
}
5354

5455
func recordCommandUsage(ctx context.Context, provider *metric.MeterProvider, flags []string) {
56+
fmt.Println(flags)
5557
commandHistogram, _ := provider.Meter(naisCliPrefixName).Int64Histogram(
5658
naisCliPrefixName+"_command_usage",
5759
m.WithUnit("1"),
@@ -72,27 +74,23 @@ func recordCommandUsage(ctx context.Context, provider *metric.MeterProvider, fla
7274
// Just a list intersection, used to create the intersection
7375
// between os.args and all the args we have in the cli
7476
func intersection(list1, list2 []string) []string {
77+
7578
elements := make(map[string]bool)
76-
resultSet := make(map[string]bool)
79+
seen := make(map[string]bool)
7780

7881
// Mark elements in list1
7982
for _, item := range list1 {
8083
elements[item] = true
8184
}
8285

8386
// Check for intersections and add to resultSet to ensure uniqueness
87+
var result []string
8488
for _, item := range list2 {
85-
if elements[item] && !resultSet[item] {
86-
resultSet[item] = true
89+
if elements[item] && !seen[item] {
90+
result = append(result, item)
91+
seen[item] = true
8792
}
8893
}
89-
90-
// Collect the unique intersection elements into a slice
91-
var result []string
92-
for item := range resultSet {
93-
result = append(result, item)
94-
}
95-
9694
return result
9795
}
9896

0 commit comments

Comments
 (0)