[ASM] Remove warnings and fix flake#3338
Merged
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
robertpi
force-pushed
the
robert/asm/framework-blocking-flake
branch
from
October 11, 2022 13:26
c045fb6 to
aef887f
Compare
robertpi
changed the title
robertpi
commented
Oct 11, 2022
| if (!transport.Blocked) | ||
| { | ||
| LastChanceToWriteTags?.Invoke(this, new InstrumentationGatewayEventArgs(transport, relatedSpan)); | ||
| } |
Member
Author
There was a problem hiding this comment.
In the end, I think this change is not necessary, though seems a fairly sensible protection against unnecessary calls to the WAF.
robertpi
commented
Oct 11, 2022
| { | ||
| LogAddressIfDebugEnabled(eventData); | ||
| eventHandler?.Invoke(this, new InstrumentationGatewaySecurityEventArgs(eventData, transport, relatedSpan, eraseExistingAddress)); | ||
| } |
Member
There was a problem hiding this comment.
This skips the debug log too though, is that correct?
Member
Author
There was a problem hiding this comment.
I would say yes, we only really want to know what the input data is if it's going to be analyzed by the waf.
robertpi
marked this pull request as ready for review
October 11, 2022 13:48
anna-git
approved these changes
Oct 11, 2022
This comment has been minimized.
This comment has been minimized.
andrewlock
approved these changes
Oct 11, 2022
Comment on lines
+120
to
+121
| var ea = new InstrumentationGatewayBlockingEventArgs(context, scope, tracerSettings, doBeforeActualBlocking); | ||
| BlockingOpportunity?.Invoke(this, ea); |
Member
There was a problem hiding this comment.
This now creates the InstrumentationGatewayBlockingEventArgs object even if BlockingOpportunity is null, that looks worse for allocations to me? 🤔
dromanol
approved these changes
Oct 11, 2022
This comment has been minimized.
This comment has been minimized.
Member
Benchmarks Report 🐌Benchmarks for #3338 compared to master:
The following thresholds were used for comparing the benchmark speeds:
Allocation changes below 0.5% are ignored. Benchmark detailsBenchmarks.Trace.AgentWriterBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.AppSecBodyBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.AspNetCoreBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.DbCommandBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.ElasticsearchBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.GraphQLBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.HttpClientBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.ILoggerBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.Log4netBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.NLogBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.RedisBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.SerilogBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.SpanBenchmark - Same speed ✔️ Same allocations ✔️Raw results
Benchmarks.Trace.TraceAnnotationsBenchmark - Same speed ✔️ Same allocations ✔️Raw results
|
Member
Code Coverage Report 📊✔️ Merging #3338 into master will not change line coverage
View the full report for further details: Datadog.Trace Breakdown ✔️
The following classes have significant coverage changes.
View the full reports for further details: |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary of changes
We are seeing flake in the ASM blocking tests, where the status code and resource name disappeared from the span:
Reason for change
Flake is bad.
Implementation details
Before this change we dispose systematically disposed a scope / span in the
TracingHttpModule.OnBeginRequestin the case of an exception, the logic being we won't be able to retrieve it from the http contextTracingHttpModule.OnEndRequest.However, this is not always true, if the exception occurs late
TracingHttpModule.OnBeginRequest, then the span will be in the http context and we'll attempt to update theTracingHttpModule.OnEndRequest. This creates a race between data being written to the span object and the span being written to theAgentWriter.In the case where we blocked the request from the call to the WAF in
TracingHttpModule.OnBeginRequest, we were also calling the WAF again inTracingHttpModule.OnEndRequest, which seems unnecessary.