public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Disable default golangci-lint filter (#29751)

Browse Source 
* Disable default golangci-lint filter

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Fix linter warnings

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-12-15 09:32:06 +01:00
committed by GitHub
parent 5d4910dd52
commit c2cad26ca9
76 changed files with 598 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/tracing/tracing.go
+1 -1
View File
@@ -130,7 +130,7 @@ func (ts *TracingService) Run(ctx context.Context) error {
if ts.closer != nil {
ts.log.Info("Closing tracing")
ts.closer.Close()
return ts.closer.Close()
}
return nil
pkg/infra/tracing/tracing_test.go
+13 -7
View File
@@ -58,9 +58,11 @@ func TestInitJaegerCfg_Enabled(t *testing.T) {
}
func TestInitJaegerCfg_DisabledViaEnv(t *testing.T) {
os.Setenv("JAEGER_DISABLED", "true")
err := os.Setenv("JAEGER_DISABLED", "true")
require.NoError(t, err)
defer func() {
os.Unsetenv("JAEGER_DISABLED")
err := os.Unsetenv("JAEGER_DISABLED")
require.NoError(t, err)
}()
ts := &TracingService{enabled: true}
@@ -71,9 +73,11 @@ func TestInitJaegerCfg_DisabledViaEnv(t *testing.T) {
}
func TestInitJaegerCfg_EnabledViaEnv(t *testing.T) {
os.Setenv("JAEGER_DISABLED", "false")
err := os.Setenv("JAEGER_DISABLED", "false")
require.NoError(t, err)
defer func() {
os.Unsetenv("JAEGER_DISABLED")
err := os.Unsetenv("JAEGER_DISABLED")
require.NoError(t, err)
}()
ts := &TracingService{enabled: false}
@@ -84,12 +88,14 @@ func TestInitJaegerCfg_EnabledViaEnv(t *testing.T) {
}
func TestInitJaegerCfg_InvalidEnvVar(t *testing.T) {
os.Setenv("JAEGER_DISABLED", "totallybogus")
err := os.Setenv("JAEGER_DISABLED", "totallybogus")
require.NoError(t, err)
defer func() {
os.Unsetenv("JAEGER_DISABLED")
err := os.Unsetenv("JAEGER_DISABLED")
require.NoError(t, err)
}()
ts := &TracingService{}
_, err := ts.initJaegerCfg()
_, err = ts.initJaegerCfg()
require.EqualError(t, err, "cannot parse env var JAEGER_DISABLED=totallybogus: strconv.ParseBool: parsing \"totallybogus\": invalid syntax")
}