Skip to content

Commit 8bd29c7

Browse files
committed
migrate to new logging
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 0ee8928 commit 8bd29c7

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

main.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,17 +283,19 @@ func initMetricCollector() {
283283

284284
collectorName = "advisor"
285285
if Config.Collectors.Advisor.IsEnabled() {
286-
c := collector.New(collectorName, &MetricsCollectorAzureRmAdvisor{}, logger)
286+
c := collector.New(collectorName, &MetricsCollectorAzureRmAdvisor{}, logger.Slog())
287287
c.SetScapeTime(*Config.Collectors.Advisor.ScrapeTime)
288-
c.SetCache(
288+
if err := c.SetCache(
289289
Opts.GetCachePath(collectorName+".json"),
290290
collector.BuildCacheTag(cacheTag, Config.Azure, Config.Collectors.Advisor),
291-
)
291+
); err != nil {
292+
logger.Fatal(err.Error())
293+
}
292294
if err := c.Start(); err != nil {
293295
logger.Fatal(err.Error())
294296
}
295297
} else {
296-
logger.With(zap.String("collector", collectorName)).Infof("collector disabled")
298+
logger.With(slog.String("collector", collectorName)).Infof("collector disabled")
297299
}
298300

299301
collectorName = "defender"

metrics_azurerm_advisor.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package main
22

33
import (
4+
"log/slog"
45
"strings"
56

67
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/advisor/armadvisor"
78
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
89
"github.com/prometheus/client_golang/prometheus"
910
"github.com/webdevops/go-common/prometheus/collector"
1011
"github.com/webdevops/go-common/utils/to"
11-
"go.uber.org/zap"
1212
)
1313

1414
type MetricsCollectorAzureRmAdvisor struct {
@@ -45,26 +45,26 @@ func (m *MetricsCollectorAzureRmAdvisor) Setup(collector *collector.Collector) {
4545
func (m *MetricsCollectorAzureRmAdvisor) Reset() {}
4646

4747
func (m *MetricsCollectorAzureRmAdvisor) Collect(callback chan<- func()) {
48-
err := AzureSubscriptionsIterator.ForEachAsync(m.Logger(), func(subscription *armsubscriptions.Subscription, logger *zap.SugaredLogger) {
48+
err := AzureSubscriptionsIterator.ForEachAsync(m.Logger(), func(subscription *armsubscriptions.Subscription, logger *slog.Logger) {
4949
m.collectAzureAdvisorRecommendations(subscription, logger)
5050
})
5151
if err != nil {
52-
m.Logger().Panic(err)
52+
panic(err)
5353
}
5454
}
5555

56-
func (m *MetricsCollectorAzureRmAdvisor) collectAzureAdvisorRecommendations(subscription *armsubscriptions.Subscription, logger *zap.SugaredLogger) {
56+
func (m *MetricsCollectorAzureRmAdvisor) collectAzureAdvisorRecommendations(subscription *armsubscriptions.Subscription, logger *slog.Logger) {
5757
client, err := armadvisor.NewRecommendationsClient(*subscription.SubscriptionID, AzureClient.GetCred(), AzureClient.NewArmClientOptions())
5858
if err != nil {
59-
logger.Panic(err)
59+
panic(err)
6060
}
6161

6262
// Generate recommendations first (async operation)
6363
// Note: This is a fire-and-forget operation. The generation is asynchronous,
6464
// so newly generated recommendations will be available in the next scrape cycle.
6565
_, err = client.Generate(m.Context(), nil)
6666
if err != nil {
67-
logger.Warnf("failed to generate recommendations for subscription %s: %v", to.StringLower(subscription.SubscriptionID), err)
67+
logger.Warn("failed to generate recommendations for subscription", slog.String("subscriptionID", to.StringLower(subscription.SubscriptionID)), slog.Any("error", err))
6868
}
6969

7070
recommendationMetrics := m.Collector.GetMetricList("advisorRecommendation")
@@ -73,7 +73,7 @@ func (m *MetricsCollectorAzureRmAdvisor) collectAzureAdvisorRecommendations(subs
7373
for pager.More() {
7474
result, err := pager.NextPage(m.Context())
7575
if err != nil {
76-
logger.Panic(err)
76+
panic(err)
7777
}
7878

7979
for _, recommendation := range result.Value {

0 commit comments

Comments
 (0)