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

Rename gRPC instrumentation project #1136

Merged
merged 12 commits into from
Aug 22, 2020
Merged

Rename gRPC instrumentation project #1136

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4572354
Rename project OpenTelemetry.Instrumentation.GrpcNetClient
alanwest Aug 21, 2020
c308b12
Update GrpcNetClient README
alanwest Aug 21, 2020
7f1fa2e
Update AspNetCore instrumentation README with gRPC support
alanwest Aug 21, 2020
649454d
Merge remote-tracking branch 'upstream/master' into master
alanwest Aug 21, 2020
288a1da
Merge branch 'master' into alanwest/grpc-project
alanwest Aug 21, 2020
0939d55
Merge branch 'master' into alanwest/grpc-project
cijothomas Aug 22, 2020
bd5e0f8
Update changelog and top-level readme
alanwest Aug 22, 2020
a2d5fe3
:Merge branch 'alanwest/grpc-project' of github.com:alanwest/opentele…
alanwest Aug 22, 2020
aa790f7
markdownlint
alanwest Aug 22, 2020
b226e75
Fix project/file path references
alanwest Aug 22, 2020
1ca55f2
Change namespace to GrpcNetClient
alanwest Aug 22, 2020
a28fb63
Merge branch 'master' into alanwest/grpc-project
cijothomas Aug 22, 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 OpenTelemetry.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Http", "src\OpenTelemetry.Instrumentation.Http\OpenTelemetry.Instrumentation.Http.csproj", "{412C64D1-43D6-4E4C-8AD8-E20E63B415BD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Grpc", "src\OpenTelemetry.Instrumentation.Grpc\OpenTelemetry.Instrumentation.Grpc.csproj", "{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.GrpcNetClient", "src\OpenTelemetry.Instrumentation.GrpcNetClient\OpenTelemetry.Instrumentation.GrpcNetClient.csproj", "{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7C87CAF9-79D7-4C26-9FFB-F3F1FB6911F1}"
EndProject
Expand Down
2 changes: 2 additions & 0 deletions src/OpenTelemetry.Instrumentation.AspNetCore/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

Automatically instruments the incoming requests to [ASP.NET
Core](https://docs.microsoft.com/en-us/aspnet/core).
This includes incoming gRPC requests using [Grpc.AspNetCore]
(https://www.nuget.org/packages/Grpc.AspNetCore).

## Installation

Expand Down
15 changes: 0 additions & 15 deletions src/OpenTelemetry.Instrumentation.Grpc/README.md
View file
Open in desktop

This file was deleted.

0 ...etry.Instrumentation.Grpc/AssemblyInfo.cs → ...rumentation.GrpcNetClient/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 ...lemetry.Instrumentation.Grpc/CHANGELOG.md → ...nstrumentation.GrpcNetClient/CHANGELOG.md
View file
Open in desktop
File renamed without changes.
0 ...ntation.Grpc/GrpcClientInstrumentation.cs → ...rpcNetClient/GrpcClientInstrumentation.cs
View file
Open in desktop
File renamed without changes.
0 ...try.Instrumentation.Grpc/GrpcTagHelper.cs → ...umentation.GrpcNetClient/GrpcTagHelper.cs
View file
Open in desktop
File renamed without changes.
0 ...mentation/GrpcClientDiagnosticListener.cs → ...mentation/GrpcClientDiagnosticListener.cs
View file
Open in desktop
File renamed without changes.
0 ...ntation/GrpcInstrumentationEventSource.cs → ...ntation/GrpcInstrumentationEventSource.cs
View file
Open in desktop
File renamed without changes.
0 ...on.Grpc/Implementation/PropertyFetcher.cs → ...tClient/Implementation/PropertyFetcher.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...OpenTelemetry.Instrumentation.Grpc.csproj → ...etry.Instrumentation.GrpcNetClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<Description>gRPC client instrumentation for OpenTelemetry .NET</Description>
<Description>gRPC for .NET client instrumentation for OpenTelemetry .NET</Description>
<PackageTags>$(PackageTags);distributed-tracing</PackageTags>
</PropertyGroup>

Expand Down
18 changes: 18 additions & 0 deletions src/OpenTelemetry.Instrumentation.GrpcNetClient/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# OpenTelemetry.Instrumentation.GrpcNetClient

[![NuGet](https://img.shields.io/nuget/v/OpenTelemetry.Instrumentation.GrpcNetClient.svg)](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.GrpcNetClient)
[![NuGet](https://img.shields.io/nuget/dt/OpenTelemetry.Instrumentation.GrpcNetClient.svg)](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.GrpcNetClient)

Automatically instruments the outgoing requests from
[Grpc.Net.Client](https://www.nuget.org/packages/Grpc.Net.Client).

## Installation

```shell
dotnet add package OpenTelemetry.Instrumentation.GrpcNetClient
```

## References

* [gRPC for .NET](https://github.com/grpc/grpc-dotnet)
* [OpenTelemetry Project](https://opentelemetry.io/)
0 ...n.Grpc/TracerProviderBuilderExtensions.cs → ...Client/TracerProviderBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
Copy link
Member Author

Choose a reason for hiding this comment

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

I left the name of this test project the same since it has tests for both Grpc.Net.Client and Grpc.AspNetCore. Open to conversation here.

<PropertyGroup>
<Description>Unit test project for OpenTelemetry GrpcClient instrumentation</Description>
<Description>Unit test project for OpenTelemetry Grpc for .NET instrumentation</Description>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

Expand All @@ -26,7 +26,7 @@

<ItemGroup>
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNetCore\OpenTelemetry.Instrumentation.AspNetCore.csproj" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Grpc\OpenTelemetry.Instrumentation.Grpc.csproj" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Grpc\OpenTelemetry.Instrumentation.GrpcNetClient.csproj" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Http\OpenTelemetry.Instrumentation.Http.csproj" />
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\EventSourceTestHelper.cs" Link="EventSourceTestHelper.cs" />
Expand Down