Skip to content

Cosmos DB partial integration testing #7752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 14, 2025
+3,662 −817
Merged

Cosmos DB partial integration testing #7752

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ac946b
Run cosmos tests on emulator
pablomartinezbernardo Nov 3, 2025
fa2633d
.net fx compat
pablomartinezbernardo Nov 3, 2025
430984c
Use the correct image, protocol https, specific container for arm, an…
pablomartinezbernardo Nov 3, 2025
6cab3f2
Hostname scrubbers
pablomartinezbernardo Nov 3, 2025
a1420e1
3.12.0 should also be tested
pablomartinezbernardo Nov 3, 2025
d0c60f4
Avoid unnecessary diff changes
pablomartinezbernardo Nov 3, 2025
695e33f
LimitToEndpoint = true && SkipInCI
pablomartinezbernardo Nov 4, 2025
508ee5e
Separate sample app for vnext CI tests
pablomartinezbernardo Nov 7, 2025
e2ef73d
Grab versions from actual integration
pablomartinezbernardo Nov 7, 2025
b18c93e
Re-generate files after merge
pablomartinezbernardo Nov 13, 2025
fbe044c
Apply suggestion from @lucaspimentel
pablomartinezbernardo Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Datadog.Trace.OSX.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"tracer\\test\\test-applications\\integrations\\Samples.CIVisibilityIpc\\Samples.CIVisibilityIpc.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.Console\\Samples.Console.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.CosmosDb\\Samples.CosmosDb.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.CosmosDb.Vnext\\Samples.CosmosDb.Vnext.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.Couchbase3\\Samples.Couchbase3.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.Couchbase\\Samples.Couchbase.csproj",
"tracer\\test\\test-applications\\integrations\\Samples.Dapper\\Samples.Dapper.csproj",
Expand Down
3 changes: 3 additions & 0 deletions Datadog.Trace.Samples.g.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Kafka", "tracer\tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CosmosDb", "tracer\test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj", "{95613224-C1D7-4D4A-8926-F70DA26371CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CosmosDb.Vnext", "tracer\test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj", "{A1234567-C1D7-4D4A-8926-F70DA26371CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Owin.WebApi2", "tracer\test\test-applications\integrations\Samples.Owin.WebApi2\Samples.Owin.WebApi2.csproj", "{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogsInjection.Log4Net", "tracer\test\test-applications\integrations\LogsInjection.Log4Net\LogsInjection.Log4Net.csproj", "{B93AD901-B761-486D-80AE-443742DB65E0}"
Expand Down Expand Up @@ -1140,6 +1142,7 @@ Global
{662B587F-97B5-4CEF-ABF9-6C76A6DBD29E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{94B50277-FB50-4B42-BA79-770ADB24CB80} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{95613224-C1D7-4D4A-8926-F70DA26371CA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{A1234567-C1D7-4D4A-8926-F70DA26371CA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{BF1E5BA6-C0E5-4472-9D5D-2622231DD275} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{B93AD901-B761-486D-80AE-443742DB65E0} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{7203DD2B-739F-4223-AE50-D26A7FEEE1A4} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
Expand Down
3 changes: 3 additions & 0 deletions Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AspNet472.LoaderOpt
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CosmosDb", "tracer\test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj", "{95613224-C1D7-4D4A-8926-F70DA26371CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.CosmosDb.Vnext", "tracer\test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj", "{A1234567-C1D7-4D4A-8926-F70DA26371CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "tracer\build\_build\_build.csproj", "{78004AA7-26DD-44DB-A2C7-C287A5BBE5D6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Owin.WebApi2", "tracer\test\test-applications\integrations\Samples.Owin.WebApi2\Samples.Owin.WebApi2.csproj", "{BF1E5BA6-C0E5-4472-9D5D-2622231DD275}"
Expand Down Expand Up @@ -1590,6 +1592,7 @@ Global
{94B50277-FB50-4B42-BA79-770ADB24CB80} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{BBB60B0F-BF01-4499-936A-4A299A9ACFD4} = {AFA0AB23-64F0-4AC1-9050-6CE8FE06F580}
{95613224-C1D7-4D4A-8926-F70DA26371CA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{A1234567-C1D7-4D4A-8926-F70DA26371CA} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{78004AA7-26DD-44DB-A2C7-C287A5BBE5D6} = {A0C5FBBB-CFB2-4FB9-B8F0-55676E9DCF06}
{BF1E5BA6-C0E5-4472-9D5D-2622231DD275} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{5450EA0B-56D3-4E29-932E-094AD037B345} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
Expand Down
18 changes: 16 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ services:
- ACCEPT_EULA=Y
- SA_PASSWORD=Strong!Passw0rd

cosmosdb-emulator_arm64:
image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview
command: ["--protocol", "https"]

Comment on lines +68 to +71
Copy link
Collaborator

@bouwkast bouwkast Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will require a VM update after merging to not slow down CI for too long - I'd think that we could probably do so around .NET 10 GA release

Copy link
Collaborator

@bouwkast bouwkast Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😢
We will have to update the VMs for this, we can merge it and not update the VMs but there will be some additional pipeline time hit.

I guess fine, I'll make another task to update them again after this gets merged.

stackexchangeredis_arm64:
image: redis:4-alpine
hostname: stackexchangeredis_arm64
Expand Down Expand Up @@ -267,6 +271,11 @@ services:
volumes:
- ./docker/eventhubs-emulator-config.json:/Eventhubs_Emulator/ConfigFiles/Config.json:ro

cosmosdb-emulator:
image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview
profiles: ["group2"]
command: ["--protocol", "https"]

# this docker image doesn't work on arm64. It can still be tested on Mac using colima, see https://github.com/abiosoft/colima
oracle:
image: container-registry.oracle.com/database/free:latest
Expand Down Expand Up @@ -490,6 +499,7 @@ services:
- COUCHBASE_PORT=8091
- ASB_CONNECTION_STRING=Endpoint=sb://azureservicebus-emulator:5672;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
- EVENTHUBS_CONNECTION_STRING=Endpoint=sb://azure-eventhubs-emulator:5672;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
- COSMOSDB_ENDPOINT=https://cosmosdb-emulator:8081
- TEST_AGENT_HOST=test-agent
- CONTAINER_HOSTNAME=http://integrationtests
- DD_LOGGER_DD_API_KEY
Expand Down Expand Up @@ -713,10 +723,11 @@ services:
- azureservicebus-emulator
- azurite
- azure-eventhubs-emulator
- cosmosdb-emulator
- test-agent
environment:
- TIMEOUT_LENGTH=120
command: elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 mongo:27017 localstack:4566 sqledge:1433 azureservicebus-emulator:5672 azure-eventhubs-emulator:5672 test-agent:8126
command: elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 mongo:27017 localstack:4566 sqledge:1433 azureservicebus-emulator:5672 azure-eventhubs-emulator:5672 cosmosdb-emulator:8081 test-agent:8126

IntegrationTests.ARM64:
build:
Expand Down Expand Up @@ -758,6 +769,7 @@ services:
- MYSQL_PORT=3306
- RABBITMQ_HOST=rabbitmq_arm64
- AWS_SDK_HOST=localstack_arm64:4566
- COSMOSDB_ENDPOINT=https://cosmosdb-emulator_arm64:8081
- DD_LOGGER_DD_API_KEY
- DD_LOGGER_DD_TRACE_LOG_DIRECTORY=/project/artifacts/build_data/infra_logs
- DD_LOGGER_DD_SERVICE
Expand Down Expand Up @@ -799,6 +811,7 @@ services:
- rabbitmq_arm64
- localstack_arm64
- test-agent
- cosmosdb-emulator_arm64

StartDependencies.ARM64:
image: andrewlock/wait-for-dependencies
Expand All @@ -815,9 +828,10 @@ services:
- rabbitmq_arm64
- localstack_arm64
- test-agent
- cosmosdb-emulator_arm64
environment:
- TIMEOUT_LENGTH=120
command: servicestackredis_arm64:6379 stackexchangeredis_arm64:6379 stackexchangeredis_arm64-replica:6379 stackexchangeredis_arm64-single:6379 elasticsearch7_arm64:9200 sqledge_arm64:1433 mongo_arm64:27017 postgres_arm64:5432 mysql_arm64:3306 rabbitmq_arm64:5672 localstack_arm64:4566 test-agent:8126
command: servicestackredis_arm64:6379 stackexchangeredis_arm64:6379 stackexchangeredis_arm64-replica:6379 stackexchangeredis_arm64-single:6379 elasticsearch7_arm64:9200 sqledge_arm64:1433 mongo_arm64:27017 postgres_arm64:5432 mysql_arm64:3306 rabbitmq_arm64:5672 localstack_arm64:4566 test-agent:8126 cosmosdb-emulator_arm64:8081

IntegrationTests.ARM64.Debugger:
build:
Expand Down
15 changes: 15 additions & 0 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,21 @@
"ExcludeTargetFrameworks": ["netcoreapp2.1", "netcoreapp3.0"]
}]
},
{
"IntegrationName": "CosmosDbVnext",
"SampleProjectName": "Samples.CosmosDb.Vnext",
"NugetPackageSearchName": "Microsoft.Azure.Cosmos",
"MinVersion": "3.12.0",
Copy link
Contributor Author

@pablomartinezbernardo pablomartinezbernardo Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to use HttpClientFactory when constructing the SDK client for use with the emulator, which has a self-signed certificate that .net fails to validate by default. 3.12.0 is the first version that supports HttpClientFactory

"MaxVersionExclusive": "4.0.0",
"SpecificVersions": [
"3.12.*",
"3.*.*"
],
"VersionConditions": [{
"MinVersion": "3.29.0",
"ExcludeTargetFrameworks": ["netcoreapp2.1", "netcoreapp3.0"]
}]
},
{
"IntegrationName": "Serilog",
"SampleProjectName": "LogsInjection.Serilog",
Expand Down
68 changes: 46 additions & 22 deletions tracer/build/PackageVersionsLatestMajors.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4974,12 +4974,6 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.Kafka</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.28.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down Expand Up @@ -5034,29 +5028,59 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj">
<Properties>ApiVersion=1.5.14;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.28.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Serilog</SampleName>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj">
<Properties>ApiVersion=2.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.28.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Serilog</SampleName>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj">
<Properties>ApiVersion=3.1.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Serilog</SampleName>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj">
<Properties>ApiVersion=4.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>LogsInjection.Serilog</SampleName>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb.Vnext\Samples.CosmosDb.Vnext.csproj">
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.CosmosDb.Vnext</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj">
<Properties>ApiVersion=2.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
Expand Down
Loading
Loading