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.

Sign up for GitHub

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

Mark Activity extension methods not required by spec as internal #1545

Merged
merged 9 commits into from
Nov 16, 2020
Merged

Mark Activity extension methods not required by spec as internal #1545

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
92981ad
Mark activity extensions as internal
cijothomas Nov 14, 2020
8a5dd86
format
cijothomas Nov 14, 2020
69b958b
Merge branch 'master' into cijothomas/activityextensionsasinternal
cijothomas Nov 14, 2020
01568b6
test proj adjustments
cijothomas Nov 14, 2020
ddbaa93
more cleanups
cijothomas Nov 14, 2020
c82d7db
temporarily remove benchmark. this should be brought back after split…
cijothomas Nov 14, 2020
c727c15
fix w3ctracecontext tes
cijothomas Nov 14, 2020
56a6f15
fix grpctest refs
cijothomas Nov 14, 2020
dfc35a7
Update src/OpenTelemetry.Api/CHANGELOG.md
cijothomas Nov 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/Console/Examples.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PackageReference>
<PackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPkgVer)" />

<Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Trace\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 0 additions & 8 deletions src/OpenTelemetry.Api/.publicApi/net452/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ OpenTelemetry.Metrics.NoopInt64ObserverMetricHandle.NoopInt64ObserverMetricHandl
OpenTelemetry.Metrics.NoopMeasureMetric<T>
OpenTelemetry.Metrics.NoopMeasureMetric<T>.NoopMeasureMetric() -> void
OpenTelemetry.Trace.ActivityExtensions
OpenTelemetry.Trace.IActivityEnumerator<T>
OpenTelemetry.Trace.IActivityEnumerator<T>.ForEach(T item) -> bool
OpenTelemetry.Trace.Link
OpenTelemetry.Trace.Link.Attributes.get -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>>
OpenTelemetry.Trace.Link.Context.get -> OpenTelemetry.Trace.SpanContext
Expand Down Expand Up @@ -273,13 +271,7 @@ static OpenTelemetry.Metrics.MeterFactoryBase.Default.get -> OpenTelemetry.Metri
static OpenTelemetry.Metrics.MeterFactoryBase.SetDefault(OpenTelemetry.Metrics.MeterFactoryBase meterFactory) -> void
static OpenTelemetry.Metrics.MeterProvider.Default.get -> OpenTelemetry.Metrics.MeterProvider
static OpenTelemetry.Metrics.MeterProvider.SetDefault(OpenTelemetry.Metrics.MeterProvider meterProvider) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateEvents<T>(this System.Diagnostics.Activity activity, ref T eventEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateLinks<T>(this System.Diagnostics.Activity activity, ref T linkEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateTags<T>(this System.Diagnostics.Activity activity, ref T tagEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateTags<T>(this System.Diagnostics.ActivityEvent activityEvent, ref T tagEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateTags<T>(this System.Diagnostics.ActivityLink activityLink, ref T tagEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.GetStatus(this System.Diagnostics.Activity activity) -> OpenTelemetry.Trace.Status
static OpenTelemetry.Trace.ActivityExtensions.GetTagValue(this System.Diagnostics.Activity activity, string tagName) -> object
static OpenTelemetry.Trace.ActivityExtensions.RecordException(this System.Diagnostics.Activity activity, System.Exception ex) -> void
static OpenTelemetry.Trace.ActivityExtensions.SetStatus(this System.Diagnostics.Activity activity, OpenTelemetry.Trace.Status status) -> void
static OpenTelemetry.Trace.Link.operator !=(OpenTelemetry.Trace.Link link1, OpenTelemetry.Trace.Link link2) -> bool
Expand Down
8 changes: 0 additions & 8 deletions src/OpenTelemetry.Api/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ OpenTelemetry.Metrics.NoopInt64ObserverMetricHandle.NoopInt64ObserverMetricHandl
OpenTelemetry.Metrics.NoopMeasureMetric<T>
OpenTelemetry.Metrics.NoopMeasureMetric<T>.NoopMeasureMetric() -> void
OpenTelemetry.Trace.ActivityExtensions
OpenTelemetry.Trace.IActivityEnumerator<T>
OpenTelemetry.Trace.IActivityEnumerator<T>.ForEach(T item) -> bool
OpenTelemetry.Trace.Link
OpenTelemetry.Trace.Link.Attributes.get -> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>>
OpenTelemetry.Trace.Link.Context.get -> OpenTelemetry.Trace.SpanContext
Expand Down Expand Up @@ -273,13 +271,7 @@ static OpenTelemetry.Metrics.MeterFactoryBase.Default.get -> OpenTelemetry.Metri
static OpenTelemetry.Metrics.MeterFactoryBase.SetDefault(OpenTelemetry.Metrics.MeterFactoryBase meterFactory) -> void
static OpenTelemetry.Metrics.MeterProvider.Default.get -> OpenTelemetry.Metrics.MeterProvider
static OpenTelemetry.Metrics.MeterProvider.SetDefault(OpenTelemetry.Metrics.MeterProvider meterProvider) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateEvents<T>(this System.Diagnostics.Activity activity, ref T eventEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateLinks<T>(this System.Diagnostics.Activity activity, ref T linkEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateTags<T>(this System.Diagnostics.Activity activity, ref T tagEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateTags<T>(this System.Diagnostics.ActivityEvent activityEvent, ref T tagEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.EnumerateTags<T>(this System.Diagnostics.ActivityLink activityLink, ref T tagEnumerator) -> void
static OpenTelemetry.Trace.ActivityExtensions.GetStatus(this System.Diagnostics.Activity activity) -> OpenTelemetry.Trace.Status
static OpenTelemetry.Trace.ActivityExtensions.GetTagValue(this System.Diagnostics.Activity activity, string tagName) -> object
static OpenTelemetry.Trace.ActivityExtensions.RecordException(this System.Diagnostics.Activity activity, System.Exception ex) -> void
static OpenTelemetry.Trace.ActivityExtensions.SetStatus(this System.Diagnostics.Activity activity, OpenTelemetry.Trace.Status status) -> void
static OpenTelemetry.Trace.Link.operator !=(OpenTelemetry.Trace.Link link1, OpenTelemetry.Trace.Link link2) -> bool
Expand Down
4 changes: 4 additions & 0 deletions src/OpenTelemetry.Api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
## Unreleased

* Updated System.Diagnostics.DiagnosticSource to version 5.0.0
* Mark Activity extension methods as internal as these are not required to be
public. GetTagValue,EnumerateTags, EnumerateLinks, EnumerateEvents. See
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
[#1544](https://github.com/open-telemetry/opentelemetry-dotnet/issues/1544)
for full changes.

## 0.8.0-beta.1

Expand Down
Loading