Merge pull request #7 from newrelic-experimental/fix_verify

fixed problems with Java instrumenation verify
newrelic-experimental · Jan 7, 2025 · 3de7e6a · 3de7e6a
2 parents 7612f7e + 4d42912
commit 3de7e6a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
   dependencies {
     classpath 'gradle-templates:gradle-templates:1.5'
-    classpath 'com.newrelic.agent.java:gradle-verify-instrumentation-plugin:3.2'
+    classpath 'com.newrelic.agent.java:gradle-verify-instrumentation-plugin:4.0'
   }
 }
 

diff --git a/elasticsearch-2.x/build.gradle b/elasticsearch-2.x/build.gradle
@@ -22,7 +22,7 @@ jar {
 }
 
 verifyInstrumentation {
-	passes 'org.elasticsearch.client:transport:[2.0.0,5.0.0)'
+	passes 'org.elasticsearch:elasticsearch:[2.3.0,5.0.0)'
 	excludeRegex '.*SNAPSHOT'
 	excludeRegex '.*alpha.*'
 	excludeRegex '.*beta.*'

diff --git a/elasticsearch-5.0/build.gradle b/elasticsearch-5.0/build.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'java'
 
 dependencies {
-   implementation 'org.elasticsearch:elasticsearch:5.0.0'
+   implementation 'org.elasticsearch.client:transport:5.0.0'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'

diff --git a/elasticsearch-5.3/build.gradle b/elasticsearch-5.3/build.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'java'
 
 dependencies {
-   implementation 'org.elasticsearch:elasticsearch:5.3.0'
+   implementation 'org.elasticsearch.client:transport:5.3.0'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'

diff --git a/elasticsearch-6.x/build.gradle b/elasticsearch-6.x/build.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'java'
 
 dependencies {
-   implementation 'org.elasticsearch:elasticsearch:6.0.0'
+   implementation 'org.elasticsearch.client:transport:6.0.0'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'

diff --git a/elasticsearch-7.0/build.gradle b/elasticsearch-7.0/build.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'java'
 
 dependencies {
-   implementation 'org.elasticsearch:elasticsearch:7.0.0'
+   implementation 'org.elasticsearch.client:transport:7.0.0'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'

diff --git a/elasticsearch-7.14/build.gradle b/elasticsearch-7.14/build.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'java'
 
 dependencies {
-   implementation 'org.elasticsearch:elasticsearch:7.14.0'
+   implementation 'org.elasticsearch.client:transport:7.14.0'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'

diff --git a/elasticsearch-7.3/build.gradle b/elasticsearch-7.3/build.gradle
@@ -4,7 +4,7 @@
 apply plugin: 'java'
 
 dependencies {
-   implementation 'org.elasticsearch:elasticsearch:7.3.0'
+   implementation 'org.elasticsearch.client:transport:7.3.0'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'