Skip to content

Commit baea3e4

Browse files
committed
OpenTelemetry support for Azure Monitor
1 parent 6703d77 commit baea3e4

File tree

6 files changed

+39
-34
lines changed

6 files changed

+39
-34
lines changed

dotnet/DotNetStandardClasses.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeneXus.OpenTelemetry", "sr
226226
EndProject
227227
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynService.CosmosDB", "src\dotnetcore\DynService\Cosmos\DynService.CosmosDB.csproj", "{52DC6C43-58ED-4310-996B-06E95105F848}"
228228
EndProject
229+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeneXus.OpenTelemetry.Azure.AppInsights", "src\dotnetcore\Providers\OpenTelemetry\OpenTelemetryAzureMonitor\GeneXus.OpenTelemetry.Azure.AppInsights.csproj", "{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}"
230+
EndProject
229231
Global
230232
GlobalSection(SolutionConfigurationPlatforms) = preSolution
231233
Debug|Any CPU = Debug|Any CPU
@@ -548,6 +550,10 @@ Global
548550
{52DC6C43-58ED-4310-996B-06E95105F848}.Debug|Any CPU.Build.0 = Debug|Any CPU
549551
{52DC6C43-58ED-4310-996B-06E95105F848}.Release|Any CPU.ActiveCfg = Release|Any CPU
550552
{52DC6C43-58ED-4310-996B-06E95105F848}.Release|Any CPU.Build.0 = Release|Any CPU
553+
{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
554+
{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
555+
{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
556+
{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Release|Any CPU.Build.0 = Release|Any CPU
551557
EndGlobalSection
552558
GlobalSection(SolutionProperties) = preSolution
553559
HideSolutionNode = FALSE
@@ -657,6 +663,7 @@ Global
657663
{B5A9DEA7-67EC-49E4-924E-4729C34286EC} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
658664
{00B1FA38-7D0B-47E4-860C-23490249A4D6} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
659665
{52DC6C43-58ED-4310-996B-06E95105F848} = {79C9ECC6-2935-4C43-BF32-94698547F584}
666+
{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
660667
EndGlobalSection
661668
GlobalSection(ExtensibilityGlobals) = postSolution
662669
SolutionGuid = {E18684C9-7D76-45CD-BF24-E3944B7F174C}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
14-
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
16-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
20-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
21-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
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="8.0.0-preview.3.23174.8" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ public OpenTelemetryProvider(GXService s)
1313

1414
public bool InstrumentAspNetCoreApplication(IServiceCollection services)
1515
{
16-
17-
services.AddOpenTelemetryTracing(tracerProviderBuilder =>
16+
services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>
1817
{
1918
tracerProviderBuilder
20-
.AddOtlpExporter()
21-
.AddGxAspNetInstrumentation();
19+
.AddOtlpExporter()
20+
.AddGxAspNetInstrumentation();
2221
});
23-
2422
return true;
2523
}
2624
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net6.0</TargetFrameworks>
@@ -13,15 +13,15 @@
1313
<ItemGroup>
1414
<PackageReference Include="OpenTelemetry.Contrib.Extensions.AWSXRay" Version="1.2.0" />
1515
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.AWS" Version="1.0.2" />
16-
<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
17-
<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
18-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
19-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
20-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
23-
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
24-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
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="8.0.0-preview.3.23174.8" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
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" />
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="8.0.0-preview.3.23174.8" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public bool InstrumentAspNetCoreApplication(IServiceCollection services)
3131
return false;
3232
}
3333

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

0 commit comments

Comments
 (0)