chore!: adopt log/slog, drop go-kit/log #1249
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc: @SuperQ |
tjhop
force-pushed
the
chore/adopt-slog
branch
from
a43f4e1 to
13b3318
Compare
tjhop
commented
Sep 29, 2024
| @@ -365,7 +364,7 @@ func (c Collector) collect(ch chan<- prometheus.Metric, logger log.Logger, clien | |||
| results, err := ScrapeTarget(client, c.target, c.auth, module.Module, logger, c.metrics) | |||
| c.metrics.SNMPInflight.Dec() | |||
| if err != nil { | |||
| level.Info(logger).Log("msg", "Error scraping target", "err", err) | |||
| logger.Info("Error scraping target", "err", err) | |||
There was a problem hiding this comment.
There are several instances like this that are logging errors at levels other than error -- is this intentional?
There was a problem hiding this comment.
I will need to check the history, but these probably should be Debug() or Warn().
There was a problem hiding this comment.
I went through the history of the Info logging in collector.go and it seems like these were recent logging level mistakes.
For now let's preserve the existing logging levels and we can revisit them later in a separate PR.
|
I've merged the prometheus/common update. |
This PR includes:
- Go version updates, so that `log/slog` can be used
- linter updates to remove configs for `go-kit/log` that are no longer
needed, and enable `sloglint` linter
- Go dep updates for prometheus/{client_golang,common,exporter-toolkit}
libs
The bulk of this PR was automated by the following script which is being
used to aid in converting the various exporters/projects to use slog:
https://gist.github.com/tjhop/49f96fb7ebbe55b12deee0b0312d8434
Builds and passes tests.
Signed-off-by: TJ Hoplock <[email protected]>
tjhop
force-pushed
the
chore/adopt-slog
branch
from
762f587 to
fc5dbd4
Compare
|
The generator CI error is unrelated. |
SuperQ
approved these changes
Oct 3, 2024
SuperQ
added a commit
that referenced
this pull request
Jan 3, 2025
BREAKING CHANGES: This version of the exporter introduces a cleaned up default snmp.yml that moved all ucd-snmp-mib oids into a separate module. If you used one of the following modules: * synology * ddwrt * kemp_loadmaster you will need to change your scrape config to also include the ucd_la_table module as well. See https://github.com/prometheus/snmp_exporter/tree/main?tab=readme-ov-file#multi-module-handling for further instructions. * [CHANGE] generator: Update generator default MIBOPTS #1231 * [CHANGE] adopt log/slog, drop go-kit/log #1249 * [ENHANCEMENT] generator: Improve config error message #1274 * [FEATURE] add ParseDateAndTime type #1234 * [FEATURE] Set UseUnconnectedUDPSocket option if one of the modules has if set #1247 * [FEATURE] add NTPTimeStamp type #1315 * [BUGFIX] fixed dashboard mixins #1319 snmp.yml changes: * cleanup ucd-snmp-mibs #1200 * moved oids from synology,ddwrt and kemp_loadmaster to new module ucd_la_table * Added support for Sophos XG Series #1239 * Added support for HPE #1267 * Added support for powercom #1275 * Added support for Cisco IMC #1293 * Updated mib for apc #1303 * Added support for TPLink DDM #1304 --------- Signed-off-by: Sebastian Schubert <[email protected]> Signed-off-by: Sebastian Schubert <[email protected]> Co-authored-by: Ben Kochie <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes:
log/slogcan be usedgo-kit/logthat are no longer needed, and enablesloglintlinterThe bulk of this PR was automated by the following script which is being used to aid in converting the various exporters/projects to use slog:
https://gist.github.com/tjhop/49f96fb7ebbe55b12deee0b0312d8434
Builds and passes tests.