Merge branch 'main' into ptu/cleanup

p-t-u · p-t-u · commit b9110188e533 · 2024-10-03T18:51:28.000+02:00
diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.55.0
 	github.com/shirou/gopsutil/v3 v3.24.5
-	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.20.0-alpha.6
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/otelcol v0.107.0
@@ -232,6 +231,7 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
diff --git a/internal/commands/diagnose/diagnose.go b/internal/commands/diagnose/diagnose.go
@@ -10,7 +10,6 @@ import (
 	"text/template"
 
 	"github.com/observeinc/observe-agent/internal/root"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/internal/commands/initconfig/initconfig.go b/internal/commands/initconfig/initconfig.go
@@ -10,7 +10,6 @@ import (
 	"os"
 
 	"github.com/observeinc/observe-agent/internal/root"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
diff --git a/internal/commands/status/status.go b/internal/commands/status/status.go
@@ -9,7 +9,6 @@ import (
 	"os"
 
 	"github.com/observeinc/observe-agent/internal/root"
-
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/commands/version/version.go b/internal/commands/version/version.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/observeinc/observe-agent/build"
 	"github.com/observeinc/observe-agent/internal/root"
-
 	"github.com/spf13/cobra"
 )
 
diff --git a/internal/config/confighandler.go b/internal/config/confighandler.go
@@ -8,7 +8,6 @@ import (
 	"runtime"
 
 	"github.com/observeinc/observe-agent/internal/connections"
-
 	"github.com/spf13/viper"
 )
 
diff --git a/internal/root/root.go b/internal/root/root.go
@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"github.com/observeinc/observe-agent/internal/config"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

-Original file line number
+Diff line change
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.55.0
 	github.com/shirou/gopsutil/v3 v3.24.5
 -	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.20.0-alpha.6
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/otelcol v0.107.0
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 +	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"text/template"`
`11`	`11`
`12`	`12`	`"github.com/observeinc/observe-agent/internal/root"`
`13`		`-`
`14`	`13`	`"github.com/spf13/cobra"`
`15`	`14`	`"github.com/spf13/viper"`
`16`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`	`"os"`
`10`	`10`
`11`	`11`	`"github.com/observeinc/observe-agent/internal/root"`
`12`		`-`
`13`	`12`	`"github.com/spf13/cobra"`
`14`	`13`	`)`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/observeinc/observe-agent/build"`
`10`	`10`	`"github.com/observeinc/observe-agent/internal/root"`
`11`		`-`
`12`	`11`	`"github.com/spf13/cobra"`
`13`	`12`	`)`
`14`	`13`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"runtime"`
`9`	`9`
`10`	`10`	`"github.com/observeinc/observe-agent/internal/connections"`
`11`		`-`
`12`	`11`	`"github.com/spf13/viper"`
`13`	`12`	`)`
`14`	`13`