From 45b320c95abe6db33881efcccf39120a75d36b87 Mon Sep 17 00:00:00 2001
From: qinyouzeng <qinyouzeng@masastack.com>
Date: Tue, 18 Aug 2026 14:24:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4dotnet6/7=E4=B8=8B=201?=
 =?UTF-8?q?.15.3=E5=8C=85=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/ServiceExtensions.cs           |  6 ++++--
 ...Contrib.StackSdks.Tsc.OpenTelemetry.csproj | 21 +++++++++++++++++--
 .../OpenTelemetryInstrumentationOptions.cs    |  4 +++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Extensions/ServiceExtensions.cs b/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Extensions/ServiceExtensions.cs
index bf2eafd..028faa6 100644
--- a/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Extensions/ServiceExtensions.cs
+++ b/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Extensions/ServiceExtensions.cs
@@ -45,8 +45,10 @@ public static IServiceCollection AddObservable(this IServiceCollection services,
         IEnumerable<string>? activitySources = default,
         IEnumerable<Assembly>? blazorRouteAssemblies = default,
         Action<TracerProviderBuilder>? traceInstrumentConfig = default,
-        Action<MeterProviderBuilder>? metricInstrumentConfig = default,
-        Action<LoggerProviderBuilder>? logInstrumentConfig = default
+        Action<MeterProviderBuilder>? metricInstrumentConfig = default
+#if !OTEL_LEGACY
+        , Action<LoggerProviderBuilder>? logInstrumentConfig = default
+#endif
         )
     {
         ArgumentNullException.ThrowIfNull(option);
diff --git a/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Masa.Contrib.StackSdks.Tsc.OpenTelemetry.csproj b/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Masa.Contrib.StackSdks.Tsc.OpenTelemetry.csproj
index b6d3005..78e41ac 100644
--- a/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Masa.Contrib.StackSdks.Tsc.OpenTelemetry.csproj
+++ b/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Masa.Contrib.StackSdks.Tsc.OpenTelemetry.csproj
@@ -6,7 +6,25 @@
 		<RunApiCompat>false</RunApiCompat>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<!-- net6/net7: OpenTelemetry 1.9.x still ships a real net6 TFM + Grpc.Net.Client.
+	     net8+: use 1.15.3 (1.10+ dropped net6 and breaks cleartext OTLP/gRPC on older runtimes). -->
+	<PropertyGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+		<DefineConstants>$(DefineConstants);OTEL_LEGACY</DefineConstants>
+	</PropertyGroup>
+
+	<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+		<PackageReference Include="OpenTelemetry" Version="1.9.0" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.9.0-beta.1" />
+	</ItemGroup>
+
+	<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
 		<PackageReference Include="OpenTelemetry" Version="1.15.3" />
 		<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.15.1-beta.1" />
 		<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.15.1-beta.1" />
@@ -26,4 +44,3 @@
 		<ProjectReference Include="..\..\BuildingBlocks\Masa.BuildingBlocks.StackSdks.Config\Masa.BuildingBlocks.StackSdks.Config.csproj" />
 	</ItemGroup>
 </Project>
-
diff --git a/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Traceing/OpenTelemetryInstrumentationOptions.cs b/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Traceing/OpenTelemetryInstrumentationOptions.cs
index 30fdbef..8e692cc 100644
--- a/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Traceing/OpenTelemetryInstrumentationOptions.cs
+++ b/src/Contrib/Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Traceing/OpenTelemetryInstrumentationOptions.cs
@@ -61,7 +61,9 @@ private static void InitializeHeaders(IConfiguration? configuration)
     /// </summary>
     public Action<EntityFrameworkInstrumentationOptions> EntityFrameworkInstrumentationOptions { get; set; } = options =>
     {
-
+#if OTEL_LEGACY
+        options.SetDbStatementForText = true;
+#endif
     };
 
     public Action<ElasticsearchClientInstrumentationOptions> ElasticsearchClientInstrumentationOptions { get; set; } = options =>