Skip to content
Merged
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
13 changes: 13 additions & 0 deletions Datadog.Trace.sln
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL3", "tracer\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.GraphQL4", "tracer\test\test-applications\integrations\Samples.GraphQL4\Samples.GraphQL4.csproj", "{DA81EF3E-FDB3-417F-AA20-60FC495E3596}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Elasticsearch.V7", "tracer\test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj", "{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1752,6 +1754,16 @@ Global
{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Release|x64.Build.0 = Release|x64
{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Release|x86.ActiveCfg = Release|x86
{DA81EF3E-FDB3-417F-AA20-60FC495E3596}.Release|x86.Build.0 = Release|x86
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|Any CPU.ActiveCfg = Debug|x86
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|x64.ActiveCfg = Debug|x64
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|x64.Build.0 = Debug|x64
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|x86.ActiveCfg = Debug|x86
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Debug|x86.Build.0 = Debug|x86
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|Any CPU.ActiveCfg = Release|x86
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|x64.ActiveCfg = Release|x64
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|x64.Build.0 = Release|x64
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|x86.ActiveCfg = Release|x86
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1894,6 +1906,7 @@ Global
{B0E671B9-78DE-410F-A0AA-612FF1F900F2} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
{CA3D605F-8DD7-4041-B024-70A24036AFA1} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{DA81EF3E-FDB3-417F-AA20-60FC495E3596} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{3CB0B2C2-7664-4D71-8F43-3D207EE80DB7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
18 changes: 17 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
- "9300"
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

mongo_arm64:
image: mongo:4.0.9
Expand Down Expand Up @@ -102,13 +103,23 @@ services:
- "127.0.0.1:27017:27017"
command: mongod

elasticsearch7:
image: docker.elastic.co/elasticsearch/elasticsearch:7.14.1
ports:
- "127.0.0.1:9210:9200"
- "127.0.0.1:9310:9300"
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

elasticsearch6:
image: docker.elastic.co/elasticsearch/elasticsearch:6.4.2
ports:
- "127.0.0.1:9200:9200"
- "127.0.0.1:9300:9300"
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

elasticsearch5:
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.16
Expand All @@ -117,6 +128,7 @@ services:
- "127.0.0.1:9305:9300"
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

postgres:
image: postgres:10.5-alpine
Expand Down Expand Up @@ -288,6 +300,7 @@ services:
- MONGO_HOST=mongo
- SERVICESTACK_REDIS_HOST=servicestackredis:6379
- STACKEXCHANGE_REDIS_HOST=stackexchangeredis:6379
- ELASTICSEARCH7_HOST=elasticsearch7:9200
- ELASTICSEARCH6_HOST=elasticsearch6:9200
- ELASTICSEARCH5_HOST=elasticsearch5:9200
- SQLSERVER_CONNECTION_STRING=Server=sqlserver;User=sa;Password=Strong!Passw0rd
Expand All @@ -304,6 +317,7 @@ services:
- aerospike
- servicestackredis
- stackexchangeredis
- elasticsearch7
- elasticsearch6
- elasticsearch5
- sqlserver
Expand All @@ -322,6 +336,7 @@ services:
- aerospike
- servicestackredis
- stackexchangeredis
- elasticsearch7
- elasticsearch6
- elasticsearch5
- sqlserver
Expand All @@ -335,7 +350,7 @@ services:
- aws_sqs
environment:
- TIMEOUT_LENGTH=120
command: aerospike:3000 servicestackredis:6379 stackexchangeredis:6379 elasticsearch5:9200 elasticsearch6:9200 sqlserver:1433 mongo:27017 postgres:5432 mysql:3306 mysql57:3306 rabbitmq:5672 kafka-broker:9092 kafka-zookeeper:2181 aws_sqs:9324
command: aerospike:3000 servicestackredis:6379 stackexchangeredis:6379 elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 sqlserver:1433 mongo:27017 postgres:5432 mysql:3306 mysql57:3306 rabbitmq:5672 kafka-broker:9092 kafka-zookeeper:2181 aws_sqs:9324

IntegrationTests.ARM64:
build:
Expand All @@ -357,6 +372,7 @@ services:
- MONGO_HOST=mongo_arm64
- SERVICESTACK_REDIS_HOST=servicestackredis_arm64:6379
- STACKEXCHANGE_REDIS_HOST=stackexchangeredis_arm64:6379
- ELASTICSEARCH7_HOST=elasticsearch7_arm64:9200
Comment thread
andrewlock marked this conversation as resolved.
- ELASTICSEARCH6_HOST=elasticsearch7_arm64:9200
- ELASTICSEARCH5_HOST=elasticsearch7_arm64:9200
- SQLSERVER_CONNECTION_STRING=Server=sqledge_arm64;User=sa;Password=Strong!Passw0rd
Expand Down
96 changes: 96 additions & 0 deletions tracer/build/PackageVersionsComprehensive.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -1512,6 +1512,102 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<PackageVersionSample Include="test\test-applications\integrations\Samples.MongoDB\Samples.MongoDB.csproj">
<Properties>ApiVersion=2.12.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.2.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.2.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.3.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.4.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.4.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.4.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.5.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.5.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.6.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.6.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.6.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.7.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.7.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.8.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.8.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.8.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.9.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.10.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.10.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.11.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.11.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.12.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.12.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.13.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.13.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.13.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.14.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.14.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch\Samples.Elasticsearch.csproj">
<Properties>ApiVersion=6.0.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
Expand Down
7 changes: 7 additions & 0 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
"MinVersionNetCore": "2.3.0",
"MaxVersionExclusive": "3.0.0"
},
{
"IntegrationName": "ElasticSearch7",
"SampleProjectName": "Samples.Elasticsearch.V7",
"NugetPackageSearchName": "Elasticsearch.Net",
"MinVersion": "7.0.0",
"MaxVersionExclusive": "8.0.0"
},
{
"IntegrationName": "ElasticSearch6",
"SampleProjectName": "Samples.Elasticsearch",
Expand Down
45 changes: 45 additions & 0 deletions tracer/build/PackageVersionsLatestMinors.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,51 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
<PackageVersionSample Include="test\test-applications\integrations\Samples.MongoDB\Samples.MongoDB.csproj">
<Properties>ApiVersion=2.12.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.0.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.1.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.2.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.4.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.5.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.6.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.7.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.8.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.9.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.10.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.11.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.12.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.13.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch.V7\Samples.Elasticsearch.V7.csproj">
<Properties>ApiVersion=7.14.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Elasticsearch\Samples.Elasticsearch.csproj">
<Properties>ApiVersion=6.0.2;RestoreRecursive=false;BuildProjectReferences=false</Properties>
</PackageVersionSample>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// <copyright file="ElasticsearchV7Constants.cs" company="Datadog">
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
// </copyright>

using Datadog.Trace.Configuration;

namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.Elasticsearch.V7
{
internal static class ElasticsearchV7Constants
{
internal const string Version7 = "7";
internal const string ElasticsearchAssemblyName = "Elasticsearch.Net";
internal const string TransportTypeName = "Elasticsearch.Net.Transport`1";

internal const string IntegrationName = nameof(IntegrationIds.ElasticsearchNet);
internal static readonly IntegrationInfo IntegrationId = IntegrationRegistry.GetIntegrationInfo(IntegrationName);
}
}
Loading