diff --git a/Gemfile b/Gemfile index 51f9d36cef90f0c12e3ca5bbf203f0db6b673445..1ec8d53ded7928452b5974eeaebcc99306a2e5ae 100644 --- a/Gemfile +++ b/Gemfile @@ -310,7 +310,7 @@ gem 'sentry-raven', '~> 3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.12.2' +gem 'gitlab-labkit', '0.13.1' # I18n gem 'ruby_parser', '~> 3.8', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 93670d229207de8930ac2f2436f3e92a3005ddea..863ab0b5112470c247eb52ed41f0c0b038e2a549 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,11 +428,11 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.12.2) + gitlab-labkit (0.13.1) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) - jaeger-client (~> 0.10) + jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) @@ -586,7 +586,7 @@ GEM invisible_captcha (0.12.1) rails (>= 3.2.0) ipaddress (0.8.3) - jaeger-client (0.10.0) + jaeger-client (1.1.0) opentracing (~> 0.3) thrift jaro_winkler (1.5.4) @@ -1146,7 +1146,7 @@ GEM rack (>= 1, < 3) thor (0.20.3) thread_safe (0.3.6) - thrift (0.11.0.0) + thrift (0.13.0) tilt (2.0.10) timecop (0.9.1) timeliness (0.3.10) @@ -1331,7 +1331,7 @@ DEPENDENCIES github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.12.2) + gitlab-labkit (= 0.13.1) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.7) gitlab-markup (~> 1.7.1) diff --git a/changelogs/unreleased/labkit-bump.yml b/changelogs/unreleased/labkit-bump.yml new file mode 100644 index 0000000000000000000000000000000000000000..58bb22da6e828cb4be6125c58e2a1bb0c2a248a6 --- /dev/null +++ b/changelogs/unreleased/labkit-bump.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade labkit to 0.13.1 +merge_request: 45788 +author: +type: performance diff --git a/doc/development/distributed_tracing.md b/doc/development/distributed_tracing.md index 952435150d6da5c5913383248bf7d59001740f51..4ddcf62d6d68a84530f456d626edb5b1e67740ae 100644 --- a/doc/development/distributed_tracing.md +++ b/doc/development/distributed_tracing.md @@ -178,6 +178,7 @@ This configuration string uses the Jaeger driver `opentracing://jaeger` with the | `udp_endpoint` | `localhost:6831` | This is the default. Configures Jaeger to send trace information to the UDP listener on port `6831` using compact thrift protocol. Note that we've experienced some issues with the [Jaeger Client for Ruby](https://github.com/salemove/jaeger-client-ruby) when using this protocol. | | `sampler` | `probabalistic` | Configures Jaeger to use a probabilistic random sampler. The rate of samples is configured by the `sampler_param` value. | | `sampler_param` | `0.01` | Use a ratio of `0.01` to configure the `probabalistic` sampler to randomly sample _1%_ of traces. | +| `service_name` | `api` | Override the service name used by the Jaeger backend. This parameter will take precedence over the application-supplied value. | NOTE: **Note:** The same `GITLAB_TRACING` value should to be configured in the environment