Skip to content

Commit d56c2fa

Browse files
committed
Downgrade SDK due to issue with Systems.Diagnostics.DiagnosticsSource v7.0.0
1 parent e67e5ff commit d56c2fa

File tree

6 files changed

+45
-41
lines changed

6 files changed

+45
-41
lines changed

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@
77
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
88
<PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
99
<PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
10+
<NoWarn>NU1605</NoWarn>
1011
</PropertyGroup>
1112

1213
<ItemGroup>
13-
<PackageReference Include="OpenTelemetry.Api" Version="1.5.0-alpha.2" NoWarn="NU5104" />
14-
<PackageReference Include="OpenTelemetry" Version="1.5.0-alpha.2" NoWarn="NU5104" />
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.5.0-alpha.2" NoWarn="NU5104" />
16-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.0-alpha.2" NoWarn="NU5104" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.0-alpha.2" NoWarn="NU5104" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" NoWarn="NU5104" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" NoWarn="NU5104" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" NoWarn="NU5104" />
21-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
14+
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
15+
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
16+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
17+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
18+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
20+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
21+
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
22+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
2223
</ItemGroup>
2324

2425
<ItemGroup>

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/OpenTelemetryProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public OpenTelemetryProvider(GXService s)
1313

1414
public bool InstrumentAspNetCoreApplication(IServiceCollection services)
1515
{
16-
services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>
16+
services.AddOpenTelemetryTracing(tracerProviderBuilder =>
1717
{
1818
tracerProviderBuilder
1919
.AddOtlpExporter()

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@
77
<SignAssembly>false</SignAssembly>
88
<AssemblyName>GeneXus.OpenTelemetry.AWS.AspNet</AssemblyName>
99
<PackageTags>AWSOtel OpenDistro OpenTelemetry GeneXus</PackageTags>
10-
<PackageId>GeneXus.OpenTelemetry.AWS.AspNet</PackageId>
10+
<PackageId>GeneXus.OpenTelemetry.AWS.AspNet</PackageId>
11+
<NoWarn>NU1605</NoWarn>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
1415
<PackageReference Include="OpenTelemetry.Contrib.Extensions.AWSXRay" Version="1.2.0" />
1516
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.AWS" Version="1.0.2" />
16-
<PackageReference Include="OpenTelemetry.Api" Version="1.5.0-alpha.2" NoWarn="NU5104" />
17-
<PackageReference Include="OpenTelemetry" Version="1.5.0-alpha.2" NoWarn="NU5104" />
18-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.5.0-alpha.2" NoWarn="NU5104" />
19-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.0-alpha.2" NoWarn="NU5104" />
20-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.0-alpha.2" NoWarn="NU5104" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" NoWarn="NU5104" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" NoWarn="NU5104" />
23-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" NoWarn="NU5104" />
24-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
17+
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
18+
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
19+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
20+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
21+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
23+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
24+
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
25+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
2526
</ItemGroup>
2627

2728
<ItemGroup>

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@
77
<AssemblyName>GeneXus.OpenTelemetry.Azure.AppInsights</AssemblyName>
88
<PackageTags>Azure Application Insights OpenTelemetry GeneXus</PackageTags>
99
<PackageId>GeneXus.OpenTelemetry.Azure.AppInsights</PackageId>
10+
<NoWarn>NU1605</NoWarn>
1011
</PropertyGroup>
1112
<ItemGroup>
1213
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.0.0-beta.10" NoWarn="NU5104"/>
13-
<PackageReference Include="OpenTelemetry.Api" Version="1.5.0-alpha.2" NoWarn="NU5104" />
14-
<PackageReference Include="OpenTelemetry" Version="1.5.0-alpha.2" NoWarn="NU5104" />
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.5.0-alpha.2" NoWarn="NU5104" />
16-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.0-alpha.2" NoWarn="NU5104" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.0-alpha.2" NoWarn="NU5104" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" NoWarn="NU5104" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" NoWarn="NU5104" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" NoWarn="NU5104" />
21-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" NoWarn="NU5104"/>
14+
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
15+
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
16+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
17+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
18+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
20+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
21+
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
22+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
2223
</ItemGroup>
2324
<ItemGroup>
2425
<ProjectReference Include="..\..\..\GxClasses\GxClasses.csproj" />

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@
77
<SignAssembly>false</SignAssembly>
88
<AssemblyName>GeneXus.OpenTelemetry.Lightstep.AspNet</AssemblyName>
99
<PackageTags>Lightstep OpenTelemetry GeneXus DotNet </PackageTags>
10-
<PackageId>GeneXus.OpenTelemetry.Lightstep.AspNet</PackageId>
10+
<PackageId>GeneXus.OpenTelemetry.Lightstep.AspNet</PackageId>
11+
<NoWarn>NU1605</NoWarn>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="OpenTelemetry.Api" Version="1.5.0-alpha.2" NoWarn="NU5104" />
15-
<PackageReference Include="OpenTelemetry" Version="1.5.0-alpha.2" NoWarn="NU5104" />
16-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.5.0-alpha.2" NoWarn="NU5104" />
17-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.0-alpha.2" NoWarn="NU5104" />
18-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.0-alpha.2" NoWarn="NU5104" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" NoWarn="NU5104" />
20-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" NoWarn="NU5104" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" NoWarn="NU5104" />
22-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
15+
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
16+
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
17+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
18+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
19+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
20+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
21+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
23+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
2324
</ItemGroup>
2425

2526
<ItemGroup>

dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/LightstepProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public bool InstrumentAspNetCoreApplication(IServiceCollection services)
3131
return false;
3232
}
3333

34-
services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>
35-
{
34+
services.AddOpenTelemetryTracing(tracerProviderBuilder =>
35+
{
3636
tracerProviderBuilder
3737
.AddOtlpExporter(opt =>
3838
{

0 commit comments

Comments
 (0)