Skip to content

Commit 9bf6116

Browse files
pablomartinezbernardopablomartinezbernardo
committed
Factory-compatible versions only
1 parent 6a03306 commit 9bf6116

File tree

8 files changed

+32
-415
lines changed

8 files changed

+32
-415
lines changed

‎tracer/build/PackageVersionsGeneratorDefinitions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,10 @@
675675
"IntegrationName": "CosmosDb",
676676
"SampleProjectName": "Samples.CosmosDb",
677677
"NugetPackageSearchName": "Microsoft.Azure.Cosmos",
678-
"MinVersion": "3.6.0",
678+
"MinVersion": "3.12.0",
679679
"MaxVersionExclusive": "4.0.0",
680680
"SpecificVersions": [
681-
"3.6.*",
681+
"3.12.*",
682682
"3.*.*"
683683
],
684684
"VersionConditions": [{

‎tracer/build/PackageVersionsLatestMinors.g.props‎

Lines changed: 0 additions & 324 deletions
Large diffs are not rendered by default.

‎tracer/build/PackageVersionsLatestSpecific.g.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6865,7 +6865,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
68656865
<SampleName>Samples.Kafka</SampleName>
68666866
</PackageVersionSample>
68676867
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6868-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6868+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
68696869
<TargetFramework>netcoreapp2.1</TargetFramework>
68706870
<RequiresDockerDependency>All</RequiresDockerDependency>
68716871
<SampleName>Samples.CosmosDb</SampleName>
@@ -6877,7 +6877,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
68776877
<SampleName>Samples.CosmosDb</SampleName>
68786878
</PackageVersionSample>
68796879
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6880-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6880+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
68816881
<TargetFramework>netcoreapp3.0</TargetFramework>
68826882
<RequiresDockerDependency>All</RequiresDockerDependency>
68836883
<SampleName>Samples.CosmosDb</SampleName>
@@ -6889,7 +6889,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
68896889
<SampleName>Samples.CosmosDb</SampleName>
68906890
</PackageVersionSample>
68916891
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6892-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6892+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
68936893
<TargetFramework>netcoreapp3.1</TargetFramework>
68946894
<RequiresDockerDependency>All</RequiresDockerDependency>
68956895
<SampleName>Samples.CosmosDb</SampleName>
@@ -6901,7 +6901,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
69016901
<SampleName>Samples.CosmosDb</SampleName>
69026902
</PackageVersionSample>
69036903
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6904-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6904+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
69056905
<TargetFramework>net5.0</TargetFramework>
69066906
<RequiresDockerDependency>All</RequiresDockerDependency>
69076907
<SampleName>Samples.CosmosDb</SampleName>
@@ -6913,7 +6913,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
69136913
<SampleName>Samples.CosmosDb</SampleName>
69146914
</PackageVersionSample>
69156915
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6916-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6916+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
69176917
<TargetFramework>net6.0</TargetFramework>
69186918
<RequiresDockerDependency>All</RequiresDockerDependency>
69196919
<SampleName>Samples.CosmosDb</SampleName>
@@ -6925,7 +6925,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
69256925
<SampleName>Samples.CosmosDb</SampleName>
69266926
</PackageVersionSample>
69276927
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6928-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6928+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
69296929
<TargetFramework>net7.0</TargetFramework>
69306930
<RequiresDockerDependency>All</RequiresDockerDependency>
69316931
<SampleName>Samples.CosmosDb</SampleName>
@@ -6937,7 +6937,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
69376937
<SampleName>Samples.CosmosDb</SampleName>
69386938
</PackageVersionSample>
69396939
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6940-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6940+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
69416941
<TargetFramework>net8.0</TargetFramework>
69426942
<RequiresDockerDependency>All</RequiresDockerDependency>
69436943
<SampleName>Samples.CosmosDb</SampleName>
@@ -6949,7 +6949,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
69496949
<SampleName>Samples.CosmosDb</SampleName>
69506950
</PackageVersionSample>
69516951
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6952-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6952+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
69536953
<TargetFramework>net9.0</TargetFramework>
69546954
<RequiresDockerDependency>All</RequiresDockerDependency>
69556955
<SampleName>Samples.CosmosDb</SampleName>
@@ -6961,7 +6961,7 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
69616961
<SampleName>Samples.CosmosDb</SampleName>
69626962
</PackageVersionSample>
69636963
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
6964-
<Properties>ApiVersion=3.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
6964+
<Properties>ApiVersion=3.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
69656965
<TargetFramework>net10.0</TargetFramework>
69666966
<RequiresDockerDependency>All</RequiresDockerDependency>
69676967
<SampleName>Samples.CosmosDb</SampleName>

‎tracer/build/supported_versions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
"name": "Microsoft.Azure.Cosmos",
494494
"minVersionAvailableInclusive": "3.0.0",
495495
"minVersionSupportedInclusive": "3.6.0",
496-
"minVersionTestedInclusive": "3.6.0",
496+
"minVersionTestedInclusive": "3.12.0",
497497
"maxVersionSupportedInclusive": "3.54.1",
498498
"maxVersionAvailableInclusive": "3.54.1",
499499
"maxVersionTestedInclusive": "3.54.1"

‎tracer/dependabot/integrations/Datadog.Dependabot.Microsoft.Azure.Cosmos.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<ItemGroup>
99
<!-- Integration: Microsoft.Azure.Cosmos.Client -->
1010
<!-- Assembly: Microsoft.Azure.Cosmos.Client -->
11-
<!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.54.0 -->
12-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.54.0" />
11+
<!-- Latest package https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.54.1 -->
12+
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.54.1" />
1313
</ItemGroup>
1414

1515
</Project>

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestMinors.g.cs‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5486,12 +5486,6 @@ public class PackageVersionsLatestMinors
54865486
new object[] { string.Empty },
54875487
#else
54885488
#if NETCOREAPP2_1
5489-
new object[] { "3.6.0" },
5490-
new object[] { "3.7.1" },
5491-
new object[] { "3.8.0" },
5492-
new object[] { "3.9.1" },
5493-
new object[] { "3.10.1" },
5494-
new object[] { "3.11.0" },
54955489
new object[] { "3.12.0" },
54965490
new object[] { "3.13.0" },
54975491
new object[] { "3.14.0" },
@@ -5511,12 +5505,6 @@ public class PackageVersionsLatestMinors
55115505
new object[] { "3.28.0" },
55125506
#endif
55135507
#if NETCOREAPP3_0
5514-
new object[] { "3.6.0" },
5515-
new object[] { "3.7.1" },
5516-
new object[] { "3.8.0" },
5517-
new object[] { "3.9.1" },
5518-
new object[] { "3.10.1" },
5519-
new object[] { "3.11.0" },
55205508
new object[] { "3.12.0" },
55215509
new object[] { "3.13.0" },
55225510
new object[] { "3.14.0" },
@@ -5536,12 +5524,6 @@ public class PackageVersionsLatestMinors
55365524
new object[] { "3.28.0" },
55375525
#endif
55385526
#if NETCOREAPP3_1
5539-
new object[] { "3.6.0" },
5540-
new object[] { "3.7.1" },
5541-
new object[] { "3.8.0" },
5542-
new object[] { "3.9.1" },
5543-
new object[] { "3.10.1" },
5544-
new object[] { "3.11.0" },
55455527
new object[] { "3.12.0" },
55465528
new object[] { "3.13.0" },
55475529
new object[] { "3.14.0" },
@@ -5587,12 +5569,6 @@ public class PackageVersionsLatestMinors
55875569
new object[] { "3.54.1" },
55885570
#endif
55895571
#if NET5_0
5590-
new object[] { "3.6.0" },
5591-
new object[] { "3.7.1" },
5592-
new object[] { "3.8.0" },
5593-
new object[] { "3.9.1" },
5594-
new object[] { "3.10.1" },
5595-
new object[] { "3.11.0" },
55965572
new object[] { "3.12.0" },
55975573
new object[] { "3.13.0" },
55985574
new object[] { "3.14.0" },
@@ -5638,12 +5614,6 @@ public class PackageVersionsLatestMinors
56385614
new object[] { "3.54.1" },
56395615
#endif
56405616
#if NET6_0
5641-
new object[] { "3.6.0" },
5642-
new object[] { "3.7.1" },
5643-
new object[] { "3.8.0" },
5644-
new object[] { "3.9.1" },
5645-
new object[] { "3.10.1" },
5646-
new object[] { "3.11.0" },
56475617
new object[] { "3.12.0" },
56485618
new object[] { "3.13.0" },
56495619
new object[] { "3.14.0" },
@@ -5689,12 +5659,6 @@ public class PackageVersionsLatestMinors
56895659
new object[] { "3.54.1" },
56905660
#endif
56915661
#if NET7_0
5692-
new object[] { "3.6.0" },
5693-
new object[] { "3.7.1" },
5694-
new object[] { "3.8.0" },
5695-
new object[] { "3.9.1" },
5696-
new object[] { "3.10.1" },
5697-
new object[] { "3.11.0" },
56985662
new object[] { "3.12.0" },
56995663
new object[] { "3.13.0" },
57005664
new object[] { "3.14.0" },
@@ -5740,12 +5704,6 @@ public class PackageVersionsLatestMinors
57405704
new object[] { "3.54.1" },
57415705
#endif
57425706
#if NET8_0
5743-
new object[] { "3.6.0" },
5744-
new object[] { "3.7.1" },
5745-
new object[] { "3.8.0" },
5746-
new object[] { "3.9.1" },
5747-
new object[] { "3.10.1" },
5748-
new object[] { "3.11.0" },
57495707
new object[] { "3.12.0" },
57505708
new object[] { "3.13.0" },
57515709
new object[] { "3.14.0" },
@@ -5791,12 +5749,6 @@ public class PackageVersionsLatestMinors
57915749
new object[] { "3.54.1" },
57925750
#endif
57935751
#if NET9_0
5794-
new object[] { "3.6.0" },
5795-
new object[] { "3.7.1" },
5796-
new object[] { "3.8.0" },
5797-
new object[] { "3.9.1" },
5798-
new object[] { "3.10.1" },
5799-
new object[] { "3.11.0" },
58005752
new object[] { "3.12.0" },
58015753
new object[] { "3.13.0" },
58025754
new object[] { "3.14.0" },
@@ -5842,12 +5794,6 @@ public class PackageVersionsLatestMinors
58425794
new object[] { "3.54.1" },
58435795
#endif
58445796
#if NET10_0
5845-
new object[] { "3.6.0" },
5846-
new object[] { "3.7.1" },
5847-
new object[] { "3.8.0" },
5848-
new object[] { "3.9.1" },
5849-
new object[] { "3.10.1" },
5850-
new object[] { "3.11.0" },
58515797
new object[] { "3.12.0" },
58525798
new object[] { "3.13.0" },
58535799
new object[] { "3.14.0" },

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/PackageVersionsLatestSpecific.g.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,39 +2247,39 @@ public class PackageVersionsLatestSpecific
22472247
new object[] { string.Empty },
22482248
#else
22492249
#if NETCOREAPP2_1
2250-
new object[] { "3.6.0" },
2250+
new object[] { "3.12.0" },
22512251
new object[] { "3.28.0" },
22522252
#endif
22532253
#if NETCOREAPP3_0
2254-
new object[] { "3.6.0" },
2254+
new object[] { "3.12.0" },
22552255
new object[] { "3.28.0" },
22562256
#endif
22572257
#if NETCOREAPP3_1
2258-
new object[] { "3.6.0" },
2258+
new object[] { "3.12.0" },
22592259
new object[] { "3.54.1" },
22602260
#endif
22612261
#if NET5_0
2262-
new object[] { "3.6.0" },
2262+
new object[] { "3.12.0" },
22632263
new object[] { "3.54.1" },
22642264
#endif
22652265
#if NET6_0
2266-
new object[] { "3.6.0" },
2266+
new object[] { "3.12.0" },
22672267
new object[] { "3.54.1" },
22682268
#endif
22692269
#if NET7_0
2270-
new object[] { "3.6.0" },
2270+
new object[] { "3.12.0" },
22712271
new object[] { "3.54.1" },
22722272
#endif
22732273
#if NET8_0
2274-
new object[] { "3.6.0" },
2274+
new object[] { "3.12.0" },
22752275
new object[] { "3.54.1" },
22762276
#endif
22772277
#if NET9_0
2278-
new object[] { "3.6.0" },
2278+
new object[] { "3.12.0" },
22792279
new object[] { "3.54.1" },
22802280
#endif
22812281
#if NET10_0
2282-
new object[] { "3.6.0" },
2282+
new object[] { "3.12.0" },
22832283
new object[] { "3.54.1" },
22842284
#endif
22852285
#endif

‎tracer/test/test-applications/integrations/Samples.CosmosDb/Program.cs‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,6 @@ public static async Task Main(string[] args)
6767
}
6868
// </Main>
6969

70-
static async Task TrustCosmosEmulatorCertAsync()
71-
{
72-
using var http = new HttpClient(new HttpClientHandler {
73-
ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
74-
});
75-
var pem = await http.GetByteArrayAsync(EndpointUri + "/_explorer/emulator.pem");
76-
var cert = X509Certificate2.CreateFromPem(System.Text.Encoding.ASCII.GetString(pem));
77-
using var store = new X509Store(StoreName.Root, StoreLocation.CurrentUser);
78-
store.Open(OpenFlags.ReadWrite);
79-
store.Add(cert);
80-
store.Close();
81-
}
82-
8370
// <GetStartedDemoAsync>
8471
/// <summary>
8572
/// Entry point to call methods that operate on Azure Cosmos DB resources in this sample
@@ -93,7 +80,15 @@ public async Task GetStartedDemoAsync()
9380
ApplicationName = "CosmosDBDotnetQuickstart",
9481
RequestTimeout = TimeSpan.FromMinutes(10),
9582
LimitToEndpoint = true,
96-
OpenTcpConnectionTimeout = TimeSpan.FromMinutes(1)
83+
OpenTcpConnectionTimeout = TimeSpan.FromMinutes(1),
84+
HttpClientFactory = () =>
85+
{
86+
var handler = new HttpClientHandler
87+
{
88+
ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
89+
};
90+
return new HttpClient(handler);
91+
}
9792
};
9893

9994
cosmosClient = new CosmosClient(EndpointUri, PrimaryKey, clientOptions);

0 commit comments

Comments
 (0)