Skip to content

Avoid changing Labels map from config #75

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
giantlock wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid changing Labels map from config #75

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
6 changes: 2 additions & 4 deletions modbus/modbus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package modbus
import (
"encoding/binary"
"fmt"
"maps"
"math"
"strconv"
"time"
Expand Down Expand Up @@ -90,9 +91,6 @@ func registerMetrics(reg prometheus.Registerer, moduleName string, metrics []met
registeredCounters := map[string]*prometheus.CounterVec{}

for _, m := range metrics {
if m.Labels == nil {
m.Labels = map[string]string{}
}
m.Labels["module"] = moduleName

switch m.MetricType {
Expand Down Expand Up @@ -262,7 +260,7 @@ func scrapeMetric(definition config.MetricDef, f modbusFunc, modAddress uint64)
return metric{}, err
}

return metric{definition.Name, definition.Help, definition.Labels, v, definition.MetricType}, nil
return metric{definition.Name, definition.Help, maps.Clone(definition.Labels), v, definition.MetricType}, nil
}

// InsufficientRegistersError is returned in Parse() whenever not enough
Expand Down