Skip to content
Open
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
14 changes: 14 additions & 0 deletions Datadog.Trace.Samples.g.sln
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.AzureSe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventHubs", "tracer\test\test-applications\integrations\Samples.AzureEventHubs\Samples.AzureEventHubs.csproj", "{BC44A41F-1BED-4438-9F66-0EA5607906D7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventGrid", "tracer\test\test-applications\integrations\Samples.AzureEventGrid\Samples.AzureEventGrid.csproj", "{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventGridNamespaces", "tracer\test\test-applications\integrations\Samples.AzureEventGridNamespaces\Samples.AzureEventGridNamespaces.csproj", "{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.DynamoDBv2", "tracer\test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj", "{D59C5649-BE0E-4A33-B868-B652D8614534}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Amazon.Lambda.RuntimeSupport", "tracer\test\test-applications\integrations\Samples.Amazon.Lambda.RuntimeSupport\Samples.Amazon.Lambda.RuntimeSupport.csproj", "{18A6904A-5AFD-4816-AC3F-9F5E433720B5}"
Expand Down Expand Up @@ -969,6 +973,14 @@ Global
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|Any CPU.Build.0 = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Release|Any CPU.Build.0 = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Release|Any CPU.Build.0 = Release|Any CPU
{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D59C5649-BE0E-4A33-B868-B652D8614534}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D59C5649-BE0E-4A33-B868-B652D8614534}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1254,6 +1266,8 @@ Global
{BC44A41F-1BED-4438-9F66-0EA5607906D6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{BC44A41F-1BED-4438-9F66-0EA5607906D7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{D59C5649-BE0E-4A33-B868-B652D8614534} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{18A6904A-5AFD-4816-AC3F-9F5E433720B5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
Expand Down
14 changes: 14 additions & 0 deletions Datadog.Trace.sln
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.AzureSe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventHubs", "tracer\test\test-applications\integrations\Samples.AzureEventHubs\Samples.AzureEventHubs.csproj", "{BC44A41F-1BED-4438-9F66-0EA5607906D7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventGrid", "tracer\test\test-applications\integrations\Samples.AzureEventGrid\Samples.AzureEventGrid.csproj", "{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventGridNamespaces", "tracer\test\test-applications\integrations\Samples.AzureEventGridNamespaces\Samples.AzureEventGridNamespaces.csproj", "{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}"
Comment thread
pablomartinezbernardo marked this conversation as resolved.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Tools.dd_dotnet", "tracer\src\Datadog.Trace.Tools.dd_dotnet\Datadog.Trace.Tools.dd_dotnet.csproj", "{B28A33A4-C694-4514-BC30-2680605B0B3D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Tools.dd_dotnet.ArtifactTests", "tracer\test\Datadog.Trace.Tools.dd_dotnet.ArtifactTests\Datadog.Trace.Tools.dd_dotnet.ArtifactTests.csproj", "{604CE6F2-9E90-4D0B-91CB-EBA06880A7D7}"
Expand Down Expand Up @@ -1375,6 +1379,14 @@ Global
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC44A41F-1BED-4438-9F66-0EA5607906D7}.Release|Any CPU.Build.0 = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C}.Release|Any CPU.Build.0 = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D}.Release|Any CPU.Build.0 = Release|Any CPU
{B28A33A4-C694-4514-BC30-2680605B0B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B28A33A4-C694-4514-BC30-2680605B0B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B28A33A4-C694-4514-BC30-2680605B0B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1784,6 +1796,8 @@ Global
{BC44A41F-1BED-4438-9F66-0EA5607906D6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{BC44A41F-1BED-4438-9F66-0EA5607906D7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8C} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{A2E3F4D5-B6C7-4891-9012-3D4E5F6A7B8D} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{B28A33A4-C694-4514-BC30-2680605B0B3D} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
{604CE6F2-9E90-4D0B-91CB-EBA06880A7D7} = {8CEC2042-F11C-49F5-A674-2355793B600A}
{A9632530-0FB8-4156-BD3C-DD432527768E} = {8CEC2042-F11C-49F5-A674-2355793B600A}
Expand Down
12 changes: 11 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,14 @@ services:
volumes:
- ./docker/eventhubs-emulator-config.json:/Eventhubs_Emulator/ConfigFiles/Config.json:ro

azure-eventgrid-emulator:
image: workleap/eventgridemulator:0.6.37@sha256:a366e9bf0c73979311654d98f4cb91f85e35cddd8333821f5a5029692b6002bb
profiles: ["group2"]
ports:
- "127.0.0.1:6500:6500"
volumes:
- ./docker/eventgrid-emulator-config.json:/app/appsettings.json:ro

cosmosdb-emulator:
image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:vnext-preview@sha256:54d7bc334494c50cea867c270880671a7db080626a9732832b34c0d69342f9b0
profiles: ["group2"]
Expand Down Expand Up @@ -456,6 +464,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;
- EVENTGRID_TOPIC_ENDPOINT=http://azure-eventgrid-emulator:6500/samples-eventgrid-topic/api/events
- COSMOSDB_ENDPOINT=https://cosmosdb-emulator:8081
- TEST_AGENT_HOST=test-agent
- CONTAINER_HOSTNAME=http://integrationtests
Expand Down Expand Up @@ -683,11 +692,12 @@ services:
- azureservicebus-emulator
- azurite
- azure-eventhubs-emulator
- azure-eventgrid-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 cosmosdb-emulator:8081 test-agent:8126 test-agent:4317 test-agent:4318
command: elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 mongo:27017 localstack:4566 sqledge:1433 azureservicebus-emulator:5672 azure-eventhubs-emulator:5672 azure-eventgrid-emulator:6500 cosmosdb-emulator:8081 test-agent:8126 test-agent:4317 test-agent:4318

IntegrationTests.ARM64:
build:
Expand Down
5 changes: 5 additions & 0 deletions docker/eventgrid-emulator-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Topics": {
"samples-eventgrid-topic": []
}
}
22 changes: 22 additions & 0 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,28 @@
"5.*.*"
]
},
{
"IntegrationName": "AzureEventGrid",
"SampleProjectName": "Samples.AzureEventGrid",
"NugetPackageSearchName": "Azure.Messaging.EventGrid",
"MinVersion": "4.0.0",
"MaxVersionExclusive": "6.0.0",
"SpecificVersions": [
"4.0.*",
"5.*.*"
]
},
{
"IntegrationName": "AzureEventGridNamespaces",
"SampleProjectName": "Samples.AzureEventGridNamespaces",
"NugetPackageSearchName": "Azure.Messaging.EventGrid.Namespaces",
"MinVersion": "1.0.0",
"MaxVersionExclusive": "2.0.0",
"SpecificVersions": [
"1.0.*",
"1.*.*"
]
},
{
"IntegrationName": "Selenium",
"SampleProjectName": "Samples.Selenium",
Expand Down
Loading
Loading