Skip to content

Commit 2fe7215

Browse files
utpillautpilla
authored
Rename Owin Instrumentation (#257)
* Rename Owin Instrumentation
1 parent 595194d commit 2fe7215

20 files changed

+61
-42
lines changed

‎.github/component_owners.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ components:
99
- pcwiese
1010
src/OpenTelemetry.Contrib.Instrumentation.MassTransit/:
1111
- alexvaluyskiy
12-
src/OpenTelemetry.Contrib.Instrumentation.Owin/:
13-
- codeblanch
1412
src/OpenTelemetry.Contrib.Instrumentation.MySqlData/:
1513
- moonheart
1614
src/OpenTelemetry.Contrib.Preview/:
@@ -21,6 +19,8 @@ components:
2119
- vishweshbankwar
2220
src/OpenTelemetry.Instrumentation.ElasticsearchClient/:
2321
- ejsmith
22+
src/OpenTelemetry.Instrumentation.Owin/:
23+
- codeblanch
2424
src/OpenTelemetry.Instrumentation.Quartz/:
2525
- maldago
2626
src/OpenTelemetry.Instrumentation.Wcf/:
@@ -33,8 +33,6 @@ components:
3333
- pcwiese
3434
test/OpenTelemetry.Contrib.Instrumentation.MassTransit.Tests/:
3535
- alexvaluyskiy
36-
test/OpenTelemetry.Contrib.Instrumentation.Owin.Tests/:
37-
- codeblanch
3836
test/OpenTelemetry.Contrib.Instrumentation.MySqlData.Tests/:
3937
- moonheart
4038
test/OpenTelemetry.Contrib.Preview.Tests/:
@@ -45,6 +43,8 @@ components:
4543
- vishweshbankwar
4644
test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/:
4745
- ejsmith
46+
test/OpenTelemetry.Instrumentation.Owin.Tests/:
47+
- codeblanch
4848
test/OpenTelemetry.Instrumentation.Quartz.Tests/:
4949
- maldago
5050
test/OpenTelemetry.Instrumentation.Wcf.Tests/:

‎.github/workflows/package-Instrumentation.Owin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pack OpenTelemetry.Contrib.Instrumentation.Owin
1+
name: Pack OpenTelemetry.Instrumentation.Owin
22

33
on:
44
workflow_dispatch:
@@ -15,7 +15,7 @@ jobs:
1515
build-test-pack:
1616
runs-on: ${{ matrix.os }}
1717
env:
18-
PROJECT: OpenTelemetry.Contrib.Instrumentation.Owin
18+
PROJECT: OpenTelemetry.Instrumentation.Owin
1919

2020
strategy:
2121
matrix:

‎examples/owin/Examples.Owin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Instrumentation.Owin\OpenTelemetry.Contrib.Instrumentation.Owin.csproj" />
15+
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.Owin\OpenTelemetry.Instrumentation.Owin.csproj" />
1616
</ItemGroup>
1717

1818
</Project>

‎examples/owin/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# OWIN Instrumentation for OpenTelemetry .NET - Example
22

33
An example application that shows how to use
4-
`OpenTelemetry.Contrib.Instrumentation.Owin` to capture telemetry from a
4+
`OpenTelemetry.Instrumentation.Owin` to capture telemetry from a
55
self-hosted WebAPI .NET Framework service.
66

77
Span names are set to the route template resolved by WebAPI.

‎opentelemetry-dotnet-contrib.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
142142
EndProject
143143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Quartz.Tests", "test\OpenTelemetry.Instrumentation.Quartz.Tests\OpenTelemetry.Instrumentation.Quartz.Tests.csproj", "{37564EE6-F0A4-4F40-BB13-0BBFAC7F7F28}"
144144
EndProject
145-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Contrib.Instrumentation.Owin", "src\OpenTelemetry.Contrib.Instrumentation.Owin\OpenTelemetry.Contrib.Instrumentation.Owin.csproj", "{530255C1-D130-4B43-981D-911E54F7C787}"
146-
EndProject
147145
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "owin", "owin", "{8D11A34C-D0EF-4DE1-8230-32168E67044D}"
148146
EndProject
149147
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Owin", "examples\owin\Examples.Owin.csproj", "{6B3AA3F2-89A7-433F-918A-1E5E6AAF8423}"
150148
EndProject
151-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Contrib.Instrumentation.Owin.Tests", "test\OpenTelemetry.Contrib.Instrumentation.Owin.Tests\OpenTelemetry.Contrib.Instrumentation.Owin.Tests.csproj", "{D52558C8-B7BF-4F59-A0FA-9AA629E68012}"
152-
EndProject
153149
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Runtime", "src\OpenTelemetry.Contrib.Instrumentation.Runtime\OpenTelemetry.Instrumentation.Runtime.csproj", "{F01E8C75-2791-4DBE-BD7A-5510871EBF56}"
154150
EndProject
155151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Runtime.Tests", "test\OpenTelemetry.Contrib.Instrumentation.Runtime.Tests\OpenTelemetry.Instrumentation.Runtime.Tests.csproj", "{FB907DF7-F3F3-4A07-885D-E5FECAE36BDA}"
@@ -170,6 +166,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Pe
170166
EndProject
171167
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.PersistentStorage.Tests", "test\OpenTelemetry.Extensions.PersistentStorage.Tests\OpenTelemetry.Extensions.PersistentStorage.Tests.csproj", "{61F40874-7BD2-4814-886E-8D7A463D7F5E}"
172168
EndProject
169+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Owin", "src\OpenTelemetry.Instrumentation.Owin\OpenTelemetry.Instrumentation.Owin.csproj", "{2815DA76-D855-43FD-A005-FAB289B5EFE8}"
170+
EndProject
171+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Owin.Tests", "test\OpenTelemetry.Instrumentation.Owin.Tests\OpenTelemetry.Instrumentation.Owin.Tests.csproj", "{D7311F9A-BFC3-4470-9C49-39D826BA9996}"
172+
EndProject
173173
Global
174174
GlobalSection(SolutionConfigurationPlatforms) = preSolution
175175
Debug|Any CPU = Debug|Any CPU
@@ -284,18 +284,10 @@ Global
284284
{37564EE6-F0A4-4F40-BB13-0BBFAC7F7F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
285285
{37564EE6-F0A4-4F40-BB13-0BBFAC7F7F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
286286
{37564EE6-F0A4-4F40-BB13-0BBFAC7F7F28}.Release|Any CPU.Build.0 = Release|Any CPU
287-
{530255C1-D130-4B43-981D-911E54F7C787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
288-
{530255C1-D130-4B43-981D-911E54F7C787}.Debug|Any CPU.Build.0 = Debug|Any CPU
289-
{530255C1-D130-4B43-981D-911E54F7C787}.Release|Any CPU.ActiveCfg = Release|Any CPU
290-
{530255C1-D130-4B43-981D-911E54F7C787}.Release|Any CPU.Build.0 = Release|Any CPU
291287
{6B3AA3F2-89A7-433F-918A-1E5E6AAF8423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
292288
{6B3AA3F2-89A7-433F-918A-1E5E6AAF8423}.Debug|Any CPU.Build.0 = Debug|Any CPU
293289
{6B3AA3F2-89A7-433F-918A-1E5E6AAF8423}.Release|Any CPU.ActiveCfg = Release|Any CPU
294290
{6B3AA3F2-89A7-433F-918A-1E5E6AAF8423}.Release|Any CPU.Build.0 = Release|Any CPU
295-
{D52558C8-B7BF-4F59-A0FA-9AA629E68012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
296-
{D52558C8-B7BF-4F59-A0FA-9AA629E68012}.Debug|Any CPU.Build.0 = Debug|Any CPU
297-
{D52558C8-B7BF-4F59-A0FA-9AA629E68012}.Release|Any CPU.ActiveCfg = Release|Any CPU
298-
{D52558C8-B7BF-4F59-A0FA-9AA629E68012}.Release|Any CPU.Build.0 = Release|Any CPU
299291
{F01E8C75-2791-4DBE-BD7A-5510871EBF56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
300292
{F01E8C75-2791-4DBE-BD7A-5510871EBF56}.Debug|Any CPU.Build.0 = Debug|Any CPU
301293
{F01E8C75-2791-4DBE-BD7A-5510871EBF56}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -336,6 +328,14 @@ Global
336328
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
337329
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
338330
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Release|Any CPU.Build.0 = Release|Any CPU
331+
{2815DA76-D855-43FD-A005-FAB289B5EFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
332+
{2815DA76-D855-43FD-A005-FAB289B5EFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
333+
{2815DA76-D855-43FD-A005-FAB289B5EFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
334+
{2815DA76-D855-43FD-A005-FAB289B5EFE8}.Release|Any CPU.Build.0 = Release|Any CPU
335+
{D7311F9A-BFC3-4470-9C49-39D826BA9996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
336+
{D7311F9A-BFC3-4470-9C49-39D826BA9996}.Debug|Any CPU.Build.0 = Debug|Any CPU
337+
{D7311F9A-BFC3-4470-9C49-39D826BA9996}.Release|Any CPU.ActiveCfg = Release|Any CPU
338+
{D7311F9A-BFC3-4470-9C49-39D826BA9996}.Release|Any CPU.Build.0 = Release|Any CPU
339339
EndGlobalSection
340340
GlobalSection(SolutionProperties) = preSolution
341341
HideSolutionNode = FALSE
@@ -373,10 +373,8 @@ Global
373373
{4172D671-3AAC-443F-9EB0-A6608B154AF0} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
374374
{2CFC0D07-7AEC-4BC3-96C4-A06A38DBF6DF} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
375375
{37564EE6-F0A4-4F40-BB13-0BBFAC7F7F28} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
376-
{530255C1-D130-4B43-981D-911E54F7C787} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
377376
{8D11A34C-D0EF-4DE1-8230-32168E67044D} = {B75EE478-97F7-4E9F-9A5A-DB3D0988EDEA}
378377
{6B3AA3F2-89A7-433F-918A-1E5E6AAF8423} = {8D11A34C-D0EF-4DE1-8230-32168E67044D}
379-
{D52558C8-B7BF-4F59-A0FA-9AA629E68012} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
380378
{F01E8C75-2791-4DBE-BD7A-5510871EBF56} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
381379
{FB907DF7-F3F3-4A07-885D-E5FECAE36BDA} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
382380
{8A25B43D-BBB2-40FF-B0EB-33AACCD15AD7} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
@@ -387,6 +385,8 @@ Global
387385
{47ABABE1-62CC-4655-AA95-352F4DC20C96} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
388386
{C2B9190B-E2F6-4D40-B298-91521E383A50} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
389387
{61F40874-7BD2-4814-886E-8D7A463D7F5E} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
388+
{2815DA76-D855-43FD-A005-FAB289B5EFE8} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
389+
{D7311F9A-BFC3-4470-9C49-39D826BA9996} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
390390
EndGlobalSection
391391
GlobalSection(ExtensibilityGlobals) = postSolution
392392
SolutionGuid = {B0816796-CDB3-47D7-8C3C-946434DE3B66}

‎src/OpenTelemetry.Contrib.Instrumentation.Owin/CHANGELOG.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/OpenTelemetry.Contrib.Instrumentation.Owin/AppBuilderExtensions.cs‎ renamed to ‎src/OpenTelemetry.Instrumentation.Owin/AppBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// </copyright>
1616

1717
using System.Diagnostics;
18-
using OpenTelemetry.Contrib.Instrumentation.Owin;
18+
using OpenTelemetry.Instrumentation.Owin;
1919

2020
namespace Owin
2121
{

‎src/OpenTelemetry.Contrib.Instrumentation.Owin/AssemblyInfo.cs‎ renamed to ‎src/OpenTelemetry.Instrumentation.Owin/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Runtime.CompilerServices;
1919

2020
#if SIGNED
21-
[assembly: InternalsVisibleTo("OpenTelemetry.Contrib.Instrumentation.Owin.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010051c1562a090fb0c9f391012a32198b5e5d9a60e9b80fa2d7b434c9e5ccb7259bd606e66f9660676afc6692b8cdc6793d190904551d2103b7b22fa636dcbb8208839785ba402ea08fc00c8f1500ccef28bbf599aa64ffb1e1d5dc1bf3420a3777badfe697856e9d52070a50c3ea5821c80bef17ca3acffa28f89dd413f096f898")]
21+
[assembly: InternalsVisibleTo("OpenTelemetry.Instrumentation.Owin.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010051c1562a090fb0c9f391012a32198b5e5d9a60e9b80fa2d7b434c9e5ccb7259bd606e66f9660676afc6692b8cdc6793d190904551d2103b7b22fa636dcbb8208839785ba402ea08fc00c8f1500ccef28bbf599aa64ffb1e1d5dc1bf3420a3777badfe697856e9d52070a50c3ea5821c80bef17ca3acffa28f89dd413f096f898")]
2222
#else
2323
[assembly: InternalsVisibleTo("OpenTelemetry.Instrumentation.Owin.Tests")]
2424
#endif

‎src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Changelog
2+
3+
## Unreleased
4+
5+
## 1.0.0-rc.2
6+
7+
* Going forward the NuGet package will be
8+
[`OpenTelemetry.Instrumentation.Owin`](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Owin).
9+
Older versions will remain at
10+
[`OpenTelemetry.Contrib.Instrumentation.Owin`](https://www.nuget.org/packages/OpenTelemetry.Contrib.Instrumentation.Owin)
11+
[(#257)](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/257)
12+
13+
Migration:
14+
15+
* In code update namespaces (eg `using
16+
OpenTelemetry.Contrib.Instrumentation.Owin` -> `using
17+
OpenTelemetry.Instrumentation.Owin`)
18+
19+
## 1.0.0-rc1
20+
21+
* This is the first release of `OpenTelemetry.Contrib.Instrumentation.Owin` package.
22+
23+
For more details, please refer to the [README](README.md).

‎src/OpenTelemetry.Contrib.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs‎ renamed to ‎src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
using OpenTelemetry.Context.Propagation;
2424
using OpenTelemetry.Trace;
2525

26-
namespace OpenTelemetry.Contrib.Instrumentation.Owin
26+
namespace OpenTelemetry.Instrumentation.Owin
2727
{
2828
/// <summary>
2929
/// Instruments incoming request with <see cref="Activity"/> and notifies listeners with <see cref="ActivitySource"/>.

0 commit comments

Comments
 (0)