renames UpstreamAddress to ServerAddress - I think this name is clearer

grafana · Jan 2, 2021 · 71c123a · 71c123a
1 parent 37fbf26
commit 71c123a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -26,7 +26,7 @@ func New(cfg *config.Config) *Agent {
 		activeProfiles: make(map[int]*ProfileSession),
 		u: remote.New(remote.RemoteConfig{
 			UpstreamThreads:        cfg.Agent.UpstreamThreads,
-			UpstreamAddress:        cfg.Agent.UpstreamAddress,
+			UpstreamAddress:        cfg.Agent.ServerAddress,
 			UpstreamRequestTimeout: cfg.Agent.UpstreamRequestTimeout,
 		}),
 	}

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -20,7 +20,7 @@ type Agent struct {
 	// AgentCMD           []string
 	AgentSpyName           string        `desc:"name of the spy you want to use"` // TODO: add options
 	AgentPID               int           `def:"-1" desc:"pid of the process you want to spy on"`
-	UpstreamAddress        string        `def:"http://localhost:8080" desc:"address of the pyroscope server"`
+	ServerAddress          string        `def:"http://localhost:8080" desc:"address of the pyroscope server"`
 	UpstreamThreads        int           `def:"4"`
 	UpstreamRequestTimeout time.Duration `def:"10s"`
 	UNIXSocketPath         string        `def:"/var/run/pyroscope-agent.sock" desc:"path to a UNIX socket file"`
@@ -59,7 +59,7 @@ type Exec struct {
 	SpyName                string        `def:"auto"`
 	ApplicationName        string        `def:"" desc:"application name used when uploading profiling data"`
 	DetectSubprocesses     bool          `def:"true"`
-	UpstreamAddress        string        `def:"http://localhost:8080" desc:"address of the pyroscope server"`
+	ServerAddress          string        `def:"http://localhost:8080" desc:"address of the pyroscope server"`
 	UpstreamThreads        int           `def:"4" desc:"number of upload threads"`
 	UpstreamRequestTimeout time.Duration `def:"10s"`
 	NoLogging              bool          `def:"false" desc:"disables logging from pyroscope"`

diff --git a/pkg/exec/cli.go b/pkg/exec/cli.go
@@ -62,7 +62,7 @@ func Cli(cfg *config.Config, args []string) error {
 		return err
 	}
 	u := remote.New(remote.RemoteConfig{
-		UpstreamAddress:        cfg.Exec.UpstreamAddress,
+		UpstreamAddress:        cfg.Exec.ServerAddress,
 		UpstreamThreads:        cfg.Exec.UpstreamThreads,
 		UpstreamRequestTimeout: cfg.Exec.UpstreamRequestTimeout,
 	})