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/06/05 14:35:16 UTC
[lucene-solr] branch master updated: SOLR-13434: Fixes problem on
Java 8 build
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new da832d4 SOLR-13434: Fixes problem on Java 8 build
da832d4 is described below
commit da832d4f3aa2e87cf1947ef4373977778ea6d2e0
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Wed Jun 5 15:33:21 2019 +0100
SOLR-13434: Fixes problem on Java 8 build
---
.../java/org/apache/solr/jaeger/package-info.java | 21 +++++++++++++++++
.../src/java/overview.html | 26 ++++++++++++++++++++++
.../solr/util/tracing/HttpServletCarrier.java | 4 ++--
3 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
new file mode 100644
index 0000000..3562f36
--- /dev/null
+++ b/solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Jaeger Tracer Configurator.
+ */
+package org.apache.solr.jaeger;
diff --git a/solr/contrib/jaegertracer-configurator/src/java/overview.html b/solr/contrib/jaegertracer-configurator/src/java/overview.html
new file mode 100644
index 0000000..846e170
--- /dev/null
+++ b/solr/contrib/jaegertracer-configurator/src/java/overview.html
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<body>
+Apache Solr Search Server: Solr Jaeger Tracer Configurator contrib
+
+<p>
+This package provides provides a way for you to expose Solr's tracing to Jaeger.
+</p>
+
+</body>
+</html>
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
index a18ce89..52569be 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
@@ -32,7 +32,7 @@ public class HttpServletCarrier implements TextMap {
private Iterator<Map.Entry<String, String>> it;
public HttpServletCarrier(HttpServletRequest request) {
- this.it = new Iterator<>() {
+ this.it = new Iterator<Map.Entry<String, String>>() {
Enumeration<String> headerNameIt = request.getHeaderNames();
String headerName = null;
@@ -61,7 +61,7 @@ public class HttpServletCarrier implements TextMap {
String key = headerName;
String val = headerValue.nextElement();
- return new Map.Entry<>() {
+ return new Map.Entry<String, String>() {
@Override
public String getKey() {
return key;