This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new ae8d3e54c0c SOLR-16535 Remove jaegertracer-configurator module in 10.0
(#1272)
ae8d3e54c0c is described below
commit ae8d3e54c0caa5bc31754a11f015b9e08b6cecf3
Author: Jan Høydahl <[email protected]>
AuthorDate: Fri Jan 6 20:03:15 2023 +0100
SOLR-16535 Remove jaegertracer-configurator module in 10.0 (#1272)
---
settings.gradle | 1 -
solr/CHANGES.txt | 5 +
solr/licenses/jaeger-core-1.8.1.jar.sha1 | 1 -
solr/licenses/jaeger-core-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/jaeger-core-NOTICE.txt | 0
solr/licenses/jaeger-thrift-1.8.1.jar.sha1 | 1 -
solr/licenses/jaeger-thrift-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/jaeger-thrift-NOTICE.txt | 0
solr/licenses/libthrift-0.15.0.jar.sha1 | 1 -
solr/licenses/libthrift-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/libthrift-NOTICE.txt | 5 -
solr/modules/jaegertracer-configurator/README.md | 48 -----
.../modules/jaegertracer-configurator/build.gradle | 38 ----
.../solr/jaeger/JaegerTracerConfigurator.java | 35 ----
.../java/org/apache/solr/jaeger/package-info.java | 19 --
.../src/java/overview.html | 26 ---
.../src/test-files/log4j2.xml | 42 -----
.../test-files/solr/collection1/conf/schema.xml | 29 ---
.../solr/collection1/conf/solrconfig.xml | 51 ------
.../src/test-files/solr/solr.xml | 57 ------
.../apache/solr/jaeger/TestJaegerConfigurator.java | 67 -------
solr/modules/opentelemetry/build.gradle | 3 -
.../pages/cluster-node-management.adoc | 13 +-
.../pages/distributed-tracing.adoc | 39 +---
.../pages/major-changes-in-solr-10.adoc | 7 +-
versions.lock | 13 +-
versions.props | 1 -
27 files changed, 21 insertions(+), 1084 deletions(-)
diff --git a/settings.gradle b/settings.gradle
index d6deb59e8c6..3e9b0c4e065 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -39,7 +39,6 @@ include "solr:modules:extraction"
include "solr:modules:gcs-repository"
include "solr:modules:hadoop-auth"
include "solr:modules:hdfs"
-include "solr:modules:jaegertracer-configurator"
include "solr:modules:jwt-auth"
include "solr:modules:langid"
include "solr:modules:ltr"
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 65cb827db4d..fe25dac5d6f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -22,6 +22,11 @@ Bug Fixes
---------------------
(No changes)
+Deprecation Removals
+----------------------
+
+* SOLR-16535: The 'jaegertracer-configurator' module is removed. Please use
'opentelemetry' (janhoy)
+
Other Changes
---------------------
diff --git a/solr/licenses/jaeger-core-1.8.1.jar.sha1
b/solr/licenses/jaeger-core-1.8.1.jar.sha1
deleted file mode 100644
index fafc780c242..00000000000
--- a/solr/licenses/jaeger-core-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-66a39fb4b4905b489b76b4a5910f466995a6707c
diff --git a/solr/licenses/jaeger-core-LICENSE-ASL.txt
b/solr/licenses/jaeger-core-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jaeger-core-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/solr/licenses/jaeger-core-NOTICE.txt
b/solr/licenses/jaeger-core-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/jaeger-thrift-1.8.1.jar.sha1
b/solr/licenses/jaeger-thrift-1.8.1.jar.sha1
deleted file mode 100644
index 0f4ddbdc600..00000000000
--- a/solr/licenses/jaeger-thrift-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e173aec5576da317aa61e9e3be795d6bd1758fca
diff --git a/solr/licenses/jaeger-thrift-LICENSE-ASL.txt
b/solr/licenses/jaeger-thrift-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/jaeger-thrift-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/solr/licenses/jaeger-thrift-NOTICE.txt
b/solr/licenses/jaeger-thrift-NOTICE.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/solr/licenses/libthrift-0.15.0.jar.sha1
b/solr/licenses/libthrift-0.15.0.jar.sha1
deleted file mode 100644
index 52ee86c18d5..00000000000
--- a/solr/licenses/libthrift-0.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-33f61a6ad11e6df132c387be18559514197fcd4e
diff --git a/solr/licenses/libthrift-LICENSE-ASL.txt
b/solr/licenses/libthrift-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/libthrift-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
diff --git a/solr/licenses/libthrift-NOTICE.txt
b/solr/licenses/libthrift-NOTICE.txt
deleted file mode 100644
index 994b0c63e1d..00000000000
--- a/solr/licenses/libthrift-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Thrift
-Copyright (C) 2006 - 2019, The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/solr/modules/jaegertracer-configurator/README.md
b/solr/modules/jaegertracer-configurator/README.md
deleted file mode 100644
index 3856ea1d673..00000000000
--- a/solr/modules/jaegertracer-configurator/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- 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.
--->
-
-Welcome to Apache Solr Jaeger Tracer Configurator
-========
-
-**WARNING**: This module is deprecated for removal in v10.0.
-
-Apache Solr Jaeger Tracer Configurator provides a way for you to expose Solr's
tracing to Jaeger.
-
-# Setup Jaeger Tracer Configurator
-
-Add this Solr Module to your Solr installation by enabling it via
`-Dsolr.modules=jaegertracer-configurator`
-
-There are a number of sampler's available to Jaeger. Learn more about the
available samplers at
https://www.jaegertracing.io/docs/sampling/#client-sampling-configuration.
-
-The Jaeger Tracer Configurator is added to `solr.xml` like this:
-
-```
-<tracerConfig name="tracerConfig"
class="org.apache.solr.jaeger.JaegerTracerConfigurator" />
-```
-
-There are no configuration elements in the XML; instead, this 3rd party system
is configured using System Properties or Environment Variables. The full list
are listed at
[Jaeger-README](https://github.com/jaegertracing/jaeger-client-java/blob/master/jaeger-core/README.md).
-For example, to use the probabilistic sampler, you could set this environment
variable:
-
-```
-export JAEGER_SAMPLER_TYPE=probabilistic
-```
-
-or System property:
-
-```
-bin/solr start -DJAEGER_SAMPLER_TYPE=probabilistic
-```
diff --git a/solr/modules/jaegertracer-configurator/build.gradle
b/solr/modules/jaegertracer-configurator/build.gradle
deleted file mode 100644
index 86e0d479ab3..00000000000
--- a/solr/modules/jaegertracer-configurator/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-apply plugin: 'java-library'
-
-description = 'Jaeger tracer configurator for tracing Solr using OpenTracing
with Jaeger backend'
-
-dependencies {
- implementation project(':solr:core')
-
- implementation 'io.opentracing:opentracing-api'
- implementation 'io.jaegertracing:jaeger-core'
- runtimeOnly ("io.jaegertracing:jaeger-thrift", {
- exclude group: "com.google.code.gson", module: "gson" // for
"RemoteControlledSampler", optional
- exclude group: "javax.annotation", module: "javax.annotation-api"
- exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"
- exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core"
- })
-
- testImplementation project(':solr:test-framework')
- testImplementation project(':solr:solrj')
- testImplementation
'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
- testImplementation 'junit:junit'
-}
diff --git
a/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
b/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
deleted file mode 100644
index d99f7848392..00000000000
---
a/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/JaegerTracerConfigurator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.solr.jaeger;
-
-import io.jaegertracing.Configuration;
-import io.opentracing.Tracer;
-import org.apache.solr.core.TracerConfigurator;
-
-/**
- * @deprecated This module will be removed in v10.0
- */
-@Deprecated(forRemoval = true, since = "9.2")
-public class JaegerTracerConfigurator extends TracerConfigurator {
-
- @Override
- public Tracer getTracer() {
- // See javadocs on Configuration for how to configure via sys props or env
vars
- return Configuration.fromEnv("solr").getTracer();
- }
-}
diff --git
a/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
b/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
deleted file mode 100644
index 84a1337f160..00000000000
---
a/solr/modules/jaegertracer-configurator/src/java/org/apache/solr/jaeger/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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/modules/jaegertracer-configurator/src/java/overview.html
b/solr/modules/jaegertracer-configurator/src/java/overview.html
deleted file mode 100644
index 4cd8d033cfb..00000000000
--- a/solr/modules/jaegertracer-configurator/src/java/overview.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- 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 module
-
-<p>
-This module provides provides a way for you to expose Solr's tracing to Jaeger.
-</p>
-
-</body>
-</html>
diff --git a/solr/modules/jaegertracer-configurator/src/test-files/log4j2.xml
b/solr/modules/jaegertracer-configurator/src/test-files/log4j2.xml
deleted file mode 100644
index 96f69f1dc8b..00000000000
--- a/solr/modules/jaegertracer-configurator/src/test-files/log4j2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
- -->
-<!-- We're configuring testing to be synchronous due to "logging polution",
see SOLR-13268 -->
-<Configuration>
- <Appenders>
- <Console name="STDERR" target="SYSTEM_ERR">
- <PatternLayout>
- <Pattern>
- %maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{
c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{
x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
- =>%ex{short}}}{10240}%n
- </Pattern>
- </PatternLayout>
- </Console>
- </Appenders>
- <Loggers>
- <!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous
logging or synchonous logging respectively -->
- <Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="org.apache.hadoop" level="WARN"/>
- <Logger name="org.apache.directory" level="WARN"/>
- <Logger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="org.eclipse.jetty" level="INFO"/>
-
- <Root level="INFO">
- <AppenderRef ref="STDERR"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git
a/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xml
b/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xml
deleted file mode 100644
index 4124feab0c3..00000000000
---
a/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/schema.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-<schema name="minimal" version="1.1">
- <fieldType name="string" class="solr.StrField"/>
- <fieldType name="int" class="${solr.tests.IntegerFieldType}"
docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
- <fieldType name="long" class="${solr.tests.LongFieldType}"
docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true"
positionIncrementGap="0"/>
- <dynamicField name="*" type="string" indexed="true" stored="true"/>
- <!-- for versioning -->
- <field name="_version_" type="long" indexed="true" stored="true"/>
- <field name="_root_" type="string" indexed="true" stored="true"
multiValued="false" required="false"/>
- <field name="id" type="string" indexed="true" stored="true"/>
- <dynamicField name="*_s" type="string" indexed="true" stored="true" />
- <uniqueKey>id</uniqueKey>
-</schema>
diff --git
a/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xml
b/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xml
deleted file mode 100644
index 853ba656241..00000000000
---
a/solr/modules/jaegertracer-configurator/src/test-files/solr/collection1/conf/solrconfig.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
- 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.
--->
-
-<!-- Minimal solrconfig.xml with /select, /admin and /update only -->
-
-<config>
-
- <dataDir>${solr.data.dir:}</dataDir>
-
- <directoryFactory name="DirectoryFactory"
-
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <schemaFactory class="ClassicIndexSchemaFactory"/>
-
- <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
-
- <updateHandler class="solr.DirectUpdateHandler2">
- <commitWithin>
- <softCommit>${solr.commitwithin.softcommit:true}</softCommit>
- </commitWithin>
- <updateLog class="${solr.ulog:solr.UpdateLog}"></updateLog>
- </updateHandler>
-
- <requestHandler name="/select" class="solr.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- <str name="indent">true</str>
- <str name="df">text</str>
- </lst>
-
- </requestHandler>
- <indexConfig>
- <mergeScheduler
class="${solr.mscheduler:org.apache.lucene.index.ConcurrentMergeScheduler}"/>
-: </indexConfig>
-</config>
-
diff --git
a/solr/modules/jaegertracer-configurator/src/test-files/solr/solr.xml
b/solr/modules/jaegertracer-configurator/src/test-files/solr/solr.xml
deleted file mode 100644
index 8a4c18eed64..00000000000
--- a/solr/modules/jaegertracer-configurator/src/test-files/solr/solr.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<!--
- solr.xml mimicking the old default solr.xml
--->
-
-<solr>
-
- <str name="shareSchema">${shareSchema:false}</str>
- <str name="configSetBaseDir">${configSetBaseDir:configsets}</str>
- <str name="coreRootDirectory">${coreRootDirectory:.}</str>
- <str
name="collectionsHandler">${collectionsHandler:solr.CollectionsHandler}</str>
- <str name="allowUrls">${solr.tests.allowUrls:}</str>
-
- <shardHandlerFactory name="shardHandlerFactory"
class="HttpShardHandlerFactory">
- <str name="urlScheme">${urlScheme:}</str>
- <int name="socketTimeout">${socketTimeout:90000}</int>
- <int name="connTimeout">${connTimeout:15000}</int>
- </shardHandlerFactory>
-
- <tracerConfig name="tracerConfig"
class="org.apache.solr.jaeger.JaegerTracerConfigurator" />
-
- <solrcloud>
- <str name="host">127.0.0.1</str>
- <int name="hostPort">${hostPort:8983}</int>
- <str name="hostContext">${hostContext:solr}</str>
- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
- <int name="leaderVoteWait">${leaderVoteWait:10000}</int>
- <int
name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
- <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
- <str
name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
- <str
name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
- <str
name="zkCredentialsInjector">${zkCredentialsInjector:org.apache.solr.common.cloud.DefaultZkCredentialsInjector}</str>
- </solrcloud>
- <metrics>
- <reporter name="default"
class="org.apache.solr.metrics.reporters.SolrJmxReporter">
- <str name="rootName">solr_${hostPort:8983}</str>
- </reporter>
- </metrics>
-</solr>
\ No newline at end of file
diff --git
a/solr/modules/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
b/solr/modules/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
deleted file mode 100644
index 4759c5ced19..00000000000
---
a/solr/modules/jaegertracer-configurator/src/test/org/apache/solr/jaeger/TestJaegerConfigurator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.solr.jaeger;
-
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-import io.opentracing.util.GlobalTracer;
-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.common.util.ExecutorUtil;
-import org.apache.solr.common.util.TimeSource;
-import org.apache.solr.util.TimeOut;
-import org.junit.Before;
-import org.junit.Test;
-
-@ThreadLeakLingering(linger = 10)
-public class TestJaegerConfigurator extends SolrTestCaseJ4 {
- @Before
- public void doBefore() {
- // to be safe because this test tests tracing.
- resetGlobalTracer();
- ExecutorUtil.resetThreadLocalProviders();
-
- // "remote" is the default sampler, however we want to use something
simpler in the tests.
- System.setProperty("JAEGER_SAMPLER_TYPE", "const");
- }
-
- @Test
- public void testInjected() throws Exception {
- MiniSolrCloudCluster cluster =
- new MiniSolrCloudCluster.Builder(2, createTempDir())
- .addConfig("config",
TEST_PATH().resolve("collection1").resolve("conf"))
- .withSolrXml(getFile("solr/solr.xml").toPath())
- .build();
- try {
- TimeOut timeOut = new TimeOut(2, TimeUnit.MINUTES, TimeSource.NANO_TIME);
- timeOut.waitFor(
- "Waiting for GlobalTracer is registered",
- () -> GlobalTracer.get().toString().contains("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();
- }
- }
-}
diff --git a/solr/modules/opentelemetry/build.gradle
b/solr/modules/opentelemetry/build.gradle
index a2e4f899d02..0018a710c6b 100644
--- a/solr/modules/opentelemetry/build.gradle
+++ b/solr/modules/opentelemetry/build.gradle
@@ -45,9 +45,6 @@ dependencies {
// See https://issues.apache.org/jira/browse/LOG4J2-3609 due to needing
these annotations
compileOnly 'org.apache.tomcat:annotations-api'
-
- // Both this and jaegertracer-configurator pull in
com.squareup.okhttp3:okhttp HTTP client and kotlin stdlib.
-
testImplementation project(':solr:test-framework')
testImplementation project(':solr:solrj')
testImplementation
'com.carrotsearch.randomizedtesting:randomizedtesting-runner'
diff --git
a/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adoc
b/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adoc
index c0abf5cffb7..d65acd96feb 100644
---
a/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adoc
+++
b/solr/solr-ref-guide/modules/deployment-guide/pages/cluster-node-management.adoc
@@ -165,9 +165,7 @@
http://localhost:8983/solr/admin/collections?action=CLUSTERSTATUS
"health": "GREEN",
"aliases":["both_collections"]
},
- "collection2":{
- "..."
- }
+ "collection2":{"key": "value"}
},
"aliases":{ "both_collections":"collection1,collection2" },
"roles":{
@@ -232,7 +230,6 @@ curl -X POST http://localhost:8983/api/cluster -H
'Content-Type: application/jso
+
The name of the property.
Supported properties names are `location`, `maxCoresPerNode`, `urlScheme`, and
`defaultShardPreferences`.
-If the xref:distributed-tracing.adoc[Jaeger tracing module] has been enabled,
the property `samplePercentage` is also available.
+
Other properties can be set (for example, if you need them for custom plugins)
but they must begin with the prefix `ext.`.
Unknown properties that don't begin with `ext.` will be rejected.
@@ -852,9 +849,8 @@
http://localhost:8983/solr/admin/collections?action=OVERSEERSTATUS
"95thPcRequestTime":0.519016,
"99thPcRequestTime":0.519016,
"999thPcRequestTime":0.519016},
- "removeshard",{
- "..."
- }],
+ "removeshard",{}
+ ],
"collection_operations":[
"splitshard",{
"requests":1,
@@ -882,7 +878,6 @@
http://localhost:8983/solr/admin/collections?action=OVERSEERSTATUS
],
"overseer_queue":[
"..."
- ],
- "..."
+ ]
}
----
diff --git
a/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
index 3303f11a346..2dd013ff1d7 100644
---
a/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
+++
b/solr/solr-ref-guide/modules/deployment-guide/pages/distributed-tracing.adoc
@@ -18,7 +18,7 @@
Solr includes a general tracing framework based on OpenTracing that can be
used to trace the lifecycle of a request for performance monitoring.
-Tracing data can be configured to send to various backends, either directly or
via an agent. Solr can send traces directly in OTLP/gRPC and Jaeger/Thrift
formats. You can support many other destinations and cloud providers by
installing an agent on each node and sending traces to localhost.
+Tracing data can be configured to send to various backends, either directly or
via an agent. Solr can send traces directly in OTLP/gRPC format. You can
support many other destinations and cloud providers by installing an agent on
each node and sending traces to localhost.
A sampled distributed tracing query request displayed in Jaeger UI looks like
this:
@@ -32,8 +32,6 @@ These are pluggable, and each plugin is shipped as a
xref:configuration-guide:so
**opentelemetry**: The `opentelemetry` module supports OTLP over gRPC or HTTP.
-**jaegertracer-configurator**: The `jaegertracer-configurator` module supports
the Jaeger format over the Thrift transport.
-
A setup of a `TracerConfigurator` in `solr.xml` looks like this:
[source,xml]
@@ -102,38 +100,3 @@ The OTEL tracer also supports other exporters like Jaeger
and Zipkin. However, S
OTEL_TRACES_EXPORTER=zipkin
OTEL_EXPORTER_ZIPKIN_ENDPOINT=http://localhost:9411/api/v2/spans
----
-
-== Jaeger Tracer Module
-
-[WARNING]
-====
-This module is deprecated as of Solr 9.2, and will be removed in version 10.
Users should migrate to OpenTelemetry.
-====
-
-The module `jagertracer-configurator` provides a default implementation for
setting up Jaeger Tracer. Enable the module with either system property
`-Dsolr.modules=jaegertracer-configurator` or environment variable
`SOLR_MODULES=jaegertracer-configurator`.
-
-Learn more about the available samplers at
https://www.jaegertracing.io/docs/sampling/#client-sampling-configuration.
-
-Then Jaeger tracer is configured in `solr.xml` like this:
-
-[source,xml]
-----
-<tracerConfig name="tracerConfig"
class="org.apache.solr.jaeger.JaegerTracerConfigurator" />
-----
-
-_There are no configuration elements in the XML_; instead, this 3rd party
system is configured using System Properties or Environment Variables.
-The full list are listed at
https://github.com/jaegertracing/jaeger-client-java/blob/master/jaeger-core/README.md[Jaeger-README].
-
-For example, to use the probabilistic sampler, you could set this environment
variable:
-
-[source,bash]
-----
-export JAEGER_SAMPLER_TYPE=probabilistic
-----
-
-or System property:
-
-[source,bash]
-----
-bin/solr start -DJAEGER_SAMPLER_TYPE=probabilistic
-----
diff --git
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
index e92dfc5a49b..9cad5587baf 100644
---
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
+++
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
@@ -28,4 +28,9 @@ Before starting an upgrade to this version of Solr, please
take the time to revi
=== SolrJ
-Starting in 10, the Maven POM for SolrJ does not refer to SolrJ modules like
ZooKeeper. If you require such functionality, you need to add additional
dependencies.
\ No newline at end of file
+Starting in 10, the Maven POM for SolrJ does not refer to SolrJ modules like
ZooKeeper. If you require such functionality, you need to add additional
dependencies.
+
+=== Deprecation removals
+
+The `jaegertracer-configurator` module, which was deprecated in 9.2, is
removed. Users should migrate to the `opentelemetry` module.
+
diff --git a/versions.lock b/versions.lock
index 73404aaf77a..07c5c4b7820 100644
--- a/versions.lock
+++ b/versions.lock
@@ -34,7 +34,7 @@ com.google.cloud:google-cloud-bom:0.178.0 (1 constraints:
7205bc40)
com.google.cloud:google-cloud-core:2.8.6 (3 constraints: cc2e39e1)
com.google.cloud:google-cloud-core-http:2.8.6 (1 constraints: f40ff795)
com.google.cloud:google-cloud-storage:2.11.3 (2 constraints: cf1cb826)
-com.google.code.gson:gson:2.9.1 (7 constraints: e9609e0f)
+com.google.code.gson:gson:2.9.1 (6 constraints: 6d543cd0)
com.google.errorprone:error_prone_annotations:2.16 (8 constraints: 4f591a61)
com.google.guava:failureaccess:1.0.1 (2 constraints: f9199e37)
com.google.guava:guava:31.1-jre (25 constraints: 756fc917)
@@ -62,7 +62,7 @@ com.mchange:mchange-commons-java:0.2.19 (1 constraints:
84075b75)
com.pff:java-libpst:0.9.3 (1 constraints: 630cfa01)
com.rometools:rome:1.18.0 (1 constraints: 910c870e)
com.rometools:rome-utils:1.18.0 (1 constraints: 10095d96)
-com.squareup.okhttp3:okhttp:4.10.0 (3 constraints: 1633e9ab)
+com.squareup.okhttp3:okhttp:4.10.0 (2 constraints: ad259100)
com.squareup.okio:okio:3.0.0 (1 constraints: 4d0c26fd)
com.squareup.okio:okio-jvm:3.0.0 (1 constraints: 4a0ac1b9)
com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35)
@@ -92,8 +92,6 @@ io.grpc:grpc-netty:1.50.2 (1 constraints: 3a053b3b)
io.grpc:grpc-protobuf:1.50.2 (1 constraints: 3a053b3b)
io.grpc:grpc-protobuf-lite:1.50.2 (1 constraints: 060adeb3)
io.grpc:grpc-stub:1.50.2 (1 constraints: 3a053b3b)
-io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721)
-io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936)
io.netty:netty-buffer:4.1.82.Final (10 constraints: 8e99b4d5)
io.netty:netty-codec:4.1.82.Final (5 constraints: 5145087b)
io.netty:netty-codec-http:4.1.82.Final (3 constraints: 492440eb)
@@ -128,9 +126,9 @@ io.opentelemetry:opentelemetry-sdk-logs:1.21.0-alpha (4
constraints: 295e5301)
io.opentelemetry:opentelemetry-sdk-metrics:1.21.0 (5 constraints: e1669a5a)
io.opentelemetry:opentelemetry-sdk-trace:1.21.0 (3 constraints: dc32bdaf)
io.opentelemetry:opentelemetry-semconv:1.21.0-alpha (5 constraints: ed6e375b)
-io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd)
+io.opentracing:opentracing-api:0.33.0 (5 constraints: 7244331d)
io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21)
-io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b)
+io.opentracing:opentracing-util:0.33.0 (2 constraints: 5013be5a)
io.perfmark:perfmark-api:0.25.0 (2 constraints: 0411f2f9)
io.prometheus:simpleclient:0.2.0 (3 constraints: fe242db8)
io.prometheus:simpleclient_common:0.2.0 (1 constraints: e51014af)
@@ -239,7 +237,6 @@ org.apache.sis.core:sis-referencing:1.2 (3 constraints:
4829fae1)
org.apache.sis.core:sis-utility:1.2 (4 constraints: 0b35ce5b)
org.apache.sis.storage:sis-netcdf:1.2 (1 constraints: fc0b54e9)
org.apache.sis.storage:sis-storage:1.2 (1 constraints: df0de432)
-org.apache.thrift:libthrift:0.15.0 (1 constraints: 900d0334)
org.apache.tika:tika-core:1.28.4 (2 constraints: d6116711)
org.apache.tika:tika-parsers:1.28.4 (1 constraints: 4105493b)
org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b)
@@ -335,7 +332,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints:
3c2b02fd)
org.semver4j:semver4j:2.2.0 (1 constraints: 0605fb35)
org.slf4j:jcl-over-slf4j:2.0.5 (3 constraints: cb17dfa5)
org.slf4j:jul-to-slf4j:2.0.5 (3 constraints: 2528cf47)
-org.slf4j:slf4j-api:2.0.5 (62 constraints: 203afdc4)
+org.slf4j:slf4j-api:2.0.5 (59 constraints: 6013f3b3)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index d48860fb213..f793207e99d 100644
--- a/versions.props
+++ b/versions.props
@@ -21,7 +21,6 @@ commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.11.0
io.dropwizard.metrics:*=4.2.12
io.grpc:grpc-*=1.50.2
-io.jaegertracing:*=1.8.1
io.netty:*=4.1.82.Final
io.opentelemetry:opentelemetry-bom-alpha=1.21.0-alpha
io.opentracing:*=0.33.0
