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

SOLR-13434: Fixes problem on Java 8 build

This commit is contained in:
Cao Manh Dat 2019-06-05 15:33:21 +01:00
parent c6390f80d1
commit da832d4f3a
3 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
solr/contrib/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java Normal file
View File

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

26
solr/contrib/jaegertracer-configurator/src/java/overview.html Normal file
View File

@ -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>

4
solr/core/src/java/org/apache/solr/util/tracing/HttpServletCarrier.java
View File

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