Skip to content

Commit 3d2cd05

Browse files
geffzhanggeffzhang
committed
feat: activity set error
1 parent d9ee186 commit 3d2cd05

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

‎Directory.Packages.props‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<PackageVersion Include="System.Memory.Data" Version="8.0.0" />
3535
<PackageVersion Include="System.Text.Json" Version="9.0.11" />
3636
<PackageVersion Include="System.Reactive" Version="6.0.1" />
37-
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
38-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
39-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
37+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
38+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
39+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
4040
<PackageVersion Include="Rougamo.Fody" Version="5.0.0" />
4141
<PackageVersion Include="Aspects.Cache" Version="2.0.4" />
4242
<PackageVersion Include="DistributedLock.Redis" Version="1.1.0" />
@@ -99,30 +99,29 @@
9999
<PackageVersion Include="Senparc.Weixin.MP.Middleware" Version="1.5.0" />
100100
<PackageVersion Include="System.Threading.Channels" Version="10.0.0" />
101101
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
102-
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
103-
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
104-
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0" />
105-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
106-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
107-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
108-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
109-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
110-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
111-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
112-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
113-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="8.2.0" />
114-
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="8.0.1" />
115-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
116-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.16.0" />
117-
<PackageVersion Include="Moq" Version="4.20.70" />
118-
<PackageVersion Include="xunit" Version="2.9.0" />
119-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
120-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
121-
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
122-
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
123-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
124-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
125-
<PackageVersion Include="Shouldly" Version="4.3.0" />
102+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
103+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
104+
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
105+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
106+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
107+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
108+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
109+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
110+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
111+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
112+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.2" />
113+
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.5.2" />
114+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
115+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.67.1" />
116+
<PackageVersion Include="Moq" Version="4.20.72" />
117+
<PackageVersion Include="xunit" Version="2.9.3" />
118+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
119+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
120+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
121+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
122+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
123+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
124+
<PackageVersion Include="Shouldly" Version="4.3.0" />
126125
<PackageVersion Include="ModelContextProtocol.Core" Version="0.4.0-preview.3" />
127126
<PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
128127
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.4.0-preview.3" />

‎src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using BotSharp.Core.MessageHub;
99
using OpenAI.Chat;
1010
using System.ClientModel;
11+
using BotSharp.Abstraction.Diagnostics;
1112
using static BotSharp.Abstraction.Diagnostics.Telemetry.TelemetryConstants;
1213

1314
namespace BotSharp.Plugin.AzureOpenAI.Providers.Chat;
@@ -112,6 +113,7 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
112113
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
113114
RenderedInstruction = string.Join("\r\n", renderedInstructions)
114115
};
116+
activity?.SetError(ex);
115117
}
116118
catch (Exception ex)
117119
{
@@ -122,6 +124,7 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
122124
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
123125
RenderedInstruction = string.Join("\r\n", renderedInstructions)
124126
};
127+
activity?.SetError(ex);
125128
}
126129

127130
var tokenUsage = response?.Value?.Usage;

0 commit comments

Comments
 (0)