Rename elasticsearch modules (#221)

instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle

@@ -28,7 +28,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
 
-  compile project(':instrumentation:elasticsearch')
+  compile project(':instrumentation:elasticsearch:elasticsearch-common')
 
   testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')

instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle

@@ -29,7 +29,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0'
 
-  compile project(':instrumentation:elasticsearch')
+  compile project(':instrumentation:elasticsearch:elasticsearch-common')
 
   testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')

instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle

@@ -23,11 +23,11 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
 
-  compile project(':instrumentation:elasticsearch')
+  compile project(':instrumentation:elasticsearch:elasticsearch-common')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:rest-5.0')
-  testCompile project(':instrumentation:elasticsearch:transport-5.0')
+  testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
+  testCompile project(':instrumentation:elasticsearch:elasticsearch-transport-5.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')
 
   testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'

instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle

@@ -24,10 +24,10 @@ muzzle {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 
-  compile project(':instrumentation:elasticsearch')
+  compile project(':instrumentation:elasticsearch:elasticsearch-common')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:rest-5.0')
+  testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty:netty-4.1')
 

instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle

@@ -31,7 +31,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
 
-  compile project(':instrumentation:elasticsearch')
+  compile project(':instrumentation:elasticsearch:elasticsearch-common')
 
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty:netty-4.1')

instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle

@@ -31,10 +31,10 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
 
-  compile project(':instrumentation:elasticsearch')
+  compile project(':instrumentation:elasticsearch:elasticsearch-common')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:rest-5.0')
+  testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
   testCompile project(':instrumentation:apache-httpasyncclient-4.0')
   testCompile project(':instrumentation:netty:netty-4.1')
 

settings.gradle

@@ -56,13 +56,13 @@ include ':instrumentation:couchbase:couchbase-2.0'
 include ':instrumentation:couchbase:couchbase-2.6'
 include ':instrumentation:dropwizard-views-0.7'
 include ':instrumentation:dropwizard-testing'
-include ':instrumentation:elasticsearch'
-include ':instrumentation:elasticsearch:rest-5.0'
-include ':instrumentation:elasticsearch:rest-6.4'
-include ':instrumentation:elasticsearch:transport-2.0'
-include ':instrumentation:elasticsearch:transport-5.0'
-include ':instrumentation:elasticsearch:transport-5.3'
-include ':instrumentation:elasticsearch:transport-6.0'
+include ':instrumentation:elasticsearch:elasticsearch-common'
+include ':instrumentation:elasticsearch:elasticsearch-rest-5.0'
+include ':instrumentation:elasticsearch:elasticsearch-rest-6.4'
+include ':instrumentation:elasticsearch:elasticsearch-transport-2.0'
+include ':instrumentation:elasticsearch:elasticsearch-transport-5.0'
+include ':instrumentation:elasticsearch:elasticsearch-transport-5.3'
+include ':instrumentation:elasticsearch:elasticsearch-transport-6.0'
 include ':instrumentation:finatra-2.9'
 include ':instrumentation:geode-1.4'
 include ':instrumentation:google-http-client-1.19'