Skip to content

Commit 0112e4d

Browse files
adubovikovadubovikov
authored
Merge pull request #602 from hafkensite/feat/whitespace-formatting
Chore: run golangci-lint fmt
2 parents f57c3c2 + 59c7a5d commit 0112e4d

9 files changed

Lines changed: 113 additions & 109 deletions

File tree

‎decoder/decoder_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ var (
1717
hepLen7 = []byte{0x00, 0x07}
1818
hepLen8 = []byte{0x00, 0x08}
1919
hepLen10 = []byte{0x00, 0x0a}
20-
chunk16 = []byte{0x00, 0x00}
21-
chunk32 = []byte{0x00, 0x00, 0x00, 0x00}
20+
chunk16 = []byte{0x00, 0x00}
21+
chunk32 = []byte{0x00, 0x00, 0x00, 0x00}
2222
)
2323

2424
func TestDecodeEncodeHEP(t *testing.T) {

‎metric/dissect.go‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -282,72 +282,72 @@ func (p *Prometheus) dissectHoraclifixStats(data []byte) {
282282
}
283283

284284
/*
285-
func (p *Prometheus) dissectJanusStats(data []byte) {
286-
jsonparser.EachKey(data, func(idx int, value []byte, vt jsonparser.ValueType, err error) {
287-
switch idx {
288-
case 0:
289-
if rtt, err := jsonparser.ParseFloat(value); err == nil {
290-
janusRtt.Set(rtt)
291-
}
292-
case 1:
293-
if lost, err := jsonparser.ParseFloat(value); err == nil {
294-
janusLost.Set(lost)
295-
}
296-
case 2:
297-
if lostByRemote, err := jsonparser.ParseFloat(value); err == nil {
298-
janusLostByRemote.Set(lostByRemote)
299-
}
300-
case 3:
301-
if jitterLocal, err := jsonparser.ParseFloat(value); err == nil {
302-
janusJitterLocal.Set(jitterLocal)
303-
}
304-
case 4:
305-
if jitterRemote, err := jsonparser.ParseFloat(value); err == nil {
306-
janusJitterRemote.Set(jitterRemote)
307-
}
308-
case 5:
309-
if inLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
310-
janusInLinkQuality.Set(inLinkQuality)
311-
}
312-
case 6:
313-
if inMediaLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
314-
janusInMediaLinkQuality.Set(inMediaLinkQuality)
315-
}
316-
case 7:
317-
if outLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
318-
janusOutLinkQuality.Set(outLinkQuality)
319-
}
320-
case 8:
321-
if outMediaLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
322-
janusOutMediaLinkQuality.Set(outMediaLinkQuality)
323-
}
324-
case 9:
325-
if packetsReceived, err := jsonparser.ParseFloat(value); err == nil {
326-
janusPacketsReceived.Set(packetsReceived)
327-
}
328-
case 10:
329-
if packetsSent, err := jsonparser.ParseFloat(value); err == nil {
330-
janusPacketsSent.Set(packetsSent)
331-
}
332-
case 11:
333-
if bytesReceived, err := jsonparser.ParseFloat(value); err == nil {
334-
janusBytesReceived.Set(bytesReceived)
335-
}
336-
case 12:
337-
if bytesSent, err := jsonparser.ParseFloat(value); err == nil {
338-
janusBytesSent.Set(bytesSent)
339-
}
340-
case 13:
341-
if nacksReceived, err := jsonparser.ParseFloat(value); err == nil {
342-
janusNacksReceived.Set(nacksReceived)
343-
}
344-
case 14:
345-
if nacksSent, err := jsonparser.ParseFloat(value); err == nil {
346-
janusNacksSent.Set(nacksSent)
347-
}
348-
}
349-
}, janusPaths...)
350-
}
285+
func (p *Prometheus) dissectJanusStats(data []byte) {
286+
jsonparser.EachKey(data, func(idx int, value []byte, vt jsonparser.ValueType, err error) {
287+
switch idx {
288+
case 0:
289+
if rtt, err := jsonparser.ParseFloat(value); err == nil {
290+
janusRtt.Set(rtt)
291+
}
292+
case 1:
293+
if lost, err := jsonparser.ParseFloat(value); err == nil {
294+
janusLost.Set(lost)
295+
}
296+
case 2:
297+
if lostByRemote, err := jsonparser.ParseFloat(value); err == nil {
298+
janusLostByRemote.Set(lostByRemote)
299+
}
300+
case 3:
301+
if jitterLocal, err := jsonparser.ParseFloat(value); err == nil {
302+
janusJitterLocal.Set(jitterLocal)
303+
}
304+
case 4:
305+
if jitterRemote, err := jsonparser.ParseFloat(value); err == nil {
306+
janusJitterRemote.Set(jitterRemote)
307+
}
308+
case 5:
309+
if inLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
310+
janusInLinkQuality.Set(inLinkQuality)
311+
}
312+
case 6:
313+
if inMediaLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
314+
janusInMediaLinkQuality.Set(inMediaLinkQuality)
315+
}
316+
case 7:
317+
if outLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
318+
janusOutLinkQuality.Set(outLinkQuality)
319+
}
320+
case 8:
321+
if outMediaLinkQuality, err := jsonparser.ParseFloat(value); err == nil {
322+
janusOutMediaLinkQuality.Set(outMediaLinkQuality)
323+
}
324+
case 9:
325+
if packetsReceived, err := jsonparser.ParseFloat(value); err == nil {
326+
janusPacketsReceived.Set(packetsReceived)
327+
}
328+
case 10:
329+
if packetsSent, err := jsonparser.ParseFloat(value); err == nil {
330+
janusPacketsSent.Set(packetsSent)
331+
}
332+
case 11:
333+
if bytesReceived, err := jsonparser.ParseFloat(value); err == nil {
334+
janusBytesReceived.Set(bytesReceived)
335+
}
336+
case 12:
337+
if bytesSent, err := jsonparser.ParseFloat(value); err == nil {
338+
janusBytesSent.Set(bytesSent)
339+
}
340+
case 13:
341+
if nacksReceived, err := jsonparser.ParseFloat(value); err == nil {
342+
janusNacksReceived.Set(nacksReceived)
343+
}
344+
case 14:
345+
if nacksSent, err := jsonparser.ParseFloat(value); err == nil {
346+
janusNacksSent.Set(nacksSent)
347+
}
348+
}
349+
}, janusPaths...)
350+
}
351351
*/
352352
func normMax(val float64) float64 {
353353
if val > 10000000 {

‎remotelog/logproto/logproto.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/tls_test.go‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
package input
22

33
import (
4-
"testing"
54
"crypto/tls"
65
"github.com/stretchr/testify/assert"
6+
"testing"
77
)
88

99
func TestMinVersionConfig_Valid(t *testing.T) {
1010
tests := []struct {
11-
input string
11+
input string
1212
output uint16
1313
}{
14-
{"1.0",tls.VersionTLS10},
15-
{"1.1",tls.VersionTLS11},
16-
{"1.2",tls.VersionTLS12},
17-
{"1.3",tls.VersionTLS13},
14+
{"1.0", tls.VersionTLS10},
15+
{"1.1", tls.VersionTLS11},
16+
{"1.2", tls.VersionTLS12},
17+
{"1.3", tls.VersionTLS13},
1818
}
19-
for _,test := range(tests) {
20-
func(t *testing.T,input string, output uint16) {
19+
for _, test := range tests {
20+
func(t *testing.T, input string, output uint16) {
2121
minVersion := parseTLSVersion(input)
22-
assert.Equal(t, minVersion ,output)
23-
}(t,test.input,test.output)
22+
assert.Equal(t, minVersion, output)
23+
}(t, test.input, test.output)
2424
}
2525
}
2626

2727
func TestMinVersionConfig_Invalid(t *testing.T) {
2828
tests := []struct {
29-
input string
29+
input string
3030
output uint16
3131
}{
32-
{"",tls.VersionTLS12},
33-
{"10",tls.VersionTLS12},
34-
{"11",tls.VersionTLS12},
35-
{"12",tls.VersionTLS12},
36-
{"13",tls.VersionTLS12},
37-
{"a",tls.VersionTLS12},
38-
{"A",tls.VersionTLS12},
39-
{"TLS1.0",tls.VersionTLS12},
40-
{"TLS1.1",tls.VersionTLS12},
41-
{"TLS1.2",tls.VersionTLS12},
42-
{"TLS1.3",tls.VersionTLS12},
32+
{"", tls.VersionTLS12},
33+
{"10", tls.VersionTLS12},
34+
{"11", tls.VersionTLS12},
35+
{"12", tls.VersionTLS12},
36+
{"13", tls.VersionTLS12},
37+
{"a", tls.VersionTLS12},
38+
{"A", tls.VersionTLS12},
39+
{"TLS1.0", tls.VersionTLS12},
40+
{"TLS1.1", tls.VersionTLS12},
41+
{"TLS1.2", tls.VersionTLS12},
42+
{"TLS1.3", tls.VersionTLS12},
4343
}
44-
for _,test := range(tests) {
45-
func(t *testing.T,input string, output uint16) {
44+
for _, test := range tests {
45+
func(t *testing.T, input string, output uint16) {
4646
minVersion := parseTLSVersion(input)
47-
assert.Equal(t, minVersion ,output)
48-
}(t,test.input,test.output)
47+
assert.Equal(t, minVersion, output)
48+
}(t, test.input, test.output)
4949
}
5050
}

‎sipparser/authorization.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ type Authorization struct {
2121
}
2222

2323
/*
24-
func (a *Authorization) GetParam(param string) *Param {
25-
if a.Params == nil {
26-
return nil
27-
}
28-
for i := range a.Params {
29-
if a.Params[i].Param == param {
30-
return a.Params[i]
24+
func (a *Authorization) GetParam(param string) *Param {
25+
if a.Params == nil {
26+
return nil
27+
}
28+
for i := range a.Params {
29+
if a.Params[i].Param == param {
30+
return a.Params[i]
31+
}
3132
}
33+
return nil
3234
}
33-
return nil
34-
}
3535
*/
3636
func (a *Authorization) parse() error {
3737
pos := strings.IndexRune(a.Val, ' ')

‎sipparser/cseq.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import (
1212
)
1313

1414
// Cseq is a struct that holds the values for a cseq header:
15-
// -- Val is the raw string value of the cseq hdr
16-
// -- Method is the SIP method
17-
// -- Digit is the numeric indicator for the method
15+
//
16+
// -- Val is the raw string value of the cseq hdr
17+
// -- Method is the SIP method
18+
// -- Digit is the numeric indicator for the method
1819
type Cseq struct {
1920
Val string
2021
Method string

‎sipparser/from.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ type parseFromStateFn func(f *From) parseFromStateFn
2525
// -- Tag is the tag value
2626
// -- URI is a parsed uri
2727
// -- Params are for any generic params that are part of
28-
// the header
28+
//
29+
// the header
2930
type From struct {
3031
Error error
3132
Val string

‎sipparser/fuzz.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build gofuzz
12
// +build gofuzz
23

34
package sipparser

‎sipparser/uri.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ type uriStateFn func(*URI) uriStateFn
3535
// -- UriParams are the uri's parameters
3636
// -- Secure is if the scheme is "sips"
3737
// -- atPos is just used by the parser to identify where the
38-
// "@" char is in the .Raw field (or 0 if not present)
38+
//
39+
// "@" char is in the .Raw field (or 0 if not present)
3940
type URI struct {
4041
Error error // error if any
4142
Scheme string // scheme .. i.e. tel, sip, sips,etc.

0 commit comments

Comments
 (0)