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 2019/05/24 09:47:41 UTC
[lucene-solr] branch jira/SOLR-13434 created (now 4fc0e4f)
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a change to branch jira/SOLR-13434
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
at 4fc0e4f SOLR-13434: Move Jaeger-contrib to correct package
This branch includes the following new commits:
new 4fc0e4f SOLR-13434: Move Jaeger-contrib to correct package
The 1 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.
[lucene-solr] 01/01: SOLR-13434: Move Jaeger-contrib to correct
package
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch jira/SOLR-13434
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4fc0e4f8f6d18092fbbb983dba7287e8777b0b45
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Fri May 24 10:47:31 2019 +0100
SOLR-13434: Move Jaeger-contrib to correct package
---
solr/contrib/jaegertracer-configurator/README.txt | 2 +-
.../apache/solr/{ => jaeger}/JaegerTracerConfigurator.java | 9 ++++-----
.../jaegertracer-configurator/src/test-files/solr/solr.xml | 2 +-
.../apache/solr/{ => jaeger}/TestJaegerConfigurator.java | 13 +++++++------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/solr/contrib/jaegertracer-configurator/README.txt b/solr/contrib/jaegertracer-configurator/README.txt
index ed3978c..d50e75f 100644
--- a/solr/contrib/jaegertracer-configurator/README.txt
+++ b/solr/contrib/jaegertracer-configurator/README.txt
@@ -8,7 +8,7 @@ Apache Solr Jaeger Tracer Configurator (solr-jaeger-tracer) provides a way for y
Note that all library of solr-jaeger-tracer must be included in the classpath of all nodes then Jaeger tracer can be setup in `solr.xml` like this:
```
-<tracerConfig name="tracerConfig" class="org.apache.solr.JaegerTracerConfigurator">
+<tracerConfig name="tracerConfig" class="org.apache.solr.jaeger.JaegerTracerConfigurator">
<double name="sampleRate">100.0</double>
<str name="agentHost">localhost</str>
<int name="agentPort">5775</int>
diff --git a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/JaegerTracerConfigurator.java b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
similarity index 91%
rename from solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/JaegerTracerConfigurator.java
rename to solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
index 95a59cf..5b82d9f 100644
--- a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/JaegerTracerConfigurator.java
+++ b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.solr;
+package org.apache.solr.jaeger;
import io.jaegertracing.Configuration;
import io.jaegertracing.samplers.ConstSampler;
@@ -73,13 +73,12 @@ public class JaegerTracerConfigurator extends TracerConfigurator {
.withType(ConstSampler.TYPE)
.withParam(1);
- Configuration envConfig = Configuration.fromEnv();
- Configuration.SenderConfiguration senderConfig = envConfig.getReporter().getSenderConfiguration()
+ Configuration.ReporterConfiguration reporterConfig = Configuration.ReporterConfiguration.fromEnv();
+ Configuration.SenderConfiguration senderConfig = reporterConfig.getSenderConfiguration()
.withAgentHost(host.toString())
.withAgentPort(port);
- Configuration.ReporterConfiguration reporterConfig = envConfig.getReporter()
- .withLogSpans(logSpans)
+ reporterConfig.withLogSpans(logSpans)
.withFlushInterval(flushInterval)
.withMaxQueueSize(maxQueue)
.withSender(senderConfig);
diff --git a/solr/contrib/jaegertracer-configurator/src/test-files/solr/solr.xml b/solr/contrib/jaegertracer-configurator/src/test-files/solr/solr.xml
index 2a04bb3..160eae0 100644
--- a/solr/contrib/jaegertracer-configurator/src/test-files/solr/solr.xml
+++ b/solr/contrib/jaegertracer-configurator/src/test-files/solr/solr.xml
@@ -21,7 +21,7 @@
-->
<solr>
- <tracerConfig name="tracerConfig" class="org.apache.solr.JaegerTracerConfigurator">
+ <tracerConfig name="tracerConfig" class="org.apache.solr.jaeger.JaegerTracerConfigurator">
<double name="sampleRate">100.0</double>
<str name="agentHost">localhost</str>
<int name="agentPort">5775</int>
diff --git a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/TestJaegerConfigurator.java b/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
similarity index 90%
rename from solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/TestJaegerConfigurator.java
rename to solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
index b91a39e..c2e282d 100644
--- a/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/TestJaegerConfigurator.java
+++ b/solr/contrib/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
@@ -15,24 +15,25 @@
* limitations under the License.
*/
-package org.apache.solr;
+package org.apache.solr.jaeger;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.tracing.GlobalTracer;
import org.junit.Test;
-import static org.apache.solr.JaegerTracerConfigurator.AGENT_HOST;
-import static org.apache.solr.JaegerTracerConfigurator.AGENT_PORT;
-import static org.apache.solr.JaegerTracerConfigurator.FLUSH_INTERVAL;
-import static org.apache.solr.JaegerTracerConfigurator.LOG_SPANS;
-import static org.apache.solr.JaegerTracerConfigurator.MAX_QUEUE_SIZE;
+import static org.apache.solr.jaeger.JaegerTracerConfigurator.AGENT_HOST;
+import static org.apache.solr.jaeger.JaegerTracerConfigurator.AGENT_PORT;
+import static org.apache.solr.jaeger.JaegerTracerConfigurator.FLUSH_INTERVAL;
+import static org.apache.solr.jaeger.JaegerTracerConfigurator.LOG_SPANS;
+import static org.apache.solr.jaeger.JaegerTracerConfigurator.MAX_QUEUE_SIZE;
public class TestJaegerConfigurator extends SolrTestCaseJ4 {