You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2020/02/27 08:12:12 UTC
[lucene-solr] branch branch_8x updated (4e70711 -> 0e0aa6e)
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 4e70711 SOLR-14270: fix incorrect date format
new 5b4f07e SOLR-14286: Upgrade Jaegar to 1.1.0
new 0e0aa6e SOLR-14286: Update sha files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/ivy-versions.properties | 4 ++--
solr/CHANGES.txt | 2 ++
.../org/apache/solr/jaeger/TestJaegerConfigurator.java | 14 +++++++++++---
solr/licenses/jaeger-core-0.35.5.jar.sha1 | 1 -
solr/licenses/jaeger-core-1.1.0.jar.sha1 | 1 +
solr/licenses/jaeger-thrift-0.35.5.jar.sha1 | 1 -
solr/licenses/jaeger-thrift-1.1.0.jar.sha1 | 1 +
solr/licenses/libthrift-0.12.0.jar.sha1 | 1 -
solr/licenses/libthrift-0.13.0.jar.sha1 | 1 +
9 files changed, 18 insertions(+), 8 deletions(-)
delete mode 100644 solr/licenses/jaeger-core-0.35.5.jar.sha1
create mode 100644 solr/licenses/jaeger-core-1.1.0.jar.sha1
delete mode 100644 solr/licenses/jaeger-thrift-0.35.5.jar.sha1
create mode 100644 solr/licenses/jaeger-thrift-1.1.0.jar.sha1
delete mode 100644 solr/licenses/libthrift-0.12.0.jar.sha1
create mode 100644 solr/licenses/libthrift-0.13.0.jar.sha1
[lucene-solr] 01/02: SOLR-14286: Upgrade Jaegar to 1.1.0
Posted by 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();
[lucene-solr] 02/02: SOLR-14286: Update sha files
Posted by 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 0e0aa6e2077559d15d15473c27f4d992ee269993
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Thu Feb 27 15:07:03 2020 +0700
SOLR-14286: Update sha files
---
solr/licenses/jaeger-core-0.35.5.jar.sha1 | 1 -
solr/licenses/jaeger-core-1.1.0.jar.sha1 | 1 +
solr/licenses/jaeger-thrift-0.35.5.jar.sha1 | 1 -
solr/licenses/jaeger-thrift-1.1.0.jar.sha1 | 1 +
solr/licenses/libthrift-0.12.0.jar.sha1 | 1 -
solr/licenses/libthrift-0.13.0.jar.sha1 | 1 +
6 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/licenses/jaeger-core-0.35.5.jar.sha1 b/solr/licenses/jaeger-core-0.35.5.jar.sha1
deleted file mode 100644
index 3c0b73c..0000000
--- a/solr/licenses/jaeger-core-0.35.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fc934c7619ca7c626a7ce713646d8c43f8dca8bd
diff --git a/solr/licenses/jaeger-core-1.1.0.jar.sha1 b/solr/licenses/jaeger-core-1.1.0.jar.sha1
new file mode 100644
index 0000000..0650596
--- /dev/null
+++ b/solr/licenses/jaeger-core-1.1.0.jar.sha1
@@ -0,0 +1 @@
+b10186234b35da9c658d40eef9be160f19d89105
\ No newline at end of file
diff --git a/solr/licenses/jaeger-thrift-0.35.5.jar.sha1 b/solr/licenses/jaeger-thrift-0.35.5.jar.sha1
deleted file mode 100644
index baa1f4d..0000000
--- a/solr/licenses/jaeger-thrift-0.35.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dc4066e5b4532121b8e4d69124919376ab123940
diff --git a/solr/licenses/jaeger-thrift-1.1.0.jar.sha1 b/solr/licenses/jaeger-thrift-1.1.0.jar.sha1
new file mode 100644
index 0000000..c24338d
--- /dev/null
+++ b/solr/licenses/jaeger-thrift-1.1.0.jar.sha1
@@ -0,0 +1 @@
+8ca3a1dfd69f9900d3541532fdc767ad24d6c88b
diff --git a/solr/licenses/libthrift-0.12.0.jar.sha1 b/solr/licenses/libthrift-0.12.0.jar.sha1
deleted file mode 100644
index 1ce04fe..0000000
--- a/solr/licenses/libthrift-0.12.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-300bfbee03c7afa77301fb0946115e400e28ae04
diff --git a/solr/licenses/libthrift-0.13.0.jar.sha1 b/solr/licenses/libthrift-0.13.0.jar.sha1
new file mode 100644
index 0000000..83ed46f
--- /dev/null
+++ b/solr/licenses/libthrift-0.13.0.jar.sha1
@@ -0,0 +1 @@
+0e5af3b6dc164eb2c699b70bf67a0babef507faf
\ No newline at end of file