Skip to content

Commit adeff82

Browse files
test: Dotty instrumentation library updates for 2025-Nov-15 (#3312)
* test: Dotty instrumentation library updates for 2025-Nov-15 * Fix incompatibility between Azure.AI.OpenAI and OpenAI --------- Co-authored-by: Alex Hemsath <[email protected]>
1 parent b2bf4df commit adeff82

File tree

7 files changed

+44
-50
lines changed

7 files changed

+44
-50
lines changed

build/Dotty/packageInfo.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,11 @@
137137
"ignoreReason": "net481 doesn't support v9.x"
138138
},
139139
{
140-
"packageName": "openai"
140+
"packageName": "openai",
141+
"ignorePatch": true,
142+
"ignoreMinor": true,
143+
"ignoreMajor": true,
144+
"ignoreReason": "Breaks Azure.AI.OpenAI since 2.6.0. See https://github.com/Azure/azure-sdk-for-net/issues/53986"
141145
},
142146
{
143147
"packageName": "opensearch.client"

tests/Agent/IntegrationTests/Applications/AzureFunctionApplication/AzureFunctionApplication.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<ItemGroup>
2424
<FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)' == 'net10.0'" />
2525
<None Include="local.settings.json" />
26-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.1.0" />
26+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.51.0" />
2727
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
2828
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" Condition="'$(TargetFramework)' == 'net10.0'" />
2929
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.1" />
3030
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.5.3" />
31-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.5" />
31+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
3232
</ItemGroup>
3333
<ItemGroup>
3434
<ProjectReference Include="..\..\Shared\Shared.csproj" />

tests/Agent/IntegrationTests/Applications/LambdaSelfExecutingAssembly/LambdaSelfExecutingAssembly.csproj

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,35 @@
99
<!-- We use the different targets to test a range of library versions. Note that the minimum versions can't drift too far apart
1010
from each other due to a shared dependency on AWSSDK.Core -->
1111
<!-- 2.0.0 is from March 2020 -->
12-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
13-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" Condition="'$(TargetFramework)' == 'net10.0'" />
14-
12+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.2" Condition="'$(TargetFramework)' == 'net8.0'" />
13+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.2" Condition="'$(TargetFramework)' == 'net10.0'" />
1514
<!-- 2.0.0 is from April 2020 -->
1615
<PackageReference Include="Amazon.Lambda.ApplicationLoadBalancerEvents" Version="2.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
1716
<PackageReference Include="Amazon.Lambda.ApplicationLoadBalancerEvents" Version="2.2.0" Condition="'$(TargetFramework)' == 'net10.0'" />
18-
1917
<!-- 2.1.0 is from October 2020 -->
2018
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="2.1.0" Condition="'$(TargetFramework)' == 'net8.0'" />
2119
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.4.0" Condition="'$(TargetFramework)' == 'net10.0'" />
22-
2320
<!-- 2.3.0 is from September 2023. DynamoDBTimeWindowEvent not available until 2.3.0 -->
2421
<PackageReference Include="Amazon.Lambda.DynamoDBEvents" Version="2.3.0" Condition="'$(TargetFramework)' == 'net8.0'" />
2522
<PackageReference Include="Amazon.Lambda.DynamoDBEvents" Version="3.1.1" Condition="'$(TargetFramework)' == 'net10.0'" />
26-
2723
<!-- 2.1.0 is from August 2023. KinesisTimeWindowEvent not available until 2.1 -->
2824
<PackageReference Include="Amazon.Lambda.KinesisEvents" Version="2.1.0" Condition="'$(TargetFramework)' == 'net8.0'" />
2925
<PackageReference Include="Amazon.Lambda.KinesisEvents" Version="3.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
30-
3126
<!-- 2.0.0 is from March 2020 -->
3227
<PackageReference Include="Amazon.Lambda.KinesisFirehoseEvents" Version="2.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
3328
<PackageReference Include="Amazon.Lambda.KinesisFirehoseEvents" Version="2.3.0" Condition="'$(TargetFramework)' == 'net10.0'" />
34-
3529
<!-- 2.0.0 is from March 2021 -->
3630
<PackageReference Include="Amazon.Lambda.S3Events" Version="2.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
3731
<PackageReference Include="Amazon.Lambda.S3Events" Version="3.1.0" Condition="'$(TargetFramework)' == 'net10.0'" />
38-
3932
<!-- 2.1.0 is from October 2020 -->
4033
<PackageReference Include="Amazon.Lambda.SimpleEmailEvents" Version="2.1.0" Condition="'$(TargetFramework)' == 'net8.0'" />
4134
<PackageReference Include="Amazon.Lambda.SimpleEmailEvents" Version="3.1.0" Condition="'$(TargetFramework)' == 'net10.0'" />
42-
4335
<!-- 1.2.0 is from October 2020 -->
4436
<PackageReference Include="Amazon.Lambda.SNSEvents" Version="1.2.0" Condition="'$(TargetFramework)' == 'net8.0'" />
4537
<PackageReference Include="Amazon.Lambda.SNSEvents" Version="2.1.0" Condition="'$(TargetFramework)' == 'net10.0'" />
46-
4738
<!-- 1.2.0 is from October 2020 -->
4839
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="1.2.0" Condition="'$(TargetFramework)' == 'net8.0'" />
4940
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" Condition="'$(TargetFramework)' == 'net10.0'" />
50-
5141
<!-- Non-event libraries -->
5242
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.11.0" />
5343
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />

tests/Agent/IntegrationTests/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<DockerfileContext>.</DockerfileContext>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="AWSSDK.Kinesis" Version="4.0.4.5" />
9-
<PackageReference Include="AWSSDK.KinesisFirehose" Version="4.0.2.5" />
10-
<PackageReference Include="AWSSDK.S3" Version="4.0.7.6" />
8+
<PackageReference Include="AWSSDK.Kinesis" Version="4.0.7.3" />
9+
<PackageReference Include="AWSSDK.KinesisFirehose" Version="4.0.3.3" />
10+
<PackageReference Include="AWSSDK.S3" Version="4.0.11.3" />
1111
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
1212
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="AWSSDK.SQS" Version="4.0.1.7" />
17-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.5" />
18-
<PackageReference Include="NewRelic.Agent.Api" Version="10.44.1" />
16+
<PackageReference Include="AWSSDK.SQS" Version="4.0.2.3" />
17+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.9.6" />
18+
<PackageReference Include="NewRelic.Agent.Api" Version="10.46.1" />
1919
</ItemGroup>
2020
</Project>

tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="NewRelic.Agent.Api" Version="10.44.1" />
15+
<PackageReference Include="NewRelic.Agent.Api" Version="10.46.1" />
1616
</ItemGroup>
1717
</Project>

tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/SmokeTestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="NewRelic.Agent.Api" Version="10.44.1" />
13+
<PackageReference Include="NewRelic.Agent.Api" Version="10.46.1" />
1414
</ItemGroup>
1515
</Project>

tests/Agent/IntegrationTests/SharedApplications/Common/MFALatestPackages/MFALatestPackages.csproj

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net481;net10.0</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<!-- retain alphabetical order please! -->
7-
<PackageReference Include="AWSSDK.BedrockRuntime" Version="4.0.7.1" Condition="'$(TargetFramework)' == 'net481'" />
8-
<PackageReference Include="AWSSDK.BedrockRuntime" Version="4.0.7.1" Condition="'$(TargetFramework)' == 'net10.0'" />
7+
<PackageReference Include="AWSSDK.BedrockRuntime" Version="4.0.9.3" Condition="'$(TargetFramework)' == 'net481'" />
8+
<PackageReference Include="AWSSDK.BedrockRuntime" Version="4.0.9.3" Condition="'$(TargetFramework)' == 'net10.0'" />
99
<PackageReference Include="AWSSDK.Lambda" Version="4.0.0.1" Condition="'$(TargetFramework)' == 'net481'" />
1010
<PackageReference Include="AWSSDK.Lambda" Version="4.0.0.1" Condition="'$(TargetFramework)' == 'net10.0'" />
11-
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.2.5" Condition="'$(TargetFramework)' == 'net481'" />
12-
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.2.5" Condition="'$(TargetFramework)' == 'net10.0'" />
13-
<PackageReference Include="Azure.AI.OpenAI" Version="2.3.0-beta.1" Condition="'$(TargetFramework)' == 'net481'" />
14-
<PackageReference Include="Azure.AI.OpenAI" Version="2.3.0-beta.1" Condition="'$(TargetFramework)' == 'net10.0'" />
11+
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.4.1" Condition="'$(TargetFramework)' == 'net481'" />
12+
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.4.1" Condition="'$(TargetFramework)' == 'net10.0'" />
13+
<PackageReference Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" Condition="'$(TargetFramework)' == 'net481'" />
14+
<PackageReference Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" Condition="'$(TargetFramework)' == 'net10.0'" />
1515
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" Condition="'$(TargetFramework)' == 'net481'" />
1616
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" Condition="'$(TargetFramework)' == 'net10.0'" />
1717
<PackageReference Include="CouchbaseNetClient" Version="3.6.6" Condition="'$(TargetFramework)' == 'net481'" />
@@ -30,31 +30,31 @@
3030
<PackageReference Include="log4net.Ext.Json" Version="3.0.3" Condition="'$(TargetFramework)' == 'net10.0'" />
3131
<PackageReference Include="MassTransit" Version="8.5.3" Condition="'$(TargetFramework)' == 'net481'" />
3232
<PackageReference Include="MassTransit" Version="8.5.3" Condition="'$(TargetFramework)' == 'net10.0'" />
33-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.53.1" Condition="'$(TargetFramework)' == 'net481'" />
34-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.53.1" Condition="'$(TargetFramework)' == 'net10.0'" />
35-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" Condition="'$(TargetFramework)' == 'net481'" />
36-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" Condition="'$(TargetFramework)' == 'net10.0'" />
37-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" Condition="'$(TargetFramework)' == 'net481'" />
38-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" Condition="'$(TargetFramework)' == 'net10.0'" />
39-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.9" Condition="'$(TargetFramework)' == 'net481'" />
40-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.9" Condition="'$(TargetFramework)' == 'net10.0'" />
41-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" Condition="'$(TargetFramework)' == 'net481'" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" Condition="'$(TargetFramework)' == 'net10.0'" />
33+
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.54.1" Condition="'$(TargetFramework)' == 'net481'" />
34+
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.54.1" Condition="'$(TargetFramework)' == 'net10.0'" />
35+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" Condition="'$(TargetFramework)' == 'net481'" />
36+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" Condition="'$(TargetFramework)' == 'net10.0'" />
37+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
38+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
40+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
41+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
4343
<PackageReference Include="MongoDB.Driver" Version="3.5.0" Condition="'$(TargetFramework)' == 'net481'" />
4444
<PackageReference Include="MongoDB.Driver" Version="3.5.0" Condition="'$(TargetFramework)' == 'net10.0'" />
4545
<PackageReference Include="MySql.Data" Version="9.4.0" Condition="'$(TargetFramework)' == 'net481'" />
4646
<PackageReference Include="MySql.Data" Version="9.4.0" Condition="'$(TargetFramework)' == 'net10.0'" />
47-
<PackageReference Include="MySqlConnector" Version="2.4.0" Condition="'$(TargetFramework)' == 'net481'" />
48-
<PackageReference Include="MySqlConnector" Version="2.4.0" Condition="'$(TargetFramework)' == 'net10.0'" />
47+
<PackageReference Include="MySqlConnector" Version="2.5.0" Condition="'$(TargetFramework)' == 'net481'" />
48+
<PackageReference Include="MySqlConnector" Version="2.5.0" Condition="'$(TargetFramework)' == 'net10.0'" />
4949
<PackageReference Include="NEST" Version="7.17.5" Condition="'$(TargetFramework)' == 'net481'" />
5050
<PackageReference Include="NEST" Version="7.17.5" Condition="'$(TargetFramework)' == 'net10.0'" />
5151
<!-- required by Microsoft.Azure.Cosmos -->
5252
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" Condition="'$(TargetFramework)' == 'net481'" />
5353
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" Condition="'$(TargetFramework)' == 'net10.0'" />
54-
<PackageReference Include="NLog" Version="6.0.4" Condition="'$(TargetFramework)' == 'net481'" />
55-
<PackageReference Include="NLog" Version="6.0.4" Condition="'$(TargetFramework)' == 'net10.0'" />
56-
<PackageReference Include="NLog.Extensions.Logging" Version="6.0.4" Condition="'$(TargetFramework)' == 'net481'" />
57-
<PackageReference Include="NLog.Extensions.Logging" Version="6.0.4" Condition="'$(TargetFramework)' == 'net10.0'" />
54+
<PackageReference Include="NLog" Version="6.0.6" Condition="'$(TargetFramework)' == 'net481'" />
55+
<PackageReference Include="NLog" Version="6.0.6" Condition="'$(TargetFramework)' == 'net10.0'" />
56+
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" Condition="'$(TargetFramework)' == 'net481'" />
57+
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" Condition="'$(TargetFramework)' == 'net10.0'" />
5858
<!-- npgsql is on version 8, but we don't (currently) support it -->
5959
<PackageReference Include="npgsql" Version="7.0.7" Condition="'$(TargetFramework)' == 'net481'" />
6060
<PackageReference Include="npgsql" Version="7.0.7" Condition="'$(TargetFramework)' == 'net10.0'" />
@@ -80,13 +80,13 @@
8080
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
8181
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" Condition="'$(TargetFramework)' == 'net481'" />
8282
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" Condition="'$(TargetFramework)' == 'net10.0'" />
83-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" Condition="'$(TargetFramework)' == 'net481'" />
84-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
83+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" Condition="'$(TargetFramework)' == 'net481'" />
84+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" Condition="'$(TargetFramework)' == 'net10.0'" />
8585
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" Condition="'$(TargetFramework)' == 'net481'" />
8686
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
8787
<PackageReference Include="StackExchange.Redis" Version="2.9.25" Condition="'$(TargetFramework)' == 'net481'" />
8888
<PackageReference Include="StackExchange.Redis" Version="2.9.25" Condition="'$(TargetFramework)' == 'net10.0'" />
89-
<PackageReference Include="System.Data.Odbc" Version="9.0.9" Condition="'$(TargetFramework)' == 'net481'" />
90-
<PackageReference Include="System.Data.Odbc" Version="9.0.9" Condition="'$(TargetFramework)' == 'net10.0'" />
89+
<PackageReference Include="System.Data.Odbc" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
90+
<PackageReference Include="System.Data.Odbc" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
9191
</ItemGroup>
9292
</Project>

0 commit comments

Comments
 (0)