Merge branch 'main' into cijothomas/fixconditionalcompilations

open-telemetry · Mar 14, 2022 · 8d5040d · 8d5040d
2 parents 4ead1d8 + 191df62
commit 8d5040d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/examples/AspNet/Examples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -110,10 +110,14 @@
       <Project>{7edae7fa-b44e-42ca-80fa-7df2faa2c5dd}</Project>
       <Name>OpenTelemetry.Exporter.Zipkin</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj">
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.OpenTelemetryProtocol\OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj">
       <Project>{a38ac295-2745-4b85-8b6b-dca864cedd5b}</Project>
       <Name>OpenTelemetry.Exporter.OpenTelemetryProtocol</Name>
     </ProjectReference>
+    <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Exporter.Prometheus\OpenTelemetry.Exporter.Prometheus.csproj">
+      <Project>{52158a12-e7ef-45a1-859f-06f9b17410cb}</Project>
+      <Name>OpenTelemetry.Exporter.Prometheus</Name>
+    </ProjectReference>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/examples/AspNet/Global.asax.cs b/examples/AspNet/Global.asax.cs
@@ -73,8 +73,7 @@ protected void Application_Start()
             // https://github.com/open-telemetry/opentelemetry-dotnet/issues/2994
 
             var meterBuilder = Sdk.CreateMeterProviderBuilder()
-                 .AddAspNetInstrumentation()
-                 .AddHttpClientInstrumentation();
+                 .AddAspNetInstrumentation();
 
             switch (ConfigurationManager.AppSettings["UseMetricsExporter"].ToLowerInvariant())
             {
@@ -84,6 +83,9 @@ protected void Application_Start()
                         otlpOptions.Endpoint = new Uri(ConfigurationManager.AppSettings["OtlpEndpoint"]);
                     });
                     break;
+                case "prometheus":
+                    meterBuilder.AddPrometheusExporter();
+                    break;
                 default:
                     meterBuilder.AddConsoleExporter((exporterOptions, metricReaderOptions) =>
                     {