[lucene-solr] 01/02: SOLR-14286: Upgrade Jaegar to 1.1.0

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

datcm pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 5b4f07ee759b6cc78038cbe68df52ba1d81bcd37
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Thu Feb 27 14:51:45 2020 +0700

    SOLR-14286: Upgrade Jaegar to 1.1.0
---
 lucene/ivy-versions.properties                             |  4 ++--
 solr/CHANGES.txt                                           |  2 ++
 .../org/apache/solr/jaeger/TestJaegerConfigurator.java     | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index f6cc43c..1f64c0b 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -69,7 +69,7 @@ io.dropwizard.metrics.version = 4.1.2
 /io.dropwizard.metrics/metrics-jmx = ${io.dropwizard.metrics.version}
 /io.dropwizard.metrics/metrics-jvm = ${io.dropwizard.metrics.version}
 
-io.jaegertracing.version = 0.35.5
+io.jaegertracing.version = 1.1.0
 /io.jaegertracing/jaeger-core = ${io.jaegertracing.version}
 /io.jaegertracing/jaeger-thrift = ${io.jaegertracing.version}
 
@@ -204,7 +204,7 @@ org.apache.poi.version = 4.1.1
 /org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
 /org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
 
-org.apache.thrift.version = 0.12.0
+org.apache.thrift.version = 0.13.0
 /org.apache.thrift/libthrift = ${org.apache.thrift.version}
 
 org.apache.tika.version = 1.23
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 82603ea..2b9b159 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -78,6 +78,8 @@ Improvements
 
 * SOLR-14114: Add WARN to Solr log that embedded ZK is not supported in production (janhoy)
 
+* SOLR-14286: Upgrade Jaegar to 1.1.0 (Cao Manh Dat)
+
 Optimizations
 ---------------------
 
diff --git a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java b/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
index b2fe54f..55018eb 100644
--- a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
+++ b/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
@@ -22,7 +22,9 @@ import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.cloud.MiniSolrCloudCluster;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.SolrException;
@@ -43,7 +45,7 @@ public class TestJaegerConfigurator extends SolrTestCaseJ4 {
 
   @Test
   public void testInjected() throws Exception{
-    MiniSolrCloudCluster cluster = new SolrCloudTestCase.Builder(1, createTempDir())
+    MiniSolrCloudCluster cluster = new SolrCloudTestCase.Builder(2, createTempDir())
         .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
         .withSolrXml(getFile("solr/solr.xml").toPath())
         .build();
@@ -52,14 +54,20 @@ public class TestJaegerConfigurator extends SolrTestCaseJ4 {
     try {
       TimeOut timeOut = new TimeOut(2, TimeUnit.MINUTES, TimeSource.NANO_TIME);
       timeOut.waitFor("Waiting for GlobalTracer is registered", () -> GlobalTracer.getTracer() instanceof io.jaegertracing.internal.JaegerTracer);
+
+      //TODO add run Jaeger through Docker and verify spans available after run these commands
+      CollectionAdminRequest.createCollection("test", 2, 1).process(cluster.getSolrClient());
+      new UpdateRequest()
+          .add("id", "1")
+          .add("id", "2")
+          .process(cluster.getSolrClient(), "test");
+      cluster.getSolrClient().query("test", new SolrQuery("*:*"));
     } finally {
       cluster.shutdown();
     }
 
   }
 
-  //TODO add integration test with Jaeger run on a container
-
   @Test
   public void testRequiredParameters() throws IOException {
     JaegerTracerConfigurator configurator = new JaegerTracerConfigurator();