diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2019-05-07 10:39:12 +0200 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2019-05-07 12:31:29 +0200 |
| commit | c8ead9e88cba006243fd8b2100b7a265c2cce182 (patch) | |
| tree | 8091b28f953a2588b20cfa162570fcd70348a37f | |
| parent | 5cd079e43498982dcef59e32ebf03d6fe6a06286 (diff) | |
| download | gitlab-ce-an-upgrade-labkit.tar.gz | |
Upgrade Labkit to v0.3.0an-upgrade-labkit
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/an-upgrade-labkit.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
4 files changed, 10 insertions, 5 deletions
@@ -276,7 +276,7 @@ gem 'sentry-raven', '~> 2.7' gem 'premailer-rails', '~> 1.9.7' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.2.0' +gem 'gitlab-labkit', '~> 0.3.0' # I18n gem 'ruby_parser', '~> 3.8', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 9b1a036030a..ad9f6d05131 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -288,10 +288,10 @@ GEM github-markup (1.7.0) gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) - gitlab-labkit (0.2.0) + gitlab-labkit (0.3.0) actionpack (~> 5) activesupport (~> 5) - grpc (~> 1.15) + grpc (~> 1.19.0) jaeger-client (~> 0.10) opentracing (~> 0.4) gitlab-markup (1.7.0) @@ -1065,7 +1065,7 @@ DEPENDENCIES gitaly-proto (~> 1.27.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) - gitlab-labkit (~> 0.2.0) + gitlab-labkit (~> 0.3.0) gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.6) diff --git a/changelogs/unreleased/an-upgrade-labkit.yml b/changelogs/unreleased/an-upgrade-labkit.yml new file mode 100644 index 00000000000..da713c4b889 --- /dev/null +++ b/changelogs/unreleased/an-upgrade-labkit.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Labkit to v0.3.0 +merge_request: 28174 +author: +type: other diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 4908f236cd1..953d1e86ccb 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -57,7 +57,7 @@ module Gitlab def self.interceptors return [] unless Labkit::Tracing.enabled? - [Labkit::Tracing::GRPCInterceptor.instance] + [Labkit::Tracing::GRPC::ClientInterceptor.instance] end private_class_method :interceptors |