Add latest changes from gitlab-org/gitlab@master

2 files changed, 72 insertions, 23 deletions

diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index fffd5c056c3..b084bd2fec4 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -179,8 +179,8 @@ This content is removed from the documentation as part of the Technical Writing
 ## Which versions are removed
 
 GitLab supports the current major version and two previous major versions.
-For example, if 14.0 is the current major version, all major and minor releases of
-GitLab 14.0, 13.0 and 12.0 are supported.
+For example, if 15.0 is the current major version, all major and minor releases of
+GitLab 15.0, 14.0, and 13.0 are supported.
 
 [View the list of supported versions](https://about.gitlab.com/support/statement-of-support.html#version-support).
 
diff --git a/doc/development/workhorse/configuration.md b/doc/development/workhorse/configuration.md
index d34e567adda..b8f37c845d8 100644
--- a/doc/development/workhorse/configuration.md
+++ b/doc/development/workhorse/configuration.md
@@ -21,47 +21,49 @@ Add any new Workhorse configuration options into the configuration file.
 
 Options:
   -apiCiLongPollingDuration duration
-      Long polling duration for job requesting for runners (default 50ns)
+        Long polling duration for job requesting for runners (default 50ns)
   -apiLimit uint
-      Number of API requests allowed at single time
+        Number of API requests allowed at single time
   -apiQueueDuration duration
-      Maximum queueing duration of requests (default 30s)
+        Maximum queueing duration of requests (default 30s)
   -apiQueueLimit uint
-      Number of API requests allowed to be queued
+        Number of API requests allowed to be queued
   -authBackend string
-      Authentication/authorization backend (default "http://localhost:8080")
+        Authentication/authorization backend (default "http://localhost:8080")
   -authSocket string
-      Optional: Unix domain socket to dial authBackend at
+        Optional: Unix domain socket to dial authBackend at
   -cableBackend string
-      Optional: ActionCable backend (default authBackend)
+        ActionCable backend
   -cableSocket string
-      Optional: Unix domain socket to dial cableBackend at (default authSocket)
+        Optional: Unix domain socket to dial cableBackend at
   -config string
-      TOML file to load config from
+        TOML file to load config from
   -developmentMode
-      Allow the assets to be served from Rails app
+        Allow the assets to be served from Rails app
   -documentRoot string
-      Path to static files content (default "public")
+        Path to static files content (default "public")
   -listenAddr string
-      Listen address for HTTP server (default "localhost:8181")
+        Listen address for HTTP server (default "localhost:8181")
   -listenNetwork string
-      Listen 'network' (tcp, tcp4, tcp6, unix) (default "tcp")
+        Listen 'network' (tcp, tcp4, tcp6, unix) (default "tcp")
   -listenUmask int
-      Umask for Unix socket
+        Umask for Unix socket
   -logFile string
-      Log file location
+        Log file location
   -logFormat string
-      Log format to use defaults to text (text, json, structured, none) (default "text")
+        Log format to use defaults to text (text, json, structured, none) (default "text")
   -pprofListenAddr string
-      pprof listening address, e.g. 'localhost:6060'
+        pprof listening address, e.g. 'localhost:6060'
   -prometheusListenAddr string
-      Prometheus listening address, e.g. 'localhost:9229'
+        Prometheus listening address, e.g. 'localhost:9229'
+  -propagateCorrelationID X-Request-ID
+        Reuse existing Correlation-ID from the incoming request header X-Request-ID if present
   -proxyHeadersTimeout duration
-      How long to wait for response headers when proxying the request (default 5m0s)
+        How long to wait for response headers when proxying the request (default 5m0s)
   -secretPath string
-      File with secret key to authenticate with authBackend (default "./.gitlab_workhorse_secret")
+        File with secret key to authenticate with authBackend (default "./.gitlab_workhorse_secret")
   -version
-      Print version and exit
+        Print version and exit
 ```
 
 The 'auth backend' refers to the GitLab Rails application. The name is
@@ -226,6 +228,53 @@ configuration with the `GITLAB_TRACING` environment variable, like this:
 GITLAB_TRACING=opentracing://jaeger ./gitlab-workhorse
 ```
 
+### Propagate correlation IDs
+
+When a user makes an HTTP request, such as creating a new project, the
+initial request is routed through Workhorse to another service, which
+may in turn, make other requests. To help trace the request as it flows
+across services, Workhorse generates a random value called a
+[correlation ID](../../administration/troubleshooting/tracing_correlation_id.md).
+Workhorse sends this correlation ID via the `X-Request-Id` HTTP header.
+
+Some GitLab services, such as GitLab Shell, generate their own
+correlation IDs. In addition, other services, such as Gitaly, make
+internal API calls that pass along a correlation ID from the original
+request. In either case, the correlation ID is also passed via the
+`X-Request-Id` HTTP header.
+
+By default, Workhorse ignores this header and always generates a new
+correlation ID. This makes debugging harder and prevents distributed
+tracing from working properly, since the new correlation ID is
+completely unrelated to the original one.
+
+Workhorse can be configured to propagate an incoming correlation ID via
+the `-propagateCorrelationID` command-line flag. It is highly
+recommended that this option be used with an IP allow list to ensure
+arbitrary values cannot be generated by untrusted clients.
+
+An IP allow list is specified via the `trusted_cidrs_for_propagation`
+opton in the Workhorse configuration file. Specify a list of CIDR blocks
+that can be trusted. For example:
+
+```toml
+trusted_cidrs_for_propagation = ["10.0.0.0/8", "127.0.0.1/32"]
+```
+
+NOTE:
+The `-propagateCorrelationID` flag must be used for the `trusted_cidrs_for_propagation` option to work.
+
+### Trusted proxies
+
+If Workhorse is behind a reverse proxy such as NGINX, the
+`trusted_cidrs_for_x_forwarded_for` option is needed to specify which
+CIDR blocks can be used to trust to provide the originating IP address
+via the `X-Forwarded-For` HTTP header. For example:
+
+```toml
+trusted_cidrs_for_x_forwarded_for = ["10.0.0.0/8", "127.0.0.1/32"]
+```
+
 ## Continuous profiling
 
 Workhorse supports continuous profiling through [LabKit](https://gitlab.com/gitlab-org/labkit/)