Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14286: Upgrade Jaegar to 1.1.0

This commit is contained in:
Cao Manh Dat 2020-02-27 14:51:45 +07:00
parent edefcf156b
commit 666bd493c8
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/ivy-versions.properties
View File

@ -67,7 +67,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}
@ -200,7 +200,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

2
solr/CHANGES.txt
View File

@ -40,6 +40,8 @@ Other Changes
* SOLR-14256: Remove HashDocSet; add DocSet.getBits() instead. DocSet is now strictly immutable and ascending order.
It's now locked-down to external extension; only 2 impls exist. (David Smiley)
* SOLR-14286: Upgrade Jaegar to 1.1.0 (Cao Manh Dat)
================== 8.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

14
solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
View File

@ -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();