diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9e13f5923d9..f3e2a7a51f7 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -38,7 +38,7 @@
-
+
@@ -99,18 +99,18 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/playground/Playground.ServiceDefaults/Extensions.cs b/playground/Playground.ServiceDefaults/Extensions.cs
index 30ea4a2493f..8d81c278471 100644
--- a/playground/Playground.ServiceDefaults/Extensions.cs
+++ b/playground/Playground.ServiceDefaults/Extensions.cs
@@ -45,8 +45,9 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
builder.Services.AddOpenTelemetry()
.WithMetrics(metrics =>
{
- metrics.AddRuntimeInstrumentation()
- .AddBuiltInMeters();
+ metrics.AddAspNetCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddRuntimeInstrumentation();
})
.WithTracing(tracing =>
{
@@ -113,10 +114,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
return app;
}
-
- private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
- meterProviderBuilder.AddMeter(
- "Microsoft.AspNetCore.Hosting",
- "Microsoft.AspNetCore.Server.Kestrel",
- "System.Net.Http");
}
diff --git a/playground/eShopLite/ServiceDefaults/Extensions.cs b/playground/eShopLite/ServiceDefaults/Extensions.cs
index 4921efee9ab..fac619ca2c7 100644
--- a/playground/eShopLite/ServiceDefaults/Extensions.cs
+++ b/playground/eShopLite/ServiceDefaults/Extensions.cs
@@ -42,8 +42,9 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
builder.Services.AddOpenTelemetry()
.WithMetrics(metrics =>
{
- metrics.AddRuntimeInstrumentation()
- .AddBuiltInMeters();
+ metrics.AddAspNetCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddRuntimeInstrumentation();
})
.WithTracing(tracing =>
{
@@ -110,10 +111,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
return app;
}
-
- private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
- meterProviderBuilder.AddMeter(
- "Microsoft.AspNetCore.Hosting",
- "Microsoft.AspNetCore.Server.Kestrel",
- "System.Net.Http");
}
diff --git a/playground/orleans/OrleansServiceDefaults/Extensions.cs b/playground/orleans/OrleansServiceDefaults/Extensions.cs
index c058a2da99c..427c302f5cc 100644
--- a/playground/orleans/OrleansServiceDefaults/Extensions.cs
+++ b/playground/orleans/OrleansServiceDefaults/Extensions.cs
@@ -42,8 +42,10 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
builder.Services.AddOpenTelemetry()
.WithMetrics(metrics =>
{
- metrics.AddRuntimeInstrumentation()
- .AddBuiltInMeters();
+ metrics.AddAspNetCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddRuntimeInstrumentation()
+ .AddMeter("Microsoft.Orleans");
})
.WithTracing(tracing =>
{
@@ -113,11 +115,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
return app;
}
-
- private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
- meterProviderBuilder.AddMeter(
- "Microsoft.AspNetCore.Hosting",
- "Microsoft.AspNetCore.Server.Kestrel",
- "System.Net.Http",
- "Microsoft.Orleans");
}
diff --git a/src/Aspire.ProjectTemplates/templates/aspire-empty/AspireApplication.1.ServiceDefaults/Extensions.cs b/src/Aspire.ProjectTemplates/templates/aspire-empty/AspireApplication.1.ServiceDefaults/Extensions.cs
index 4921efee9ab..fac619ca2c7 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-empty/AspireApplication.1.ServiceDefaults/Extensions.cs
+++ b/src/Aspire.ProjectTemplates/templates/aspire-empty/AspireApplication.1.ServiceDefaults/Extensions.cs
@@ -42,8 +42,9 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
builder.Services.AddOpenTelemetry()
.WithMetrics(metrics =>
{
- metrics.AddRuntimeInstrumentation()
- .AddBuiltInMeters();
+ metrics.AddAspNetCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddRuntimeInstrumentation();
})
.WithTracing(tracing =>
{
@@ -110,10 +111,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
return app;
}
-
- private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
- meterProviderBuilder.AddMeter(
- "Microsoft.AspNetCore.Hosting",
- "Microsoft.AspNetCore.Server.Kestrel",
- "System.Net.Http");
}
diff --git a/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/Extensions.cs b/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/Extensions.cs
index 4921efee9ab..fac619ca2c7 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/Extensions.cs
+++ b/src/Aspire.ProjectTemplates/templates/aspire-servicedefaults/Extensions.cs
@@ -42,8 +42,9 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
builder.Services.AddOpenTelemetry()
.WithMetrics(metrics =>
{
- metrics.AddRuntimeInstrumentation()
- .AddBuiltInMeters();
+ metrics.AddAspNetCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddRuntimeInstrumentation();
})
.WithTracing(tracing =>
{
@@ -110,10 +111,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
return app;
}
-
- private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
- meterProviderBuilder.AddMeter(
- "Microsoft.AspNetCore.Hosting",
- "Microsoft.AspNetCore.Server.Kestrel",
- "System.Net.Http");
}
diff --git a/src/Aspire.ProjectTemplates/templates/aspire-starter/AspireStarterApplication.1.ServiceDefaults/Extensions.cs b/src/Aspire.ProjectTemplates/templates/aspire-starter/AspireStarterApplication.1.ServiceDefaults/Extensions.cs
index 4921efee9ab..fac619ca2c7 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-starter/AspireStarterApplication.1.ServiceDefaults/Extensions.cs
+++ b/src/Aspire.ProjectTemplates/templates/aspire-starter/AspireStarterApplication.1.ServiceDefaults/Extensions.cs
@@ -42,8 +42,9 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
builder.Services.AddOpenTelemetry()
.WithMetrics(metrics =>
{
- metrics.AddRuntimeInstrumentation()
- .AddBuiltInMeters();
+ metrics.AddAspNetCoreInstrumentation()
+ .AddHttpClientInstrumentation()
+ .AddRuntimeInstrumentation();
})
.WithTracing(tracing =>
{
@@ -110,10 +111,4 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
return app;
}
-
- private static MeterProviderBuilder AddBuiltInMeters(this MeterProviderBuilder meterProviderBuilder) =>
- meterProviderBuilder.AddMeter(
- "Microsoft.AspNetCore.Hosting",
- "Microsoft.AspNetCore.Server.Kestrel",
- "System.Net.Http");
}
diff --git a/src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj b/src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj
index 71980d1e08b..9d1b87fcfc8 100644
--- a/src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj
+++ b/src/Components/Aspire.Microsoft.Data.SqlClient/Aspire.Microsoft.Data.SqlClient.csproj
@@ -6,6 +6,7 @@
$(ComponentDatabasePackageTags) sqlserver sql
A Microsoft SQL Server client that integrates with Aspire, including health checks, metrics and telemetry.
$(SharedDir)SQL_256x.png
+ false
@@ -23,5 +24,5 @@
-
+