Fix leaky configuration failure in integration test #1417
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Given CI is green, I'm merging this PR now in order to unblock all |
ivoanjo
reviewed
Mar 19, 2021
Comment on lines
-9
to
+15
| Datadog.configure {} | ||
| # TODO: We manually unset the tracer instance here as | ||
| # we don't have a mechanism to deeply reset the | ||
| # `Datadog.configuration` object. | ||
|
|
||
| # Ensure we terminate the existing tracer instance, if any | ||
| Datadog.configuration.tracer.instance.shutdown! if Datadog.configuration.tracer.instance | ||
| Datadog.configure { |c| c.tracer.instance = nil } |
There was a problem hiding this comment.
I wonder if Datadog.reset! would be a better fit here?
|
Spoiler alert, it is! There's a follow up pr coming up with exactly this
change.
…On Fri, Mar 19, 2021, 1:29 AM Ivo Anjo ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In spec/ddtrace_integration_spec.rb
<#1417 (comment)>:
> - Datadog.configure {}
+ # TODO: We manually unset the tracer instance here as
+ # we don't have a mechanism to deeply reset the
+ # `Datadog.configuration` object.
+
+ # Ensure we terminate the existing tracer instance, if any
+ Datadog.configuration.tracer.instance.shutdown! if Datadog.configuration.tracer.instance
+ Datadog.configure { |c| c.tracer.instance = nil }
I wonder if Datadog.reset!
<https://github.com/DataDog/dd-trace-rb/blob/master/lib/ddtrace/configuration.rb#L76>
would be a better fit here?
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#1417 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAEOOT4KG2SAJUDKEIARZK3TEMDOJANCNFSM4ZNL6ADA>
.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since #1334 was merged, we noticed flaky tests affecting the
masterbranch.This PR unblocks the
masterbranch build.This happens because we don't have a clean
Datadog.configurationobject for each test run.For this specific case, we want a clean tracer instance for this test, but this value is normally populated from previous runs. Because
Datadog.configurationhas not deep reset feature, we always try to reset parts of it during tests, but we can forget those.As a follow up, we should always correctly reset the components and configuration between each test run.