Skip to content

Commit 2bf7e0f

Browse files
gandarezgandarez
authored
Merge pull request #1137 from wakatime/bugfix/user-agent-panic
Handle panic for goInfo in Windows
2 parents 7a7af6a + aa0e781 commit 2bf7e0f

File tree

5 files changed

+30
-16
lines changed

5 files changed

+30
-16
lines changed

‎cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package cmd
33
import (
44
"errors"
55
"fmt"
6+
"log"
67
"os"
78

89
"github.com/wakatime/wakatime-cli/pkg/api"
910
"github.com/wakatime/wakatime-cli/pkg/exitcode"
1011
"github.com/wakatime/wakatime-cli/pkg/offline"
1112

12-
log "github.com/sirupsen/logrus"
1313
"github.com/spf13/cobra"
1414
"github.com/spf13/viper"
1515
"gopkg.in/ini.v1"

‎go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/matishsiao/goInfo v0.0.0-20240924010139-10388a85396f
1616
github.com/mitchellh/go-homedir v1.1.0
1717
github.com/pkg/sftp v1.13.7
18-
github.com/sirupsen/logrus v1.9.3
1918
github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f
2019
github.com/spf13/cobra v1.8.1
2120
github.com/spf13/jwalterweatherman v1.1.0
@@ -62,3 +61,5 @@ require (
6261
golang.org/x/sys v0.27.0 // indirect
6362
gopkg.in/yaml.v3 v3.0.1 // indirect
6463
)
64+
65+
replace github.com/matishsiao/goInfo => github.com/wakatime/goInfo v0.1.0-wakatime.11

‎go.sum

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ github.com/masterzen/azure-sdk-for-go v3.2.0-beta.0.20161014135628-ee4f0065d00c+
9999
github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc=
100100
github.com/masterzen/winrm v0.0.0-20161014151040-7a535cd943fc/go.mod h1:CfZSN7zwz5gJiFhZJz49Uzk7mEBHIceWmbFmYx7Hf7E=
101101
github.com/masterzen/xmlpath v0.0.0-20140218185901-13f4951698ad/go.mod h1:A0zPC53iKKKcXYxr4ROjpQRQ5FgJXtelNdSmHHuq/tY=
102-
github.com/matishsiao/goInfo v0.0.0-20240924010139-10388a85396f h1:XDrsC/9hdgiU9ecceSmYsS2E3fBtFiYc34dAMFgegnM=
103-
github.com/matishsiao/goInfo v0.0.0-20240924010139-10388a85396f/go.mod h1:aEt7p9Rvh67BYApmZwNDPpgircTO2kgdmDUoF/1QmwA=
104102
github.com/mattn/go-colorable v0.0.6/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
105103
github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
106104
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -126,8 +124,6 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
126124
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
127125
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
128126
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
129-
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
130-
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
131127
github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f h1:Z2cODYsUxQPofhpYRMQVwWz4yUVpHF+vPi+eUdruUYI=
132128
github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f/go.mod h1:JqzWyvTuI2X4+9wOHmKSQCYxybB/8j6Ko43qVmXDuZg=
133129
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -148,13 +144,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
148144
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
149145
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
150146
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
151-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
152147
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
153148
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
154149
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
155150
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
156151
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
157152
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
153+
github.com/wakatime/goInfo v0.1.0-wakatime.11 h1:v7/UhNjcKCNbBX/oe0LWA6mBbpJ60/km7VS+BcjZ0KU=
154+
github.com/wakatime/goInfo v0.1.0-wakatime.11/go.mod h1:aEt7p9Rvh67BYApmZwNDPpgircTO2kgdmDUoF/1QmwA=
158155
github.com/yookoala/realpath v1.0.0 h1:7OA9pj4FZd+oZDsyvXWQvjn5oBdcHRTV44PpdMSuImQ=
159156
github.com/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Ya9AIoYBpE=
160157
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -206,7 +203,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
206203
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
207204
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
208205
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
209-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
210206
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
211207
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
212208
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎pkg/api/fileexperts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func ParseFileExpertsResponse(data []byte) ([]heartbeat.Result, error) {
8888
var body fileexperts.FileExperts
8989

9090
if err := json.Unmarshal(data, &body); err != nil {
91-
return nil, fmt.Errorf("failed to parse json response body: %s. body: %q", err, data)
91+
return nil, fmt.Errorf("failed to parse json response body: %s. body: %q", err, string(data))
9292
}
9393

9494
return []heartbeat.Result{{FileExpert: &body}}, nil

‎pkg/heartbeat/heartbeat.go

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,27 +179,44 @@ func NewHandle(sender Sender, opts ...HandleOption) Handle {
179179

180180
// UserAgent generates a user agent from various system infos, including a
181181
// a passed in value for plugin.
182-
func UserAgent(ctx context.Context, plugin string) string {
182+
func UserAgent(ctx context.Context, plugin string) (userAgent string) {
183183
logger := log.Extract(ctx)
184+
template := "wakatime/%s (%s-%s-%s) %s %s"
185+
186+
defer func() {
187+
if r := recover(); r != nil {
188+
userAgent = fmt.Sprintf(
189+
template,
190+
version.Version,
191+
strings.TrimSpace(system.OSName(ctx)),
192+
"unknown",
193+
"unknown",
194+
strings.TrimSpace(runtime.Version()),
195+
strings.TrimSpace(plugin),
196+
)
197+
}
198+
}()
199+
200+
if plugin == "" {
201+
plugin = "Unknown/0"
202+
}
184203

185204
info, err := goInfo.GetInfo()
186205
if err != nil {
187206
logger.Debugf("goInfo.GetInfo error: %s", err)
188207
}
189208

190-
if plugin == "" {
191-
plugin = "Unknown/0"
192-
}
193-
194-
return fmt.Sprintf(
195-
"wakatime/%s (%s-%s-%s) %s %s",
209+
userAgent = fmt.Sprintf(
210+
template,
196211
version.Version,
197212
strings.TrimSpace(system.OSName(ctx)),
198213
strings.TrimSpace(info.Core),
199214
strings.TrimSpace(info.Platform),
200215
strings.TrimSpace(runtime.Version()),
201216
strings.TrimSpace(plugin),
202217
)
218+
219+
return userAgent
203220
}
204221

205222
// PointerTo returns a pointer to the value passed in.

0 commit comments

Comments
 (0)