Skip to content

Commit

Permalink
Merge branch 'main' into NullableArrRollback
Browse files Browse the repository at this point in the history
  • Loading branch information
cijothomas authored Mar 30, 2021
2 parents 63783d3 + 539a2cd commit 2e14eb9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Instrumentation.AspNetCore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ services.AddOpenTelemetryTracing(
It is important to note that this `Filter` option is specific to this
instrumentation. OpenTelemetry has a concept of a
[Sampler](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#sampling),
and the `Filter` option does the filtering *before* the Sampler is invoked.
and the `Filter` option does the filtering *after* the Sampler is invoked.

### Enrich

Expand Down
5 changes: 5 additions & 0 deletions src/OpenTelemetry/Trace/SamplingParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,15 @@ public SamplingParameters(
/// <summary>
/// Gets the kind of span/activity to be created.
/// </summary>
/// <remarks>
/// For Activities created outside of ActivitySource,
/// the Kind will be the default (Internal).
/// </remarks>
public ActivityKind Kind { get; }

/// <summary>
/// Gets the tags to be associated to the span/activity to be created.
/// These are the tags provided at the time of Activity creation.
/// </summary>
public IEnumerable<KeyValuePair<string, object>> Tags { get; }

Expand Down

0 comments on commit 2e14eb9

Please sign in to comment.