diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2019-02-18 22:57:22 +0200 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2019-04-18 09:57:16 +0200 |
| commit | 4f4de36cacbcd137e9db2a7b1449bb803bf1f395 (patch) | |
| tree | 7514b0a3c310091bf0b909fc9544968fbe4619ab /Gemfile.lock | |
| parent | d9e5edf198803aded681cb900c50bc454fade7f3 (diff) | |
| download | gitlab-ce-4f4de36cacbcd137e9db2a7b1449bb803bf1f395.tar.gz | |
Migrate correlation and tracing code to LabKitan-use-labkit
This change is a fairly straightforward refactor to extract the tracing
and correlation-id code from the gitlab rails codebase into the new
LabKit-Ruby project.
The corresponding import into LabKit-Ruby was in
https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1
The code itself remains very similar for now.
Extracting it allows us to reuse it in other projects, such as
Gitaly-Ruby. This will give us the advantages of correlation-ids and
distributed tracing in that project too.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 95c377e2725..ba4418cd8b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,6 +286,12 @@ GEM github-markup (1.7.0) gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) + gitlab-labkit (0.1.2) + actionpack (~> 5) + activesupport (~> 5) + grpc (~> 1.15) + jaeger-client (~> 0.10) + opentracing (~> 0.4) gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) @@ -571,7 +577,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - opentracing (0.4.3) + opentracing (0.5.0) optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) @@ -1050,6 +1056,7 @@ DEPENDENCIES gitaly-proto (~> 1.19.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) + gitlab-labkit (~> 0.1.2) gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.5) @@ -1076,7 +1083,6 @@ DEPENDENCIES httparty (~> 0.16.4) icalendar influxdb (~> 0.2) - jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) js_regex (~> 3.1) json-schema (~> 2.8.0) @@ -1117,7 +1123,6 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth-ultraauth (~> 0.0.1) omniauth_crowd (~> 2.2.0) - opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) |