Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@ services:
volumes:
- ./docker/eventhubs-emulator-config.json:/Eventhubs_Emulator/ConfigFiles/Config.json:ro

cosmosdb-emulator:
image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest
profiles: ["group2"]

# 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 +494,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 @@ -714,10 +719,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
4 changes: 2 additions & 2 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -675,10 +675,10 @@
"IntegrationName": "CosmosDb",
"SampleProjectName": "Samples.CosmosDb",
"NugetPackageSearchName": "Microsoft.Azure.Cosmos",
"MinVersion": "3.6.0",
"MinVersion": "3.12.0",
"MaxVersionExclusive": "4.0.0",
"SpecificVersions": [
"3.6.*",
"3.12.*",
"3.*.*"
],
"VersionConditions": [{
Expand Down
38 changes: 16 additions & 22 deletions tracer/build/PackageVersionsLatestMajors.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -4974,64 +4974,58 @@ 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.0;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>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</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>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.CosmosDb\Samples.CosmosDb.csproj">
<Properties>ApiVersion=3.54.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<Properties>ApiVersion=3.54.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.CosmosDb</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\LogsInjection.Serilog\LogsInjection.Serilog.csproj">
Expand Down
Loading
Loading