Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update diagnosticsource to rc1 #1203

Merged
merged 10 commits into from
Sep 1, 2020

Conversation

cijothomas
Copy link
Member

@cijothomas cijothomas commented Aug 30, 2020

Fixes #1212
Fixes #953

Lot of renamings.
Remove AutoGenerateRootContextTraceId as TraceId is always passed as additional parameter to Sample.
Attributes returned by Sampler are added to the Activity, if it gets created with all data.

Special thanks to Eddy who helped with Propagators test issues.

TODO (In separate PR)
Fix for 953 for legacy instrumentations. ActivitySourceAdapter must be changed to reflect the new capabilities. This will be addressed along with #1210 as an immediate follow up to this PR.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Design discussion issue #
  • Changes in public API reviewed

@codecov
Copy link

codecov bot commented Aug 31, 2020

Codecov Report

Merging #1203 into master will increase coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1203      +/-   ##
==========================================
+ Coverage   78.73%   78.76%   +0.03%     
==========================================
  Files         219      219              
  Lines        6300     6296       -4     
==========================================
- Hits         4960     4959       -1     
+ Misses       1340     1337       -3     
Impacted Files Coverage Δ
src/OpenTelemetry/Trace/TracerProviderSdk.cs 94.95% <100.00%> (-0.17%) ⬇️
src/OpenTelemetry/Trace/SamplingResult.cs 54.54% <0.00%> (+13.63%) ⬆️

@cijothomas cijothomas marked this pull request as ready for review August 31, 2020 21:37
@cijothomas cijothomas requested a review from a team August 31, 2020 21:38
options.Name,
options.Kind,
options.Tags,
options.Links);

var shouldSample = sampler.ShouldSample(samplingParameters);

var activityDataRequest = shouldSample.Decision switch
var activitySamplingResult = shouldSample.Decision switch

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would this callback be called for legacy (http-in/out) DiagnosticSource instrumentations?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point!
I missed it. Let me add it to the other refactor on ActivitySourceAdapter (which deals with Activity created using DiagnosticSource methods)
Tracking here #1210

Copy link

@lmolkova lmolkova left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming legacy diagosticsources support will be fixed in #1210

@cijothomas cijothomas merged commit f679960 into open-telemetry:master Sep 1, 2020
@cijothomas cijothomas deleted the cijothomas/ds_rc1 branch September 1, 2020 00:22
@@ -6,6 +6,7 @@
<!--
<add key="Dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
-->
<add key="Dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Looks like the same entry is right above the new one (commented out).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update DiagnosticSource to Rc1 Attributes added by sampler cannot be populated on activity
4 participants