OpenTelemetry support for Azure Monitor (#802)

sjuarezgx · claudiamurialdo · web-flow · commit da7333b4be31 · 2023-05-18T12:25:03.000-03:00
* OpenTelemetry support for Azure Monitor

* Support versions with string prefixes (such as "8.0.0-preview.3.23174.8" and "1.5.0-alpha.2") on ProjectHealthTest.

* Add AWSInstrumentation for AWSOtel.
Update dependency of GxNetCoreStartup proyect.

* Add UnitTest for error Could not load file or assembly 'System.Diagnostics.DiagnosticSource, Version=7.0.0.0
It happens when &lt;PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" /&gt;  is removed from GxNetCoreStartup.

* use Azure.Monitor.OpenTelemetry.AspNetCore because it automatically collects telemetry data

---------

Co-authored-by: cmurialdo &lt;cmurialdo@genexus.com&gt;
diff --git a/dotnet/DotNetStandardClasses.sln b/dotnet/DotNetStandardClasses.sln
@@ -226,6 +226,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeneXus.OpenTelemetry", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynService.CosmosDB", "src\dotnetcore\DynService\Cosmos\DynService.CosmosDB.csproj", "{52DC6C43-58ED-4310-996B-06E95105F848}"
 EndProject
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreOpenTelemetryTest", "test\DotNetCoreOpenTelemetryTest\DotNetCoreOpenTelemetryTest.csproj", "{B040A39A-53DC-4514-BE7F-A275FE1355FF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5937CEC2-5C16-4650-B0E6-78CD34357384} = {5937CEC2-5C16-4650-B0E6-78CD34357384}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "test\TestApp\TestApp.csproj", "{5937CEC2-5C16-4650-B0E6-78CD34357384}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -548,6 +557,18 @@ Global
 		{52DC6C43-58ED-4310-996B-06E95105F848}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52DC6C43-58ED-4310-996B-06E95105F848}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52DC6C43-58ED-4310-996B-06E95105F848}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B040A39A-53DC-4514-BE7F-A275FE1355FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B040A39A-53DC-4514-BE7F-A275FE1355FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B040A39A-53DC-4514-BE7F-A275FE1355FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B040A39A-53DC-4514-BE7F-A275FE1355FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5937CEC2-5C16-4650-B0E6-78CD34357384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5937CEC2-5C16-4650-B0E6-78CD34357384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5937CEC2-5C16-4650-B0E6-78CD34357384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5937CEC2-5C16-4650-B0E6-78CD34357384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -657,6 +678,9 @@ Global
 		{B5A9DEA7-67EC-49E4-924E-4729C34286EC} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
 		{00B1FA38-7D0B-47E4-860C-23490249A4D6} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
 		{52DC6C43-58ED-4310-996B-06E95105F848} = {79C9ECC6-2935-4C43-BF32-94698547F584}
+		{7AD4B13D-FA17-489B-9721-C00BCB6A3F2C} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
+		{B040A39A-53DC-4514-BE7F-A275FE1355FF} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
+		{5937CEC2-5C16-4650-B0E6-78CD34357384} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E18684C9-7D76-45CD-BF24-E3944B7F174C}
diff --git a/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj b/dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
@@ -16,6 +16,7 @@
 		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.1.3" />
 		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.7" />
 		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
+		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
 	</ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GxClasses.Web\GxClasses.Web.csproj" />
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/GeneXus.OpenTelemetry.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -7,18 +7,16 @@
 	  <AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
 	  <PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
 	  <PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
+	  <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
-	  <PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
-	  <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104"/>
-	  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
-	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
-	  <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104"/>
-	  <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+	  <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
+	  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0" />
+	  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" NoWarn="NU5104" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" NoWarn="NU5104" />
+	  <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" NoWarn="NU5104" />
   </ItemGroup>
 	
   <ItemGroup>
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/OpenTelemetryProvider.cs b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetry/OpenTelemetryProvider.cs
@@ -13,14 +13,12 @@ public OpenTelemetryProvider(GXService s)
 
 		public bool InstrumentAspNetCoreApplication(IServiceCollection services)
 		{
-			
-			services.AddOpenTelemetryTracing(tracerProviderBuilder =>
+			services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>
 			{
 				tracerProviderBuilder
-				.AddOtlpExporter()			   
-				.AddGxAspNetInstrumentation();		   
+				.AddOtlpExporter()
+				.AddGxAspNetInstrumentation();
 			});
-
 			return true;
 		}
 	}
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/AWSOtelProvider.cs b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/AWSOtelProvider.cs
@@ -22,6 +22,7 @@ public bool InstrumentAspNetCoreApplication(IServiceCollection _)
 
 			Sdk.CreateTracerProviderBuilder()
 				.AddXRayTraceId()    // for generating AWS X-Ray compliant trace IDs
+				.AddAWSInstrumentation()
 				.AddOtlpExporter(options =>
 				{
 					if (!string.IsNullOrEmpty(oltpEndpoint))
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAWSOtel/GeneXus.OpenTelemetry.AWS.AspNet.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
 	  <TargetFrameworks>net6.0</TargetFrameworks>
@@ -7,21 +7,13 @@
 	  <SignAssembly>false</SignAssembly>	 
 	  <AssemblyName>GeneXus.OpenTelemetry.AWS.AspNet</AssemblyName>
 	  <PackageTags>AWSOtel OpenDistro OpenTelemetry GeneXus</PackageTags>
-	  <PackageId>GeneXus.OpenTelemetry.AWS.AspNet</PackageId>	  
+	  <PackageId>GeneXus.OpenTelemetry.AWS.AspNet</PackageId>
+	  <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
 	  <PackageReference Include="OpenTelemetry.Contrib.Extensions.AWSXRay" Version="1.2.0" />
 	  <PackageReference Include="OpenTelemetry.Contrib.Instrumentation.AWS" Version="1.0.2" />
-	  <PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-	  <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-	  <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/AzureAppInsights.cs b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/AzureAppInsights.cs
@@ -0,0 +1,41 @@
+using System;
+using Azure.Monitor.OpenTelemetry.AspNetCore;
+using GeneXus.Services;
+using GeneXus.Services.OpenTelemetry;
+using log4net;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace GeneXus.OpenTelemetry.Azure
+{
+	public class AzureAppInsights : IOpenTelemetryProvider
+	{
+		private static readonly ILog log = LogManager.GetLogger(typeof(AzureAppInsights));
+		private const string APPLICATIONINSIGHTS_CONNECTION_STRING = "APPLICATIONINSIGHTS_CONNECTION_STRING";
+
+		public AzureAppInsights(GXService s)
+		{
+		}
+
+		public bool InstrumentAspNetCoreApplication(IServiceCollection services)
+		{
+			string oltpEndpoint = Environment.GetEnvironmentVariable(APPLICATIONINSIGHTS_CONNECTION_STRING);
+		
+			if (!string.IsNullOrEmpty(oltpEndpoint))
+			{
+				services.AddOpenTelemetry()
+				.UseAzureMonitor( o =>
+					{
+						o.ConnectionString = oltpEndpoint;
+					});
+
+				return true;
+			}
+			else
+			{ 
+				log.Warn("OpenTelemetry Azure Monitor was not initialized due to missing 'APPLICATIONINSIGHTS_CONNECTION_STRING' Environment Variable");
+				return false;
+			}
+		}
+	}
+}
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryAzureMonitor/GeneXus.OpenTelemetry.Azure.AppInsights.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFrameworks>net6.0</TargetFrameworks>
+		<DefineConstants>NETCORE;</DefineConstants>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<SignAssembly>false</SignAssembly>
+		<AssemblyName>GeneXus.OpenTelemetry.Azure.AppInsights</AssemblyName>
+		<PackageTags>Azure Application Insights OpenTelemetry GeneXus</PackageTags>
+		<PackageId>GeneXus.OpenTelemetry.Azure.AppInsights</PackageId>
+		<NoWarn>NU1605</NoWarn>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.0.0-beta.4" NoWarn="NU5104"/>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\GxClasses\GxClasses.csproj" />
+		<ProjectReference Include="..\OpenTelemetry\GeneXus.OpenTelemetry.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/GeneXus.OpenTelemetry.Lightstep.AspNet.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFrameworks>net6.0</TargetFrameworks>
@@ -7,21 +7,10 @@
 		<SignAssembly>false</SignAssembly>
 		<AssemblyName>GeneXus.OpenTelemetry.Lightstep.AspNet</AssemblyName>
 		<PackageTags>Lightstep OpenTelemetry GeneXus DotNet </PackageTags>
-		<PackageId>GeneXus.OpenTelemetry.Lightstep.AspNet</PackageId>		
+		<PackageId>GeneXus.OpenTelemetry.Lightstep.AspNet</PackageId>
+		<NoWarn>NU1605</NoWarn>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="OpenTelemetry.Api" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.4.0-alpha.1" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-		<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.5" NoWarn="NU5104" />
-		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <ProjectReference Include="..\..\..\GxClasses\GxClasses.csproj" />
 	  <ProjectReference Include="..\OpenTelemetry\GeneXus.OpenTelemetry.csproj" />
diff --git a/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/LightstepProvider.cs b/dotnet/src/dotnetcore/Providers/OpenTelemetry/OpenTelemetryLightStep/LightstepProvider.cs
@@ -31,8 +31,8 @@ public bool InstrumentAspNetCoreApplication(IServiceCollection services)
 				return false;
 			}
 
-			services.AddOpenTelemetryTracing(tracerProviderBuilder =>
-			 {
+			services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>
+			{
 				 tracerProviderBuilder
 				 .AddOtlpExporter(opt =>
 				 {
diff --git a/dotnet/test/DotNetCoreOpenTelemetryTest/CloudServices.config b/dotnet/test/DotNetCoreOpenTelemetryTest/CloudServices.config
@@ -0,0 +1,32 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Services>
+  <Service>
+    <Name>INPROCESS</Name>
+    <Type>WebNotifications</Type>
+    <ClassName>GeneXus.Http.WebSocket.WSHandler</ClassName>
+    <Properties>
+      <Property>
+        <Name>WEBNOTIFICATIONS_RECEIVED_HANDLER</Name>
+        <Value />
+      </Property>
+      <Property>
+        <Name>WEBNOTIFICATIONS_ONOPEN_HANDLER</Name>
+        <Value />
+      </Property>
+      <Property>
+        <Name>WEBNOTIFICATIONS_ONCLOSE_HANDLER</Name>
+        <Value />
+      </Property>
+      <Property>
+        <Name>WEBNOTIFICATIONS_ONERROR_HANDLER</Name>
+        <Value />
+      </Property>
+    </Properties>
+  </Service>
+  <Service>
+    <Name>AZUREMONITOR</Name>
+    <Type>Observability</Type>
+    <ClassName>GeneXus.OpenTelemetry.Azure.AzureAppInsights, GeneXus.OpenTelemetry.Azure.AppInsights, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</ClassName>
+    <Properties />
+  </Service>
+</Services>
diff --git a/dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj b/dotnet/test/DotNetCoreOpenTelemetryTest/DotNetCoreOpenTelemetryTest.csproj
@@ -0,0 +1,63 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFrameworks>net6.0</TargetFrameworks>
+		<NoWarn>CS8032;1701;1702;NU1701</NoWarn>
+		<RollForward>Major</RollForward>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DefineConstants>TRACE;NETCORE</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DefineConstants>DEBUG;TRACE;NETCORE</DefineConstants>
+	</PropertyGroup>
+
+
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.4" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="3.0.2">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
+
+	</ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\dotnetcore\GxClasses\GxClasses.csproj" />
+    <ProjectReference Include="..\..\src\dotnetcore\GxNetCoreStartup\GxNetCoreStartup.csproj" />
+    <ProjectReference Include="..\DotNetCoreWebUnitTest\DotNetCoreWebUnitTest.csproj" />
+  </ItemGroup>
+
+
+
+	<ItemGroup>
+		<None Update="appsettings.Development.json">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="CloudServices.config">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		  <TargetPath>..\CloudServices.config</TargetPath>
+		</None>
+		<None Update="confmapping.json">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="appsettings.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="uruguay.flag.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+
+
+</Project>
diff --git a/dotnet/test/DotNetCoreOpenTelemetryTest/TestOpenTelemetry.cs b/dotnet/test/DotNetCoreOpenTelemetryTest/TestOpenTelemetry.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using GeneXus.Configuration;
+using GeneXus.Metadata;
+using Xunit;
+using xUnitTesting;
+
+namespace DotNetCoreWebUnitTest
+{
+	public class TestOpenTelemetry : MiddlewareTest
+	{
+		public TestOpenTelemetry() {
+			ClassLoader.FindType("TestApp", "GeneXus.Programs.apps", "testservice", Assembly.GetExecutingAssembly(), true);//Force loading assembly for testservice
+			server.AllowSynchronousIO = true;
+
+		}
+		[Fact]
+		public async Task TestCouldNotLoadSystemDiagnosticsDiagnosticSource7_0_0_0()
+		{
+			server.AllowSynchronousIO = true;
+			HttpClient client = server.CreateClient();
+			HttpResponseMessage response = await client.PostAsync("rest/apps/testservice", null);
+			response.EnsureSuccessStatusCode();
+			Assert.Equal(System.Net.HttpStatusCode.OK, response.StatusCode);
+			string responseBody = await response.Content.ReadAsStringAsync();
+			Assert.Equal("{}", responseBody);
+		}
+
+	}
+}
diff --git a/dotnet/test/DotNetCoreOpenTelemetryTest/appsettings.json b/dotnet/test/DotNetCoreOpenTelemetryTest/appsettings.json
diff --git a/dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs b/dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs
diff --git a/dotnet/test/TestApp/TestApp.csproj b/dotnet/test/TestApp/TestApp.csproj
diff --git a/dotnet/test/TestApp/apps/testservice.cs b/dotnet/test/TestApp/apps/testservice.cs
diff --git a/dotnet/test/TestApp/apps/testservice.svc b/dotnet/test/TestApp/apps/testservice.svc

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,12 @@ public OpenTelemetryProvider(GXService s)`
`13`	`13`
`14`	`14`	`public bool InstrumentAspNetCoreApplication(IServiceCollection services)`
`15`	`15`	`{`
`16`		`-`
`17`		`- services.AddOpenTelemetryTracing(tracerProviderBuilder =>`
	`16`	`+ services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>`
`18`	`17`	`{`
`19`	`18`	`tracerProviderBuilder`
`20`		`- .AddOtlpExporter()`
`21`		`- .AddGxAspNetInstrumentation();`
	`19`	`+ .AddOtlpExporter()`
	`20`	`+ .AddGxAspNetInstrumentation();`
`22`	`21`	`});`
`23`		`-`
`24`	`22`	`return true;`
`25`	`23`	`}`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public bool InstrumentAspNetCoreApplication(IServiceCollection _)`
`22`	`22`
`23`	`23`	`Sdk.CreateTracerProviderBuilder()`
`24`	`24`	`.AddXRayTraceId() // for generating AWS X-Ray compliant trace IDs`
	`25`	`+ .AddAWSInstrumentation()`
`25`	`26`	`.AddOtlpExporter(options =>`
`26`	`27`	`{`
`27`	`28`	`if (!string.IsNullOrEmpty(oltpEndpoint))`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public bool InstrumentAspNetCoreApplication(IServiceCollection services)`
`31`	`31`	`return false;`
`32`	`32`	`}`
`33`	`33`
`34`		`- services.AddOpenTelemetryTracing(tracerProviderBuilder =>`
`35`		`- {`
	`34`	`+ services.AddOpenTelemetry().WithTracing(tracerProviderBuilder =>`
	`35`	`+ {`
`36`	`36`	`tracerProviderBuilder`
`37`	`37`	`.AddOtlpExporter(opt =>`
`38`	`38`	`{`