Skip to content

Commit 7d01ee8

Browse files
committed
use github.com/tjhop/slog-gokit
1 parent efbb7f4 commit 7d01ee8

File tree

4 files changed

+5
-82
lines changed

4 files changed

+5
-82
lines changed

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ require (
183183
github.com/stretchr/testify v1.9.0
184184
github.com/testcontainers/testcontainers-go v0.33.0
185185
github.com/tilinna/clock v1.1.0
186+
github.com/tjhop/slog-gokit v0.1.2
186187
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
187188
github.com/uber/jaeger-client-go v2.30.0+incompatible
188189
github.com/vincent-petithory/dataurl v1.0.0

go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -1002,8 +1002,6 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
10021002
github.com/go-sql-driver/mysql v0.0.0-20180618115901-749ddf1598b4/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
10031003
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
10041004
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
1005-
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
1006-
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
10071005
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
10081006
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
10091007
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -1247,8 +1245,6 @@ github.com/grafana/loki/pkg/push v0.0.0-20240617182007-6c33561108ad h1:4XAhmVmKb
12471245
github.com/grafana/loki/pkg/push v0.0.0-20240617182007-6c33561108ad/go.mod h1:lJEF/Wh5MYlmBem6tOYAFObkLsuikfrEf8Iy9AdMPiQ=
12481246
github.com/grafana/loki/v3 v3.0.0-20240617182007-6c33561108ad h1:eaHz6gH7OM3LWGp1h2QZ+/wkeyjNspk3QwjD4YUWR5g=
12491247
github.com/grafana/loki/v3 v3.0.0-20240617182007-6c33561108ad/go.mod h1:fKBY3k60xjlGcIdbOaJiy3aWopF65FpQvQWczCp2SZ0=
1250-
github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595 h1:I9sRknI5ajd8whPOX0nBDXy5B6xUfhItClMy+6R4oqE=
1251-
github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595/go.mod h1:U8ifHC5pT2WuVTO7ki4KZmWLjfEKfktQiU3bh0J8scw=
12521248
github.com/grafana/mysqld_exporter v0.16.1-0.20241111085008-47b8ea9fab19 h1:JKMpcPPmhU198g3skPdSf2YvcgUKZ6bf3X1uTXnCZXU=
12531249
github.com/grafana/mysqld_exporter v0.16.1-0.20241111085008-47b8ea9fab19/go.mod h1:ctzLZ0vK3ow5JZmBfbS261ufC/4vtfuwFileKJea3kg=
12541250
github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20231004161416-702318429731 h1:vyyIYY2sLpmgFIckJ1vSO/oYkvB0thDF6UiFYp5PThM=
@@ -2466,6 +2462,8 @@ github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRU
24662462
github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
24672463
github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU=
24682464
github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
2465+
github.com/tjhop/slog-gokit v0.1.2 h1:pmQI4SvU9h4gA0vIQsdhJQSqQg4mOmsPykG2/PM3j1I=
2466+
github.com/tjhop/slog-gokit v0.1.2/go.mod h1:8fhlcp8C8ELbg3GCyKv06tgt4B5sDq2P1r2DQAu1HuM=
24692467
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
24702468
github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
24712469
github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=

internal/slogadapter/handler.go

-76
This file was deleted.

internal/static/integrations/mysqld_exporter/mysqld-exporter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"os"
99

1010
config_util "github.com/prometheus/common/config"
11+
slgk "github.com/tjhop/slog-gokit"
1112

1213
"github.com/go-kit/log"
1314
"github.com/go-kit/log/level"
1415
"github.com/go-sql-driver/mysql"
15-
"github.com/grafana/alloy/internal/slogadapter"
1616
"github.com/grafana/alloy/internal/static/integrations"
1717
integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2"
1818
"github.com/grafana/alloy/internal/static/integrations/v2/metricsutils"
@@ -124,7 +124,7 @@ func New(log log.Logger, c *Config) (integrations.Integration, error) {
124124
}
125125

126126
scrapers := GetScrapers(c)
127-
logger := slog.New(slogadapter.GoKitHandler{Logger: log, Group: ""})
127+
logger := slog.New(slgk.NewGoKitHandler(log, nil))
128128
exporter := collector.New(context.Background(), string(dsn), scrapers, logger, collector.Config{
129129
LockTimeout: c.LockWaitTimeout,
130130
SlowLogFilter: c.LogSlowFilter,

0 commit comments

Comments
 (0)