diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-03 04:43:46 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-09-03 04:43:46 +0000 |
| commit | 594f56e1ef2ea2032728e3288cb9aee6146739fc (patch) | |
| tree | 2693e6931c0d918ce2720b863d202bc690a5e22e /spec | |
| parent | 4e4fcf79c57f9c6f62b7a1cfbb6a83ee154f05fa (diff) | |
| parent | 0234795825640022ccd43476e3c679d4e054a46f (diff) | |
| download | gitlab-ce-594f56e1ef2ea2032728e3288cb9aee6146739fc.tar.gz | |
Merge branch 'an-use-labkit-correlation-id' into 'master'
Remove all references to Gitlab::CorrelationId
See merge request gitlab-org/gitlab-ce!32228
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/tracing_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/tracing_spec.rb b/spec/lib/gitlab/tracing_spec.rb index db75ce2a998..e913bb600ec 100644 --- a/spec/lib/gitlab/tracing_spec.rb +++ b/spec/lib/gitlab/tracing_spec.rb @@ -59,7 +59,7 @@ describe Gitlab::Tracing do it 'returns the correct state for .tracing_url' do expect(described_class).to receive(:tracing_url_enabled?).and_return(tracing_url_enabled?) allow(described_class).to receive(:tracing_url_template).and_return(tracing_url_template) - allow(Gitlab::CorrelationId).to receive(:current_id).and_return(correlation_id) + allow(Labkit::Correlation::CorrelationId).to receive(:current_id).and_return(correlation_id) allow(Gitlab).to receive(:process_name).and_return(process_name) expect(described_class.tracing_url).to eq(tracing_url) |