From 079dfd24bd20ed33542fe81e852a973864d0d707 Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Wed, 23 Oct 2019 11:10:52 -0700
Subject: [PATCH] ES deploy workaround.

---
 .../elasticsearch/rest-6.4/rest-6.4.gradle             | 10 ++++++----
 .../elasticsearch/transport-5.3/transport-5.3.gradle   |  3 ++-
 .../elasticsearch/transport-5/transport-5.gradle       |  3 ++-
 .../elasticsearch/transport-6/transport-6.gradle       |  5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle
index d36cc0b2c7..e2b4eb3d2c 100644
--- a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/rest-6.4.gradle
@@ -44,8 +44,10 @@ dependencies {
   testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '6.4.0'
   testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.4.0'
 
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.+'
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '6.+'
-  latestDepTestCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '6.+'
-  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.+'
+  // TODO: The tests are incompatible with 7.x.  The instrumentation may be as well.
+  // FIXME: Lock to specific version due to bad deploy rollout.
+  latestDepTestCompile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.8.3'
+  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '6.8.3'
+  latestDepTestCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '6.8.3'
+  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.8.3'
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
index 9a932653c4..57778b7c40 100644
--- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
@@ -8,7 +8,8 @@ muzzle {
     group = "org.elasticsearch.client"
     module = "transport"
     versions = "[5.3.0,6.0.0)"
-    assertInverse = true
+    // Work around for a bad release of 6.8.4
+//    assertInverse = true
   }
   pass {
     group = "org.elasticsearch"
diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5/transport-5.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-5/transport-5.gradle
index b1cd11ef13..715950ddd0 100644
--- a/dd-java-agent/instrumentation/elasticsearch/transport-5/transport-5.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch/transport-5/transport-5.gradle
@@ -8,7 +8,8 @@ muzzle {
     group = "org.elasticsearch.client"
     module = "transport"
     versions = "[5.0.0,5.3.0)"
-    assertInverse = true
+    // Work around for a bad release of 6.8.4
+//    assertInverse = true
   }
   pass {
     group = "org.elasticsearch"
diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-6/transport-6.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-6/transport-6.gradle
index a02f076d6f..e8265c698a 100644
--- a/dd-java-agent/instrumentation/elasticsearch/transport-6/transport-6.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch/transport-6/transport-6.gradle
@@ -7,8 +7,9 @@ muzzle {
   pass {
     group = "org.elasticsearch.client"
     module = "transport"
-    versions = "[6.0.0,)"
-    assertInverse = true
+    versions = "[6.0.0,6.8.4)"
+    // Work around for a bad release of 6.8.4
+//    assertInverse = true
   }
   pass {
     group = "org.elasticsearch"