fork of https://github.com/sourcegraph/zoekt
logger: remove description param (#657)
* temporarily use log branch
* logging: remove description param in Scoped
* use latest log and mountinfo versions
author
William Bezuidenhout
committer
GitHub
date
(Oct 18, 2023, 4:35 PM +0200)
commit
16e2ff8c
16e2ff8c98eebfb76bc92536ee06b8b03cda44d6
parent
f17ff0ba
f17ff0bac96acb444f554e9cf13e04e92bbf1b67
+52
-26
+1
-1
cmd/zoekt-sourcegraph-indexserver/index.go
+1
-1
cmd/zoekt-sourcegraph-indexserver/index.go
···
166
166
}
167
167
168
168
func gitIndex(c gitIndexConfig, o *indexArgs, sourcegraph Sourcegraph, l sglog.Logger) error {
169
-
logger := l.Scoped("gitIndex", "fetch commits and then run zoekt-git-index against contents")
169
+
logger := l.Scoped("gitIndex")
170
170
171
171
if len(o.Branches) == 0 {
172
172
return errors.New("zoekt-git-index requires 1 or more branches")
+3
-3
cmd/zoekt-sourcegraph-indexserver/main.go
+3
-3
cmd/zoekt-sourcegraph-indexserver/main.go
···
1291
1291
}
1292
1292
go oc.Run()
1293
1293
1294
-
logger := sglog.Scoped("metricsRegistration", "")
1294
+
logger := sglog.Scoped("metricsRegistration")
1295
1295
opts := mountinfo.CollectorOpts{Namespace: "zoekt_indexserver"}
1296
1296
1297
1297
c := mountinfo.NewCollector(logger, opts, map[string]string{"indexDir": conf.index})
···
1302
1302
}
1303
1303
1304
1304
func newServer(conf rootConfig) (*Server, error) {
1305
-
logger := sglog.Scoped("server", "periodically reindexes enabled repositories on sourcegraph")
1305
+
logger := sglog.Scoped("server")
1306
1306
1307
1307
if conf.cpuFraction <= 0.0 || conf.cpuFraction > 1.0 {
1308
1308
return nil, fmt.Errorf("cpu_fraction must be between 0.0 and 1.0")
···
1384
1384
WithShouldUseGRPC(conf.useGRPC),
1385
1385
}
1386
1386
1387
-
logger := sglog.Scoped("zoektConfigurationGRPCClient", "")
1387
+
logger := sglog.Scoped("zoektConfigurationGRPCClient")
1388
1388
client, err := dialGRPCClient(rootURL.Host, logger)
1389
1389
if err != nil {
1390
1390
return nil, fmt.Errorf("initializing gRPC connection to %q: %w", rootURL.Host, err)
+1
-1
cmd/zoekt-sourcegraph-indexserver/queue.go
+1
-1
cmd/zoekt-sourcegraph-indexserver/queue.go
+5
-5
cmd/zoekt-webserver/main.go
+5
-5
cmd/zoekt-webserver/main.go
···
199
199
200
200
mustRegisterDiskMonitor(*index)
201
201
202
-
metricsLogger := sglog.Scoped("metricsRegistration", "")
202
+
metricsLogger := sglog.Scoped("metricsRegistration")
203
203
204
204
mustRegisterMemoryMapMetrics(metricsLogger)
205
205
···
218
218
219
219
searcher = &loggedSearcher{
220
220
Streamer: searcher,
221
-
Logger: sglog.Scoped("searcher", ""),
221
+
Logger: sglog.Scoped("searcher"),
222
222
}
223
223
224
224
s := &web.Server{
···
261
261
262
262
if *enableIndexserverProxy {
263
263
socket := filepath.Join(*index, "indexserver.sock")
264
-
sglog.Scoped("server", "").Info("adding reverse proxy", sglog.String("socket", socket))
264
+
sglog.Scoped("server").Info("adding reverse proxy", sglog.String("socket", socket))
265
265
addProxyHandler(serveMux, socket)
266
266
}
267
267
···
293
293
log.Println("watchdog disabled")
294
294
}
295
295
296
-
logger := sglog.Scoped("ZoektWebserverGRPCServer", "The Zoekt Webserver GRPC Server")
296
+
logger := sglog.Scoped("ZoektWebserverGRPCServer")
297
297
298
298
streamer := web.NewTraceAwareSearcher(s.Searcher)
299
299
grpcServer := newGRPCServer(logger, streamer)
···
306
306
}
307
307
308
308
go func() {
309
-
sglog.Scoped("server", "").Info("starting server", sglog.Stringp("address", listen))
309
+
sglog.Scoped("server").Info("starting server", sglog.Stringp("address", listen))
310
310
var err error
311
311
if *sslCert != "" || *sslKey != "" {
312
312
err = srv.ListenAndServeTLS(*sslCert, *sslKey)
+1
-1
cmd/zoekt-webserver/main_linux.go
+1
-1
cmd/zoekt-webserver/main_linux.go
···
8
8
)
9
9
10
10
func mustRegisterMemoryMapMetrics(logger sglog.Logger) {
11
-
logger = logger.Scoped("memoryMapMetrics", "")
11
+
logger = logger.Scoped("memoryMapMetrics")
12
12
13
13
// The memory map metrics are collected via /proc, which
14
14
// is only available on linux-based operating systems.
+2
-2
go.mod
+2
-2
go.mod
···
31
31
github.com/rs/xid v1.5.0
32
32
github.com/shirou/gopsutil/v3 v3.23.5
33
33
github.com/sourcegraph/go-ctags v0.0.0-20230929045819-c736fcb519eb
34
-
github.com/sourcegraph/log v0.0.0-20230711093019-40c57b632cca
35
-
github.com/sourcegraph/mountinfo v0.0.0-20230106004439-7026e28cef67
34
+
github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb
35
+
github.com/sourcegraph/mountinfo v0.0.0-20231018142932-e00da332dac5
36
36
github.com/stretchr/testify v1.8.4
37
37
github.com/uber/jaeger-client-go v2.30.0+incompatible
38
38
github.com/uber/jaeger-lib v2.4.1+incompatible
+26
go.sum
+26
go.sum
···
15
15
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
16
16
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
17
17
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
18
+
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
18
19
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
19
20
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
20
21
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
···
61
62
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
62
63
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
63
64
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
65
+
github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
64
66
github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU=
65
67
github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE=
66
68
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
67
69
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
68
70
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
69
71
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
72
+
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
70
73
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
71
74
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
72
75
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
···
75
78
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
76
79
github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
77
80
github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
81
+
github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
78
82
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
79
83
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
80
84
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
···
88
92
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
89
93
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
90
94
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
95
+
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
91
96
github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
92
97
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
93
98
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
···
112
117
github.com/go-git/go-git/v5 v5.7.0 h1:t9AudWVLmqzlo+4bqdf7GY+46SUuRsx59SboFxkq2aE=
113
118
github.com/go-git/go-git/v5 v5.7.0/go.mod h1:coJHKEOk5kUClpsNlXrUvPrDxY3w3gjHvhcZd8Fodw8=
114
119
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
120
+
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
115
121
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
116
122
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
117
123
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
118
124
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
119
125
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
126
+
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
120
127
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
121
128
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
122
129
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
123
130
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
131
+
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
124
132
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
125
133
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
134
+
github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
126
135
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
127
136
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
128
137
github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
···
131
140
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
132
141
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
133
142
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
143
+
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
134
144
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
135
145
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
136
146
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
···
199
209
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
200
210
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
201
211
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
212
+
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
213
+
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
214
+
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
202
215
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
203
216
github.com/keegancsmith/rpc v1.3.0 h1:wGWOpjcNrZaY8GDYZJfvyxmlLljm3YQWF+p918DXtDk=
204
217
github.com/keegancsmith/rpc v1.3.0/go.mod h1:6O2xnOGjPyvIPbvp0MdrOe5r6cu1GZ4JoTzpzDhWeo0=
···
232
245
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
233
246
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
234
247
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
248
+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
249
+
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
235
250
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
236
251
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
252
+
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
237
253
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
238
254
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
239
255
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
···
242
258
github.com/peterbourgon/ff/v3 v3.3.2 h1:2J07/5/36kd9HYVt42Zve0xCeQ+LLRIvoKrt6sAZXJ4=
243
259
github.com/peterbourgon/ff/v3 v3.3.2/go.mod h1:zjJVUhx+twciwfDl0zBcFzl4dW8axCRyXE/eKY9RztQ=
244
260
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
261
+
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
245
262
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
246
263
github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
247
264
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
···
268
285
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
269
286
github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
270
287
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
288
+
github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
271
289
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
272
290
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
273
291
github.com/shirou/gopsutil/v3 v3.23.5 h1:5SgDCeQ0KW0S4N0znjeM/eFHXXOKyv2dVNgRq/c9P6Y=
···
281
299
github.com/sourcegraph/go-ctags v0.0.0-20230929045819-c736fcb519eb/go.mod h1:ZYjpRXoJrRlxjU9ZfpaUKJkk62AjhJPffN3rlw2aqxM=
282
300
github.com/sourcegraph/log v0.0.0-20230711093019-40c57b632cca h1:VwYrG1+YNyOD3nSb0M84ISMQiOOS/5Js05HqU1iNFSU=
283
301
github.com/sourcegraph/log v0.0.0-20230711093019-40c57b632cca/go.mod h1:IDp09QkoqS8Z3CyN2RW6vXjgABkNpDbyjLIHNQwQ8P8=
302
+
github.com/sourcegraph/log v0.0.0-20231018072732-c9c6af5e5ade h1:EpakpjinOPDoLLUXfAzdrKc21teqkWJ3xLLTOINb3m8=
303
+
github.com/sourcegraph/log v0.0.0-20231018072732-c9c6af5e5ade/go.mod h1:IDp09QkoqS8Z3CyN2RW6vXjgABkNpDbyjLIHNQwQ8P8=
304
+
github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb h1:tHKdC+bXxxGJ0cy/R06kg6Z0zqwVGOWMx8uWsIwsaoY=
305
+
github.com/sourcegraph/log v0.0.0-20231018134238-fbadff7458bb/go.mod h1:IDp09QkoqS8Z3CyN2RW6vXjgABkNpDbyjLIHNQwQ8P8=
284
306
github.com/sourcegraph/mountinfo v0.0.0-20230106004439-7026e28cef67 h1:NSYSPQOE7yyyytLbKQHjxSkPnBagaGQblgVMQrQ1je0=
285
307
github.com/sourcegraph/mountinfo v0.0.0-20230106004439-7026e28cef67/go.mod h1:4DAabK408OEbyK2NUEQ5YRApyB/p0XNGJyC1YPBAKq4=
308
+
github.com/sourcegraph/mountinfo v0.0.0-20231018142932-e00da332dac5 h1:2lUb58rz1bq77wL3hb6OBT58uBVtlNs1o23Kahfj/kU=
309
+
github.com/sourcegraph/mountinfo v0.0.0-20231018142932-e00da332dac5/go.mod h1:ghoEiutaNVERt2cu5q/bU3HOo29AHGSPrRZE1sOaA0w=
286
310
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
287
311
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
288
312
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
···
304
328
github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
305
329
github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
306
330
github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
331
+
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
332
+
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
307
333
github.com/xanzy/go-gitlab v0.86.0 h1:jR8V9cK9jXRQDb46KOB20NCF3ksY09luaG0IfXE6p7w=
308
334
github.com/xanzy/go-gitlab v0.86.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw=
309
335
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
+13
-13
grpc/internalerrs/logging.go
+13
-13
grpc/internalerrs/logging.go
···
40
40
}
41
41
}
42
42
43
-
logger := l.Scoped(logScope, logDescription)
44
-
logger = logger.Scoped("unaryMethod", "errors that originated from a unary method")
43
+
logger := l.Scoped(logScope)
44
+
logger = logger.Scoped("unaryMethod")
45
45
46
46
return func(ctx context.Context, fullMethod string, req, reply any, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
47
47
err := invoker(ctx, fullMethod, req, reply, cc, opts...)
···
70
70
}
71
71
}
72
72
73
-
logger := l.Scoped(logScope, logDescription)
74
-
logger = logger.Scoped("streamingMethod", "errors that originated from a streaming method")
73
+
logger := l.Scoped(logScope)
74
+
logger = logger.Scoped("streamingMethod")
75
75
76
76
return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, fullMethod string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
77
77
serviceName, methodName := grpcutil.SplitMethodName(fullMethod)
···
82
82
// until after the stream is created.
83
83
//
84
84
// This is fine since the error is already available, and the non-utf8 string check is robust against nil messages.
85
-
logger := logger.Scoped("postInit", "errors that occurred after stream initialization, but before the first message was sent")
85
+
logger := logger.Scoped("postInit")
86
86
doLog(logger, serviceName, methodName, nil, nil, err)
87
87
return nil, err
88
88
}
···
102
102
}
103
103
}
104
104
105
-
logger := l.Scoped(logScope, logDescription)
106
-
logger = logger.Scoped("unaryMethod", "errors that originated from a unary method")
105
+
logger := l.Scoped(logScope)
106
+
logger = logger.Scoped("unaryMethod")
107
107
108
108
return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) {
109
109
response, err := handler(ctx, req)
···
132
132
}
133
133
}
134
134
135
-
logger := l.Scoped(logScope, logDescription)
136
-
logger = logger.Scoped("streamingMethod", "errors that originated from a streaming method")
135
+
logger := l.Scoped(logScope)
136
+
logger = logger.Scoped("streamingMethod")
137
137
138
138
return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
139
139
serviceName, methodName := grpcutil.SplitMethodName(info.FullMethod)
···
144
144
}
145
145
146
146
func newLoggingServerStream(s grpc.ServerStream, logger log.Logger, serviceName, methodName string) grpc.ServerStream {
147
-
sendLogger := logger.Scoped("postMessageSend", "errors that occurred after sending a message")
148
-
receiveLogger := logger.Scoped("postMessageReceive", "errors that occurred after receiving a message")
147
+
sendLogger := logger.Scoped("postMessageSend")
148
+
receiveLogger := logger.Scoped("postMessageReceive")
149
149
150
150
requestSaver := requestSavingServerStream{ServerStream: s}
151
151
···
167
167
}
168
168
169
169
func newLoggingClientStream(s grpc.ClientStream, logger log.Logger, serviceName, methodName string) grpc.ClientStream {
170
-
sendLogger := logger.Scoped("postMessageSend", "errors that occurred after sending a message")
171
-
receiveLogger := logger.Scoped("postMessageReceive", "errors that occurred after receiving a message")
170
+
sendLogger := logger.Scoped("postMessageSend")
171
+
receiveLogger := logger.Scoped("postMessageReceive")
172
172
173
173
requestSaver := requestSavingClientStream{ClientStream: s}
174
174