fix: rename org_id to tenant_id (#23)

Author: korniltsev

README.md

@@ -23,19 +23,19 @@ If needed, the `PYROSCOPE_AUTH_TOKEN` can be supplied.
 For a complete list of variables check the section below.
 
 ## Configuration
-| env var                     | default                          | description                                                                                  |
-|-----------------------------|----------------------------------|----------------------------------------------------------------------------------------------|
-| `PYROSCOPE_REMOTE_ADDRESS`  | `https://ingest.pyroscope.cloud` | the pyroscope instance data will be relayed to                                               |
-| `PYROSCOPE_AUTH_TOKEN`      | `""`                             | authorization key (token authentication)                                                     |
-| `PYROSCOPE_SELF_PROFILING`  | `false`                          | whether to profile the extension itself or not                                               |
-| `PYROSCOPE_LOG_LEVEL`       | `info`                           | `error` or `info` or `debug` or `trace`                                                      |
-| `PYROSCOPE_TIMEOUT`         | `10s`                            | http client timeout ([go duration format](https://pkg.go.dev/time#Duration))                 |
-| `PYROSCOPE_NUM_WORKERS`     | `5`                              | num of relay workers, pick based on the number of profile types                              |
-| `PYROSCOPE_FLUSH_ON_INVOKE` | `false`                          | wait for all relay requests to be finished/flushed before next `Invocation` event is allowed |
-| `PYROSCOPE_HTTP_HEADERS`    | `{}`                             | extra http headers in json format, for example: {"X-Header": "Value"}                        |
-| `PYROSCOPE_SCOPE_ORGID`     | `""`                             | phlare tenant ID, passed as X-Scope-OrgID http header                                      |
+| env var                         | default                          | description                                                                                  |
+|---------------------------------|----------------------------------|----------------------------------------------------------------------------------------------|
+| `PYROSCOPE_REMOTE_ADDRESS`      | `https://ingest.pyroscope.cloud` | the pyroscope instance data will be relayed to                                               |
+| `PYROSCOPE_AUTH_TOKEN`          | `""`                             | authorization key (token authentication)                                                     |
+| `PYROSCOPE_SELF_PROFILING`      | `false`                          | whether to profile the extension itself or not                                               |
+| `PYROSCOPE_LOG_LEVEL`           | `info`                           | `error` or `info` or `debug` or `trace`                                                      |
+| `PYROSCOPE_TIMEOUT`             | `10s`                            | http client timeout ([go duration format](https://pkg.go.dev/time#Duration))                 |
+| `PYROSCOPE_NUM_WORKERS`         | `5`                              | num of relay workers, pick based on the number of profile types                              |
+| `PYROSCOPE_FLUSH_ON_INVOKE`     | `false`                          | wait for all relay requests to be finished/flushed before next `Invocation` event is allowed |
+| `PYROSCOPE_HTTP_HEADERS`        | `{}`                             | extra http headers in json format, for example: {"X-Header": "Value"}                        |
+| `PYROSCOPE_TENANT_ID`           | `""`                             | phlare tenant ID, passed as X-Scope-OrgID http header                                      |
 | `PYROSCOPE_BASIC_AUTH_USER`     | `""` | HTTP basic auth user |
-| `PYROSCOPE_BASIC_AUTH_PASSWORD`     | `""`  | HTTP basic auth password  |
+| `PYROSCOPE_BASIC_AUTH_PASSWORD` | `""`  | HTTP basic auth password  |
 
 # How it works
 The profiler will run as normal, and periodically will send data to the relay server (the server running at `http://localhost:4040`).

main.go

@@ -34,7 +34,7 @@ var (
 	authToken         = getEnvStrOr("PYROSCOPE_AUTH_TOKEN", "")
 	basicAuthUser     = getEnvStrOr("PYROSCOPE_BASIC_AUTH_USER", "")
 	basicAuthPassword = getEnvStrOr("PYROSCOPE_BASIC_AUTH_PASSWORD", "")
-	scopeOrgID        = getEnvStrOr("PYROSCOPE_SCOPE_ORGID", "")
+	tenantID          = getEnvStrOr("PYROSCOPE_TENANT_ID", "")
 	timeout           = getEnvDurationOr("PYROSCOPE_TIMEOUT", time.Second*10)
 	numWorkers        = getEnvIntOr("PYROSCOPE_NUM_WORKERS", 5)
 
@@ -56,7 +56,7 @@ func main() {
 		AuthToken:           authToken,
 		BasicAuthUser:       basicAuthUser,
 		BasicAuthPassword:   basicAuthPassword,
-		ScopeOrgID:          scopeOrgID,
+		TenantID:            tenantID,
 		HTTPHeadersJSON:     httpHeaders,
 		Timeout:             timeout,
 		MaxIdleConnsPerHost: numWorkers,

relay/client.go

@@ -24,7 +24,7 @@ type RemoteClientCfg struct {
 	AuthToken           string
 	BasicAuthUser       string
 	BasicAuthPassword   string
-	ScopeOrgID          string
+	TenantID            string
 	HTTPHeadersJSON     string
 	Timeout             time.Duration
 	MaxIdleConnsPerHost int
@@ -70,8 +70,8 @@ func (r *RemoteClient) Send(req *http.Request) error {
 		defer req.Body.Close()
 	}
 	r.enhanceWithAuthToken(req)
-	if r.config.ScopeOrgID != "" {
-		req.Header.Set("X-Scope-OrgID", r.config.ScopeOrgID)
+	if r.config.TenantID != "" {
+		req.Header.Set("X-Scope-OrgID", r.config.TenantID)
 	}
 	for k, v := range r.headers {
 		req.Header.Set(k, v)