You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2023/01/05 23:46:04 UTC
[solr] branch branch_9x updated: SOLR-16532 New OTEL module with OTLP trace exporter (#1168)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 9ca91fd5f4e SOLR-16532 New OTEL module with OTLP trace exporter (#1168)
9ca91fd5f4e is described below
commit 9ca91fd5f4edd5e27288fe1f9a5cb7c7d95d5422
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Wed Jan 4 22:12:28 2023 +0100
SOLR-16532 New OTEL module with OTLP trace exporter (#1168)
Co-authored-by: Kevin Risden <kr...@apache.org>
---
settings.gradle | 1 +
solr/CHANGES.txt | 3 +
solr/licenses/annotations-4.1.1.4.jar.sha1 | 1 +
solr/licenses/annotations-api-6.0.53.jar.sha1 | 1 +
solr/licenses/grpc-LICENSE-ASL.txt | 610 +++++++++++++++++++++
.../{grpc-context-NOTICE.txt => grpc-NOTICE.txt} | 0
solr/licenses/grpc-api-1.50.2.jar.sha1 | 1 +
solr/licenses/grpc-context-1.48.0.jar.sha1 | 1 -
solr/licenses/grpc-context-1.50.2.jar.sha1 | 1 +
solr/licenses/grpc-core-1.50.2.jar.sha1 | 1 +
solr/licenses/grpc-netty-1.50.2.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-1.50.2.jar.sha1 | 1 +
solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1 | 1 +
solr/licenses/grpc-stub-1.50.2.jar.sha1 | 1 +
.../netty-codec-http2-4.1.82.Final.jar.sha1 | 1 +
.../netty-codec-socks-4.1.82.Final.jar.sha1 | 1 +
.../netty-handler-proxy-4.1.82.Final.jar.sha1 | 1 +
solr/licenses/okhttp-4.10.0.jar.sha1 | 1 +
solr/licenses/okhttp-4.9.3.jar.sha1 | 1 -
solr/licenses/okio-jvm-2.8.0.jar.sha1 | 1 -
solr/licenses/okio-jvm-3.0.0.jar.sha1 | 1 +
...CENSE-ASL.txt => opentelemetry-LICENSE-ASL.txt} | 3 +-
solr/licenses/opentelemetry-NOTICE.txt | 1 +
solr/licenses/opentelemetry-api-1.21.0.jar.sha1 | 1 +
.../opentelemetry-api-logs-1.21.0-alpha.jar.sha1 | 1 +
.../licenses/opentelemetry-context-1.21.0.jar.sha1 | 1 +
.../opentelemetry-exporter-common-1.21.0.jar.sha1 | 1 +
.../opentelemetry-exporter-otlp-1.21.0.jar.sha1 | 1 +
...ntelemetry-exporter-otlp-common-1.21.0.jar.sha1 | 1 +
...elemetry-opentracing-shim-1.21.0-alpha.jar.sha1 | 1 +
solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1 | 1 +
.../opentelemetry-sdk-common-1.21.0.jar.sha1 | 1 +
...k-extension-autoconfigure-1.21.0-alpha.jar.sha1 | 1 +
...sdk-extension-autoconfigure-spi-1.21.0.jar.sha1 | 1 +
.../opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1 | 1 +
.../opentelemetry-sdk-metrics-1.21.0.jar.sha1 | 1 +
.../opentelemetry-sdk-trace-1.21.0.jar.sha1 | 1 +
.../opentelemetry-semconv-1.21.0-alpha.jar.sha1 | 1 +
...xt-LICENSE-ASL.txt => perfmark-LICENSE-ASL.txt} | 3 +-
solr/licenses/perfmark-NOTICE.txt | 41 ++
solr/licenses/perfmark-api-0.25.0.jar.sha1 | 1 +
solr/modules/opentelemetry/README.md | 26 +
solr/modules/opentelemetry/build.gradle | 56 ++
.../solr/opentelemetry/ClosableTracerShim.java | 85 +++
.../solr/opentelemetry/OtelTracerConfigurator.java | 138 +++++
.../apache/solr/opentelemetry/package-info.java | 19 +
solr/modules/opentelemetry/src/java/overview.html | 19 +
.../opentelemetry/src/test-files/log4j2.xml | 42 ++
.../test-files/solr/collection1/conf/schema.xml | 29 +
.../solr/collection1/conf/solrconfig.xml | 51 ++
.../opentelemetry/src/test-files/solr/solr.xml | 57 ++
.../opentelemetry/OtelTracerConfiguratorTest.java | 105 ++++
solr/solr-ref-guide/antora.template.yml | 1 +
solr/solr-ref-guide/antora.yml | 9 +-
solr/solr-ref-guide/build.gradle | 1 +
.../pages/distributed-tracing.adoc | 82 ++-
versions.lock | 72 ++-
versions.props | 3 +
58 files changed, 1443 insertions(+), 47 deletions(-)
diff --git a/settings.gradle b/settings.gradle
index 1ae8f59846c..d6deb59e8c6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,6 +34,7 @@ include "solr:server"
include "solr:modules:analysis-extras"
include "solr:modules:analytics"
include "solr:modules:clustering"
+include "solr:modules:opentelemetry"
include "solr:modules:extraction"
include "solr:modules:gcs-repository"
include "solr:modules:hadoop-auth"
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 22710b25e8a..86acd429dfe 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -5,6 +5,7 @@ Most people will find the solr-upgrade-notes.adoc file more approachable.
https://github.com/apache/solr/blob/main/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
================== 9.2.0 ==================
+
New Features
---------------------
@@ -16,6 +17,8 @@ New Features
* SOLR-16409: Admin UI - Expose all highlighting parameters in the Query UI (Jeanie Lam via Eric Pugh)
+* SOLR-16532: New OpenTelemetry (OTEL) module with OTLP/gRPC trace exporter. See ref.guide. (janhoy, David Smiley)
+
Improvements
---------------------
diff --git a/solr/licenses/annotations-4.1.1.4.jar.sha1 b/solr/licenses/annotations-4.1.1.4.jar.sha1
new file mode 100644
index 00000000000..519125fc604
--- /dev/null
+++ b/solr/licenses/annotations-4.1.1.4.jar.sha1
@@ -0,0 +1 @@
+a1678ba907bf92691d879fef34e1a187038f9259
diff --git a/solr/licenses/annotations-api-6.0.53.jar.sha1 b/solr/licenses/annotations-api-6.0.53.jar.sha1
new file mode 100644
index 00000000000..b8336434402
--- /dev/null
+++ b/solr/licenses/annotations-api-6.0.53.jar.sha1
@@ -0,0 +1 @@
+94cfa8a6ebc6b36e966bff433d4eeebf933f3f41
diff --git a/solr/licenses/grpc-LICENSE-ASL.txt b/solr/licenses/grpc-LICENSE-ASL.txt
new file mode 100644
index 00000000000..ec78c94c191
--- /dev/null
+++ b/solr/licenses/grpc-LICENSE-ASL.txt
@@ -0,0 +1,610 @@
+
+ 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.
+
+-----------------------------------------------------------
+
+BSD 3-Clause License
+
+Copyright 2016, Google Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+-----------------------------------------------------------
+
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/solr/licenses/grpc-context-NOTICE.txt b/solr/licenses/grpc-NOTICE.txt
similarity index 100%
rename from solr/licenses/grpc-context-NOTICE.txt
rename to solr/licenses/grpc-NOTICE.txt
diff --git a/solr/licenses/grpc-api-1.50.2.jar.sha1 b/solr/licenses/grpc-api-1.50.2.jar.sha1
new file mode 100644
index 00000000000..159166cfae2
--- /dev/null
+++ b/solr/licenses/grpc-api-1.50.2.jar.sha1
@@ -0,0 +1 @@
+8840eef194d786b8d97d820b8ad4efd219553b59
diff --git a/solr/licenses/grpc-context-1.48.0.jar.sha1 b/solr/licenses/grpc-context-1.48.0.jar.sha1
deleted file mode 100644
index 589caacb3ed..00000000000
--- a/solr/licenses/grpc-context-1.48.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58129c050c0dcc306abab5b5fa5f2f8f186423de
diff --git a/solr/licenses/grpc-context-1.50.2.jar.sha1 b/solr/licenses/grpc-context-1.50.2.jar.sha1
new file mode 100644
index 00000000000..51eee9c868b
--- /dev/null
+++ b/solr/licenses/grpc-context-1.50.2.jar.sha1
@@ -0,0 +1 @@
+ad433a34210e1d02e1e208c32b6a69886b64c8cb
diff --git a/solr/licenses/grpc-core-1.50.2.jar.sha1 b/solr/licenses/grpc-core-1.50.2.jar.sha1
new file mode 100644
index 00000000000..dba2086554d
--- /dev/null
+++ b/solr/licenses/grpc-core-1.50.2.jar.sha1
@@ -0,0 +1 @@
+848c5243dc4a69553953faf1cb1de4d01f87b602
diff --git a/solr/licenses/grpc-netty-1.50.2.jar.sha1 b/solr/licenses/grpc-netty-1.50.2.jar.sha1
new file mode 100644
index 00000000000..de7352509a3
--- /dev/null
+++ b/solr/licenses/grpc-netty-1.50.2.jar.sha1
@@ -0,0 +1 @@
+5079c023b7f914f6af6f624ee60333442d7cd7a2
diff --git a/solr/licenses/grpc-protobuf-1.50.2.jar.sha1 b/solr/licenses/grpc-protobuf-1.50.2.jar.sha1
new file mode 100644
index 00000000000..aea7ddf832a
--- /dev/null
+++ b/solr/licenses/grpc-protobuf-1.50.2.jar.sha1
@@ -0,0 +1 @@
+3e8b75be934471c20d76e85e4c411d164d07b219
diff --git a/solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1
new file mode 100644
index 00000000000..5c9602137a9
--- /dev/null
+++ b/solr/licenses/grpc-protobuf-lite-1.50.2.jar.sha1
@@ -0,0 +1 @@
+1cdfb6ec3de18836c00175e81607b57122757d48
diff --git a/solr/licenses/grpc-stub-1.50.2.jar.sha1 b/solr/licenses/grpc-stub-1.50.2.jar.sha1
new file mode 100644
index 00000000000..3855e7d72aa
--- /dev/null
+++ b/solr/licenses/grpc-stub-1.50.2.jar.sha1
@@ -0,0 +1 @@
+5b114195e7f426b9df1b093a618b80a8a8711b19
diff --git a/solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1
new file mode 100644
index 00000000000..ad30b032333
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1
@@ -0,0 +1 @@
+238798287388d7b2f5ab309b941b513956649c92
diff --git a/solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1
new file mode 100644
index 00000000000..0f554bf01f3
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1
@@ -0,0 +1 @@
+a25236fd9c8ecda6eb811d914bf4a875f523ce0a
diff --git a/solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1
new file mode 100644
index 00000000000..4a4a43e204e
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1
@@ -0,0 +1 @@
+14e417ea8bf374309040e39a9726d446724438f9
diff --git a/solr/licenses/okhttp-4.10.0.jar.sha1 b/solr/licenses/okhttp-4.10.0.jar.sha1
new file mode 100644
index 00000000000..16cf73975de
--- /dev/null
+++ b/solr/licenses/okhttp-4.10.0.jar.sha1
@@ -0,0 +1 @@
+cd63657ac15770ed1420647154c9f44645533bef
diff --git a/solr/licenses/okhttp-4.9.3.jar.sha1 b/solr/licenses/okhttp-4.9.3.jar.sha1
deleted file mode 100644
index 07197f8a379..00000000000
--- a/solr/licenses/okhttp-4.9.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b0b14b3d12980912723fb8b66afb48dcda742fcb
diff --git a/solr/licenses/okio-jvm-2.8.0.jar.sha1 b/solr/licenses/okio-jvm-2.8.0.jar.sha1
deleted file mode 100644
index 0da7abb64a8..00000000000
--- a/solr/licenses/okio-jvm-2.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49b64e09d81c0cc84b267edd0c2fd7df5a64c78c
diff --git a/solr/licenses/okio-jvm-3.0.0.jar.sha1 b/solr/licenses/okio-jvm-3.0.0.jar.sha1
new file mode 100644
index 00000000000..663b07539a3
--- /dev/null
+++ b/solr/licenses/okio-jvm-3.0.0.jar.sha1
@@ -0,0 +1 @@
+0ab5a73fa2ccb4a36b0b5c69fe10b16d0255bcf8
diff --git a/solr/licenses/grpc-context-LICENSE-ASL.txt b/solr/licenses/opentelemetry-LICENSE-ASL.txt
similarity index 99%
copy from solr/licenses/grpc-context-LICENSE-ASL.txt
copy to solr/licenses/opentelemetry-LICENSE-ASL.txt
index d6456956733..f49a4e16e68 100644
--- a/solr/licenses/grpc-context-LICENSE-ASL.txt
+++ b/solr/licenses/opentelemetry-LICENSE-ASL.txt
@@ -1,4 +1,3 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -199,4 +198,4 @@
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.
+ limitations under the License.
\ No newline at end of file
diff --git a/solr/licenses/opentelemetry-NOTICE.txt b/solr/licenses/opentelemetry-NOTICE.txt
new file mode 100644
index 00000000000..c5fd5b43efd
--- /dev/null
+++ b/solr/licenses/opentelemetry-NOTICE.txt
@@ -0,0 +1 @@
+Copyright 2020-2022, OpenTelemetry Authors
\ No newline at end of file
diff --git a/solr/licenses/opentelemetry-api-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.21.0.jar.sha1
new file mode 100644
index 00000000000..a745b7e36c0
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-1.21.0.jar.sha1
@@ -0,0 +1 @@
+1e3d45bf10061c31179b0d287da83699090b399d
diff --git a/solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1
new file mode 100644
index 00000000000..1db5505ceb6
--- /dev/null
+++ b/solr/licenses/opentelemetry-api-logs-1.21.0-alpha.jar.sha1
@@ -0,0 +1 @@
+74cf69b29832c134c1ac539ef1fc047f96c39fca
diff --git a/solr/licenses/opentelemetry-context-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.21.0.jar.sha1
new file mode 100644
index 00000000000..87cc9b62d69
--- /dev/null
+++ b/solr/licenses/opentelemetry-context-1.21.0.jar.sha1
@@ -0,0 +1 @@
+3b26607d39336dfd092e5d4dc148c9e1f3d8043b
diff --git a/solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1
new file mode 100644
index 00000000000..8282877f6a2
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-common-1.21.0.jar.sha1
@@ -0,0 +1 @@
+d92b4897c6b07f5a452d7a9b6d0f7b010596c31f
diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1
new file mode 100644
index 00000000000..9b028264554
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-1.21.0.jar.sha1
@@ -0,0 +1 @@
+10fae1d61b7901f4d50baf3f9bcc959ad08d7142
diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1
new file mode 100644
index 00000000000..774691534ce
--- /dev/null
+++ b/solr/licenses/opentelemetry-exporter-otlp-common-1.21.0.jar.sha1
@@ -0,0 +1 @@
+d378982284bcb440d2529341ce66e18a4d4cd6ff
diff --git a/solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1
new file mode 100644
index 00000000000..a156a8c7526
--- /dev/null
+++ b/solr/licenses/opentelemetry-opentracing-shim-1.21.0-alpha.jar.sha1
@@ -0,0 +1 @@
+321f54fc7a0ad717a8eda466d682e78fa140957b
diff --git a/solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1
new file mode 100644
index 00000000000..e68cdab696d
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-1.21.0.jar.sha1
@@ -0,0 +1 @@
+881e035b0bac54a2b1f73a226cc96267065347d9
diff --git a/solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1
new file mode 100644
index 00000000000..12f69983134
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-common-1.21.0.jar.sha1
@@ -0,0 +1 @@
+3b04a4f6e54aa30b02b86f60b4346a99750fb73b
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1
new file mode 100644
index 00000000000..94eb09c3eb0
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.21.0-alpha.jar.sha1
@@ -0,0 +1 @@
+b36c7b9009f060b355b301d31ff6ecd68490d8d3
diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1
new file mode 100644
index 00000000000..f68de258d2d
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.21.0.jar.sha1
@@ -0,0 +1 @@
+7264cbab013612395043985293ca63acd9d00e4a
diff --git a/solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1
new file mode 100644
index 00000000000..94257a0b2a8
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-logs-1.21.0-alpha.jar.sha1
@@ -0,0 +1 @@
+afa30fc84dae4d46b473de5977574d719a6cadd1
diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1
new file mode 100644
index 00000000000..36a3e08b603
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-metrics-1.21.0.jar.sha1
@@ -0,0 +1 @@
+b1c254f525c442e7725c0ab6836a5c3df10fda3f
diff --git a/solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1
new file mode 100644
index 00000000000..fc78bc73977
--- /dev/null
+++ b/solr/licenses/opentelemetry-sdk-trace-1.21.0.jar.sha1
@@ -0,0 +1 @@
+83a6f03af6dbab00409ecc96087269bbfa9a8cc7
diff --git a/solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1
new file mode 100644
index 00000000000..a8fa3b33d98
--- /dev/null
+++ b/solr/licenses/opentelemetry-semconv-1.21.0-alpha.jar.sha1
@@ -0,0 +1 @@
+1c89d57f157d4da3a2306b23bf6366d036a70f05
diff --git a/solr/licenses/grpc-context-LICENSE-ASL.txt b/solr/licenses/perfmark-LICENSE-ASL.txt
similarity index 99%
rename from solr/licenses/grpc-context-LICENSE-ASL.txt
rename to solr/licenses/perfmark-LICENSE-ASL.txt
index d6456956733..f49a4e16e68 100644
--- a/solr/licenses/grpc-context-LICENSE-ASL.txt
+++ b/solr/licenses/perfmark-LICENSE-ASL.txt
@@ -1,4 +1,3 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -199,4 +198,4 @@
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.
+ limitations under the License.
\ No newline at end of file
diff --git a/solr/licenses/perfmark-NOTICE.txt b/solr/licenses/perfmark-NOTICE.txt
new file mode 100644
index 00000000000..04fbb4e692e
--- /dev/null
+++ b/solr/licenses/perfmark-NOTICE.txt
@@ -0,0 +1,41 @@
+
+Copyright 2019 Google LLC
+
+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.
+
+-----------------------------------------------------------------------
+
+This product contains a modified portion of 'Catapult', an open source
+Trace Event viewer for Chome, Linux, and Android applications, which can
+be obtained at:
+
+ * LICENSE:
+ * traceviewer/src/main/resources/io/perfmark/traceviewer/third_party/catapult/LICENSE (New BSD License)
+ * HOMEPAGE:
+ * https://github.com/catapult-project/catapult
+
+This product contains a modified portion of 'Polymer', a library for Web
+Components, which can be obtained at:
+ * LICENSE:
+ * traceviewer/src/main/resources/io/perfmark/traceviewer/third_party/polymer/LICENSE (New BSD License)
+ * HOMEPAGE:
+ * https://github.com/Polymer/polymer
+
+
+This product contains a modified portion of 'ASM', an open source
+Java Bytecode library, which can be obtained at:
+
+ * LICENSE:
+ * agent/src/main/resources/io/perfmark/agent/third_party/asm/LICENSE (BSD style License)
+ * HOMEPAGE:
+ * https://asm.ow2.io/
\ No newline at end of file
diff --git a/solr/licenses/perfmark-api-0.25.0.jar.sha1 b/solr/licenses/perfmark-api-0.25.0.jar.sha1
new file mode 100644
index 00000000000..d5dfe856ad5
--- /dev/null
+++ b/solr/licenses/perfmark-api-0.25.0.jar.sha1
@@ -0,0 +1 @@
+340a0c3d81cdcd9ecd7dc2ae00fb2633b469b157
diff --git a/solr/modules/opentelemetry/README.md b/solr/modules/opentelemetry/README.md
new file mode 100644
index 00000000000..9e7a1a65d84
--- /dev/null
+++ b/solr/modules/opentelemetry/README.md
@@ -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.
+-->
+
+Apache Solr Open Telemetry Tracer
+=====================================
+
+Introduction
+------------
+This module brings support for the new [OTEL](https://opentelemetry.io) (OpenTelemetry) standard,
+and exposes a tracer configurator that can be enabled in the
+`<tracerConfig>` tag of `solr.xml`. Please see Solr Reference Guide chapter "Distributed Tracing"
+for details.
\ No newline at end of file
diff --git a/solr/modules/opentelemetry/build.gradle b/solr/modules/opentelemetry/build.gradle
new file mode 100644
index 00000000000..a2e4f899d02
--- /dev/null
+++ b/solr/modules/opentelemetry/build.gradle
@@ -0,0 +1,56 @@
+/*
+ * 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 = 'Open Telemetry (OTEL) tracer'
+
+dependencies {
+ implementation project(':solr:core')
+
+ implementation platform('io.opentelemetry:opentelemetry-bom-alpha')
+
+ implementation 'io.opentracing:opentracing-api'
+ implementation 'org.slf4j:slf4j-api'
+
+ implementation 'io.opentelemetry:opentelemetry-sdk'
+ implementation 'io.opentelemetry:opentelemetry-sdk-trace'
+ implementation 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure'
+ implementation 'io.opentelemetry:opentelemetry-opentracing-shim'
+ runtimeOnly 'io.opentelemetry:opentelemetry-semconv'
+ runtimeOnly 'io.opentelemetry:opentelemetry-exporter-otlp'
+ // End users must recompile with jaeger exporter and/or zipkin exporter if they need these
+
+ // NOTE: sdk-autoconfigure needs both opentelemetry-sdk-metrics and opentelemetry-sdk-logs even if we don't use them
+
+ // gRPC transport via netty - since we already ship netty this is more lightweight than netty-shaded
+ runtimeOnly 'io.grpc:grpc-netty'
+ runtimeOnly 'io.grpc:grpc-protobuf'
+ runtimeOnly 'io.grpc:grpc-stub'
+ runtimeOnly 'io.grpc:grpc-context'
+ // 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'
+ testImplementation 'junit:junit'
+ testImplementation 'io.opentracing:opentracing-util'
+}
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java
new file mode 100644
index 00000000000..b368941fd0c
--- /dev/null
+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java
@@ -0,0 +1,85 @@
+/*
+ * 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.opentelemetry;
+
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentracing.Scope;
+import io.opentracing.ScopeManager;
+import io.opentracing.Span;
+import io.opentracing.SpanContext;
+import io.opentracing.Tracer;
+import io.opentracing.propagation.Format;
+import java.lang.invoke.MethodHandles;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Delegate shim that forwards all calls to the actual {@link
+ * io.opentelemetry.opentracingshim.OpenTracingShim}, and in addition calls {@link
+ * SdkTracerProvider#close()} to really close the OTEL SDK tracer when the OT shim is closed.
+ *
+ * <p>TODO: This can be removed once we migrate Solr instrumentation from OpenTracing to
+ * OpenTelemetry
+ */
+public class ClosableTracerShim implements Tracer {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private final Tracer shim;
+ private final SdkTracerProvider sdkTracerProvider;
+
+ public ClosableTracerShim(Tracer shim, SdkTracerProvider sdkTracerProvider) {
+ this.shim = shim;
+ this.sdkTracerProvider = sdkTracerProvider;
+ }
+
+ @Override
+ public ScopeManager scopeManager() {
+ return shim.scopeManager();
+ }
+
+ @Override
+ public Span activeSpan() {
+ return shim.activeSpan();
+ }
+
+ @Override
+ public Scope activateSpan(Span span) {
+ return shim.activateSpan(span);
+ }
+
+ @Override
+ public SpanBuilder buildSpan(String operationName) {
+ return shim.buildSpan(operationName);
+ }
+
+ @Override
+ public <C> void inject(SpanContext spanContext, Format<C> format, C carrier) {
+ shim.inject(spanContext, format, carrier);
+ }
+
+ @Override
+ public <C> SpanContext extract(Format<C> format, C carrier) {
+ return shim.extract(format, carrier);
+ }
+
+ @Override
+ public void close() {
+ shim.close();
+ log.info("Closing wrapped OTEL tracer instance.");
+ sdkTracerProvider.forceFlush();
+ sdkTracerProvider.close();
+ }
+}
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
new file mode 100644
index 00000000000..a2f97931abb
--- /dev/null
+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java
@@ -0,0 +1,138 @@
+/*
+ * 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.opentelemetry;
+
+import io.opentelemetry.opentracingshim.OpenTracingShim;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentracing.Tracer;
+import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import org.apache.solr.core.TracerConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * OpenTracing TracerConfigurator implementation which exports spans to OpenTelemetry in OTLP
+ * format. This impl re-uses the existing OpenTracing instrumentation through a shim, and takes care
+ * of properly closing the backing Tracer when Solr shuts down.
+ */
+public class OtelTracerConfigurator extends TracerConfigurator {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ // Copy of environment. Can be overridden by tests
+ Map<String, String> currentEnv = System.getenv();
+
+ @Override
+ public Tracer getTracer() {
+ setDefaultIfNotConfigured("OTEL_SERVICE_NAME", "solr");
+ setDefaultIfNotConfigured("OTEL_TRACES_EXPORTER", "otlp");
+ setDefaultIfNotConfigured("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
+ setDefaultIfNotConfigured("OTEL_TRACES_SAMPLER", "parentbased_always_on");
+
+ final String currentConfig =
+ String.join(
+ "; ",
+ getCurrentOtelConfig().entrySet().stream()
+ .map(e -> e.getKey() + "=" + e.getValue())
+ .collect(Collectors.toSet()));
+
+ log.info("OpenTelemetry tracer enabled with configuration: {}", currentConfig);
+
+ // Need to disable the exporters for metrics and logs
+ String metricsExporter = getEnvOrSysprop("OTEL_METRICS_EXPORTER");
+ String logsExporter = getEnvOrSysprop("OTEL_LOGS_EXPORTER");
+ if ((metricsExporter != null && !Objects.equals(metricsExporter, "none"))
+ || (logsExporter != null && !Objects.equals(logsExporter, "none"))) {
+ log.warn(
+ "The opentelemetry module does not support METRICS or LOGS. Ignoring faulty environment setting");
+ }
+ System.setProperty("otel.metrics.exporter", "none");
+ System.setProperty("otel.logs.exporter", "none");
+
+ OpenTelemetrySdk otelSdk = AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk();
+ Tracer shim = OpenTracingShim.createTracerShim(otelSdk);
+ return new ClosableTracerShim(shim, otelSdk.getSdkTracerProvider());
+ }
+
+ /**
+ * Finds all configuration based on environment with prefix <code>OTEL_</code> or System
+ * Properties with prefix <code>otel.</code>.
+ *
+ * @return a unified map of config, using the ENV_VAR as keys, even if the config was pulled from
+ * a system property.
+ */
+ Map<String, String> getCurrentOtelConfig() {
+ HashMap<String, String> currentConfig = new HashMap<>();
+ currentEnv.entrySet().stream()
+ .filter(e -> e.getKey().startsWith("OTEL_"))
+ .forEach(entry -> currentConfig.put(entry.getKey(), entry.getValue()));
+ System.getProperties().entrySet().stream()
+ .filter(e -> e.getKey().toString().startsWith("otel."))
+ .forEach(
+ entry -> {
+ String key = entry.getKey().toString();
+ String envKey = key.toUpperCase(Locale.ROOT).replace('.', '_');
+ String value = entry.getValue().toString();
+ currentConfig.put(envKey, value);
+ });
+ return currentConfig;
+ }
+
+ /**
+ * Returns system property if found, else returns environment variable, or null if none found.
+ *
+ * @param envName the environment to look for
+ * @return the resolved value
+ */
+ String getEnvOrSysprop(String envName) {
+ String envValue = currentEnv.get(envName);
+ String propValue = System.getProperty(envNameToSyspropName(envName));
+ return propValue != null ? propValue : envValue;
+ }
+
+ /**
+ * In OTEL Java SDK there is a convention that the java property name for OTEL_FOO_BAR is
+ * otel.foo.bar
+ *
+ * @param envName the environmnet name to convert
+ * @return the corresponding sysprop name
+ */
+ static String envNameToSyspropName(String envName) {
+ return envName.toLowerCase(Locale.ROOT).replace("_", ".");
+ }
+
+ /**
+ * First checks if the property is defined in environment or properties. If not, we set it as a
+ * property.
+ *
+ * @param envName environment variable name, should start with OTEL_
+ * @param defaultValue the value to set if not already configured
+ */
+ void setDefaultIfNotConfigured(String envName, String defaultValue) {
+ String incomingValue = getEnvOrSysprop(envName);
+ if (incomingValue == null) {
+ System.setProperty(envNameToSyspropName(envName), defaultValue);
+ if (log.isDebugEnabled()) {
+ log.debug("Using default setting {}={}", envName, getEnvOrSysprop(envName));
+ }
+ }
+ }
+}
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/package-info.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/package-info.java
new file mode 100644
index 00000000000..f638a595efe
--- /dev/null
+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+/** OpenTelemetry Tracer Configurator. */
+package org.apache.solr.opentelemetry;
diff --git a/solr/modules/opentelemetry/src/java/overview.html b/solr/modules/opentelemetry/src/java/overview.html
new file mode 100644
index 00000000000..50f0d24fbea
--- /dev/null
+++ b/solr/modules/opentelemetry/src/java/overview.html
@@ -0,0 +1,19 @@
+<!--
+ 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: Open Telemetry (OTEL) Tracer
+</body>
+</html>
\ No newline at end of file
diff --git a/solr/modules/opentelemetry/src/test-files/log4j2.xml b/solr/modules/opentelemetry/src/test-files/log4j2.xml
new file mode 100644
index 00000000000..96f69f1dc8b
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test-files/log4j2.xml
@@ -0,0 +1,42 @@
+<?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/opentelemetry/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml
new file mode 100644
index 00000000000..4124feab0c3
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml
@@ -0,0 +1,29 @@
+<?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/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml
new file mode 100644
index 00000000000..853ba656241
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -0,0 +1,51 @@
+<?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/opentelemetry/src/test-files/solr/solr.xml b/solr/modules/opentelemetry/src/test-files/solr/solr.xml
new file mode 100644
index 00000000000..725934bd0a6
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test-files/solr/solr.xml
@@ -0,0 +1,57 @@
+<?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.opentelemetry.OtelTracerConfigurator" />
+
+ <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/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
new file mode 100644
index 00000000000..69c7d96cc97
--- /dev/null
+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.opentelemetry;
+
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+import io.opentracing.util.GlobalTracer;
+import java.util.Map;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.cloud.MiniSolrCloudCluster;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+@ThreadLeakLingering(linger = 10)
+public class OtelTracerConfiguratorTest extends SolrTestCaseJ4 {
+ private OtelTracerConfigurator instance;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ instance = new OtelTracerConfigurator();
+ instance.currentEnv =
+ Map.of(
+ "OTELNOTHERE", "foo",
+ "OTEL_K1", "env-k1",
+ "OTEL_K2", "env-k2");
+ System.setProperty("otelnothere", "bar");
+ System.setProperty("otel.k1", "prop-k1");
+ System.setProperty("otel.k3", "prop-k3");
+
+ // to be safe because this test tests tracing.
+ resetGlobalTracer();
+ ExecutorUtil.resetThreadLocalProviders();
+ }
+
+ @Override
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ System.clearProperty("otelnothere");
+ System.clearProperty("otel.k1");
+ System.clearProperty("otel.k3");
+ System.clearProperty("otel.bsp.export.timeout");
+ }
+
+ @Test
+ public void testGetCurrentOtelConfig() {
+ Map<String, String> expected =
+ Map.of(
+ "OTEL_K1", "prop-k1",
+ "OTEL_K2", "env-k2",
+ "OTEL_K3", "prop-k3");
+ assertEquals(expected, instance.getCurrentOtelConfig());
+ }
+
+ @Test
+ public void testGetEnvOrSysprop() {
+ assertEquals("prop-k1", instance.getEnvOrSysprop("OTEL_K1"));
+ assertEquals("env-k2", instance.getEnvOrSysprop("OTEL_K2"));
+ assertNull(instance.getEnvOrSysprop("NOTEXIST"));
+ }
+
+ @Test
+ public void testSetDefaultIfNotConfigured() {
+ instance.setDefaultIfNotConfigured("OTEL_K2", "default");
+ instance.setDefaultIfNotConfigured("OTEL_YEY", "default");
+ assertEquals("default", instance.getCurrentOtelConfig().get("OTEL_YEY"));
+ assertEquals("prop-k1", instance.getCurrentOtelConfig().get("OTEL_K1"));
+ }
+
+ @Test
+ public void testInjected() throws Exception {
+ // Make sure the batch exporter times out before our thread lingering time of 10s
+ instance.setDefaultIfNotConfigured("OTEL_BSP_SCHEDULE_DELAY", "1000");
+ instance.setDefaultIfNotConfigured("OTEL_BSP_EXPORT_TIMEOUT", "2000");
+ MiniSolrCloudCluster cluster =
+ new MiniSolrCloudCluster.Builder(2, createTempDir())
+ .addConfig("config", TEST_PATH().resolve("collection1").resolve("conf"))
+ .withSolrXml(getFile("solr/solr.xml").toPath())
+ .build();
+ try {
+ assertTrue(
+ "Tracer shim not registered with GlobalTracer",
+ GlobalTracer.get().toString().contains("ClosableTracerShim"));
+ } finally {
+ cluster.shutdown();
+ }
+ }
+}
diff --git a/solr/solr-ref-guide/antora.template.yml b/solr/solr-ref-guide/antora.template.yml
index 459a250fca5..c600c494aad 100644
--- a/solr/solr-ref-guide/antora.template.yml
+++ b/solr/solr-ref-guide/antora.template.yml
@@ -53,3 +53,4 @@ asciidoc:
dep-version-tika: '${dep_version_tika}'
dep-version-zookeeper: '${dep_version_zookeeper}'
dep-version-lucene: '${dep_version_lucene}'
+ dep-version-opentelemetry: '${dep_version_opentelemetry}'
\ No newline at end of file
diff --git a/solr/solr-ref-guide/antora.yml b/solr/solr-ref-guide/antora.yml
index 96bd5732251..6301ff6791c 100644
--- a/solr/solr-ref-guide/antora.yml
+++ b/solr/solr-ref-guide/antora.yml
@@ -40,16 +40,17 @@ asciidoc:
# 'patch-version' is the 'z' part of x.y.z semantic version
page-solr-javadocs: 'https://solr.apache.org/docs/9_2_0'
solr-javadocs: 'https://solr.apache.org/docs/9_2_0'
- lucene-javadocs: 'https://lucene.apache.org/core/9_4_0'
+ lucene-javadocs: 'https://lucene.apache.org/core/9_4_2'
java-javadocs: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/
solr-docs-version: '9.2'
solr-full-version: '9.2.0'
dep-version-commons-codec: '1.15'
- dep-version-dropwizard: '4.1.5'
+ dep-version-dropwizard: '4.2.12'
dep-version-hadoop: '3.3.4'
- dep-version-log4j: '2.17.2'
+ dep-version-log4j: '2.19.0'
dep-version-opennlp: '1.9.4'
dep-version-tika: '1.28.4'
dep-version-zookeeper: '3.8.0'
- dep-version-lucene: '9.4.0'
+ dep-version-lucene: '9.4.2'
+ dep-version-opentelemetry: '1.21.0'
\ No newline at end of file
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index a56b9c2677b..5ef2ade7e60 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -126,6 +126,7 @@ task buildLocalAntoraYaml {
["dep_version_tika", "org.apache.tika", "tika-core"],
["dep_version_zookeeper", "org.apache.zookeeper", "zookeeper"],
["dep_version_lucene", "org.apache.lucene", "lucene-core"],
+ ["dep_version_opentelemetry", "io.opentelemetry", "opentelemetry-sdk"],
].collectEntries { propKey, depGroup, depId -> [propKey, "${-> project.getVersion(depGroup, depId)}"] })
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 0c992d19fa9..d16127d4f77 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,43 +18,95 @@
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 arbitrary backends like Jaeger, Zipkin, Datadog, etc.
-At the moment, only Jaeger is supported out of the box.
+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.
-A sampled distributed tracing query request on Jaeger looks like this:
+A sampled distributed tracing query request displayed in Jaeger looks like this:
.Tracing of a Solr query
image::distributed-tracing/query-request-tracing.png[]
-== Module
+== Modules and Configuration
-This is provided via the `jaegertracer-configurator` xref:configuration-guide:solr-modules.adoc[Solr Module] that needs to be enabled before use.
+The `TracerConfigurator` is a class used to provide an instance of `io.opentracing.Tracer` based on configuration in `solr.xml`.
+These are pluggable, and each plugin is shipped as a xref:configuration-guide:solr-modules.adoc[Solr Module]:
-== Configuring Tracer
+**opentelemetry**: The `opentelemetry` module supports OTLP over gRPC or HTTP.
-`TracerConfigurator` is a class used to provide an instance of `io.opentracing.Tracer` based on configuration in `solr.xml`.
-The `JaegerTracerConfigurator` provides a JaegerTracer instance to a Solr node.
+**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]
----
<solr>
- <tracerConfig name="tracerConfig" class="org.apache.solr.jaeger.JaegerTracerConfigurator" />
+ <tracerConfig name="tracerConfig" class="org.apache.solr.opentelemetry.OtelTracerConfigurator" />
</solr>
----
If `<tracerConfig>` is absent, `TracerConfigurator` will try to pick up the `Tracer` instance that was registered in `io.opentracing.util.GlobalTracer`.
-By doing this, some backends like DataDog are supported out of the box since
-https://docs.datadoghq.com/tracing/setup/java/[datadog-java-agent] uses Javaagent to register a `Tracer` in
-`io.opentracing.util.GlobalTracer`.
+By doing this, some backends like DataDog are supported out of the box since https://docs.datadoghq.com/tracing/setup/java/[datadog-java-agent] uses Javaagent to register a `Tracer` in `io.opentracing.util.GlobalTracer`.
+== Open Telemetry Module
-== Jaeger Tracer Configurator
+This module brings support for the industry standard https://opentelemetry.io[OpenTelemetry] (or short "OTEL") tracing, and exposes a tracer configurator that can be enabled in the `<tracerConfig>` tag of `solr.xml` as follows:
-The `modules/jagertracer-configurator` provides a default implementation for setting up Jaeger Tracer.
+[source,xml]
+----
+<tracerConfig name="tracerConfig" class="org.apache.solr.opentelemetry.OtelTracerConfigurator"/>
+----
+
+Enable the module with either system property `-Dsolr.modules=opentelemetry` or environment variable `SOLR_MODULES=opentelemetry`.
+
+=== Configuration
+
+The tracer can be configured through environment variables or Java system properties, see https://opentelemetry.io/docs/reference/specification/sdk-environment-variables/[OTEL SDK Environment Variables] and https://github.com/open-telemetry/opentelemetry-java/blob/v{dep-version-opentelemetry}/sdk-extensions/autoconfigure/README.md[Java SDK Autoconfigure].
+
+The default configuration will ship traces to a collector running on localhost, using https://opentelemetry.io/docs/reference/specification/protocol/[OTLP] over https://grpc.io[gRPC], and will propagate trace IDs using https://www.w3.org/TR/trace-context/[W3C TraceContext]. Here are the environment settings that are enabled by default:
+
+[source,bash]
+----
+OTEL_SDK_DISABLED=false
+OTEL_SERVICE_NAME=solr
+OTEL_TRACES_EXPORTER=otlp
+OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+OTEL_EXPORTER_OTLP_ENDPOINT=localhost:4317
+OTEL_TRACES_SAMPLER=parentbased_always_on
+OTEL_PROPAGATORS=tracecontext,baggage
+----
+
+Say you want to send traces to a remote https://opentelemetry.io/docs/collector/[OTEL Collector], with 10% sampling. That could be done with this configuration:
+
+[source,bash]
+----
+OTEL_EXPORTER_OTLP_ENDPOINT=my-remote-collector:4317
+OTEL_TRACES_SAMPLER=parentbased_traceidratio
+OTEL_TRACES_SAMPLER_ARG=0.1
+----
+
+An equivalent configuration using system properties would be:
+
+[source,bash]
+----
+SOLR_OPTS=-Dotel.exporter.otlp.endpoint=my-remote-collector:4317 -Dotel.traces.sampler=parentbased_traceidratio -Dotel.traces.sampler.arg=0.1
+----
+
+Consult the https://opentelemetry.io/docs/reference/specification/sdk-environment-variables/[OTEL documentation] for details on all the configuration options.
+This version of Solr uses https://github.com/open-telemetry/opentelemetry-java/tree/v{dep-version-opentelemetry}[OpenTelemetry SDK v{dep-version-opentelemetry}].
+
+=== Using other exporters
+
+The OTEL tracer also supports other exporters like Jaeger and Zipkin. However, Solr does not ship with those 3rd party libraries, thus you need to add them to Solr yourself if you have this as a requirement. Say you add the Zipkin exporter jar file(s) to `$SOLR_TIP/lib/`, then you would enable OpenTelemetry module to send traces on the Zipkin format using the Protobuf encoding with a configuration like this:
+
+[source,bash]
+----
+OTEL_TRACES_EXPORTER=zipkin
+OTEL_EXPORTER_ZIPKIN_ENDPOINT=http://localhost:9411/api/v2/spans
+----
+
+== Jaeger Tracer Module
+
+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`.
-Add the solr-jaegertracer JAR file and the other JARs provided with this module to your Solr installation, ideally to each node.
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:
diff --git a/versions.lock b/versions.lock
index a42252e1c2a..e9fab5dcd42 100644
--- a/versions.lock
+++ b/versions.lock
@@ -19,11 +19,12 @@ com.github.junrar:junrar:7.5.2 (1 constraints: 650c1002)
com.github.openjson:openjson:1.0.12 (1 constraints: 8b0c6d0e)
com.github.spotbugs:spotbugs-annotations:4.7.2 (1 constraints: 0f051636)
com.github.virtuald:curvesapi:1.07 (1 constraints: 9e0ac7c0)
+com.google.android:annotations:4.1.1.4 (1 constraints: 6e08d68b)
com.google.api:api-common:2.2.1 (5 constraints: 8543fda1)
com.google.api:gax:2.18.7 (5 constraints: 874a5ca6)
com.google.api:gax-httpjson:0.103.7 (2 constraints: 3e21a5bc)
com.google.api-client:google-api-client:2.0.0 (3 constraints: 9b3281f9)
-com.google.api.grpc:proto-google-common-protos:2.9.2 (5 constraints: 36430d89)
+com.google.api.grpc:proto-google-common-protos:2.9.2 (6 constraints: 0e4db113)
com.google.api.grpc:proto-google-iam-v1:1.5.2 (2 constraints: 8b1ed196)
com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0 (2 constraints: dc259c49)
com.google.auth:google-auth-library-credentials:1.8.1 (6 constraints: 2a5788f4)
@@ -33,10 +34,10 @@ 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 (6 constraints: d958afbf)
-com.google.errorprone:error_prone_annotations:2.16 (4 constraints: 2e389ad2)
+com.google.code.gson:gson:2.9.1 (7 constraints: e9609e0f)
+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 (19 constraints: 5d28985f)
+com.google.guava:guava:31.1-jre (25 constraints: 756fc917)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0)
com.google.http-client:google-http-client:1.42.2 (11 constraints: 28bfcf97)
com.google.http-client:google-http-client-apache-v2:1.42.2 (2 constraints: b4208375)
@@ -45,7 +46,7 @@ com.google.http-client:google-http-client-gson:1.42.2 (6 constraints: e6619899)
com.google.http-client:google-http-client-jackson2:1.42.2 (1 constraints: 1d1003a6)
com.google.j2objc:j2objc-annotations:1.3 (4 constraints: 7d3ab454)
com.google.oauth-client:google-oauth-client:1.34.1 (2 constraints: b520b575)
-com.google.protobuf:protobuf-java:3.21.12 (10 constraints: 93937b5b)
+com.google.protobuf:protobuf-java:3.21.12 (11 constraints: 9d9d18cf)
com.google.protobuf:protobuf-java-util:3.21.12 (4 constraints: 9d303921)
com.google.re2j:re2j:1.2 (1 constraints: a7041c2c)
com.googlecode.json-simple:json-simple:1.1.1 (2 constraints: 321c78d2)
@@ -61,8 +62,9 @@ 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.9.3 (2 constraints: a81c77e6)
-com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd)
+com.squareup.okhttp3:okhttp:4.10.0 (3 constraints: 1633e9ab)
+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)
com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43)
com.tdunning:t-digest:3.1 (1 constraints: a804212c)
@@ -83,25 +85,53 @@ io.dropwizard.metrics:metrics-graphite:4.2.12 (1 constraints: 3b05413b)
io.dropwizard.metrics:metrics-jetty10:4.2.12 (1 constraints: 3b05413b)
io.dropwizard.metrics:metrics-jmx:4.2.12 (1 constraints: 3b05413b)
io.dropwizard.metrics:metrics-jvm:4.2.12 (1 constraints: 3b05413b)
-io.grpc:grpc-context:1.48.0 (2 constraints: 211d5126)
+io.grpc:grpc-api:1.50.2 (4 constraints: 7526366f)
+io.grpc:grpc-context:1.50.2 (4 constraints: 282afae9)
+io.grpc:grpc-core:1.50.2 (1 constraints: c908f38f)
+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 (7 constraints: 8d6e8724)
-io.netty:netty-codec:4.1.82.Final (2 constraints: 501a8147)
-io.netty:netty-common:4.1.82.Final (9 constraints: ff8727e1)
-io.netty:netty-handler:4.1.82.Final (2 constraints: 851d4a3a)
+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)
+io.netty:netty-codec-http2:4.1.82.Final (1 constraints: ee0a9acb)
+io.netty:netty-codec-socks:4.1.82.Final (1 constraints: 110f956c)
+io.netty:netty-common:4.1.82.Final (12 constraints: 00b3cd3e)
+io.netty:netty-handler:4.1.82.Final (3 constraints: 652b523a)
+io.netty:netty-handler-proxy:4.1.82.Final (1 constraints: ee0a9acb)
io.netty:netty-resolver:4.1.82.Final (2 constraints: 521a7331)
io.netty:netty-tcnative:2.0.48.Final (1 constraints: d60fe48e)
io.netty:netty-tcnative-classes:2.0.48.Final (1 constraints: 210d451b)
-io.netty:netty-transport:4.1.82.Final (6 constraints: dd608a22)
+io.netty:netty-transport:4.1.82.Final (9 constraints: de8b351b)
io.netty:netty-transport-classes-epoll:4.1.82.Final (1 constraints: ae12e21e)
io.netty:netty-transport-native-epoll:4.1.82.Final (1 constraints: d70ffb8e)
-io.netty:netty-transport-native-unix-common:4.1.82.Final (3 constraints: 6332e497)
+io.netty:netty-transport-native-unix-common:4.1.82.Final (4 constraints: 503d2494)
io.opencensus:opencensus-api:0.31.1 (5 constraints: 974d3996)
io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
-io.opentracing:opentracing-api:0.33.0 (5 constraints: 4d3cfe52)
-io.opentracing:opentracing-noop:0.33.0 (3 constraints: 7c2142bd)
+io.opentelemetry:opentelemetry-api:1.21.0 (9 constraints: fda10c96)
+io.opentelemetry:opentelemetry-api-logs:1.21.0-alpha (2 constraints: a0279d00)
+io.opentelemetry:opentelemetry-bom:1.21.0 (1 constraints: c411a7f3)
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha (1 constraints: 69079861)
+io.opentelemetry:opentelemetry-context:1.21.0 (2 constraints: 1d1fd2b3)
+io.opentelemetry:opentelemetry-exporter-common:1.21.0 (3 constraints: 443f09e9)
+io.opentelemetry:opentelemetry-exporter-otlp:1.21.0 (1 constraints: 910fe183)
+io.opentelemetry:opentelemetry-exporter-otlp-common:1.21.0 (2 constraints: 48230b1b)
+io.opentelemetry:opentelemetry-opentracing-shim:1.21.0-alpha (1 constraints: f7137265)
+io.opentelemetry:opentelemetry-sdk:1.21.0 (3 constraints: 96438ee0)
+io.opentelemetry:opentelemetry-sdk-common:1.21.0 (5 constraints: 2355c8a6)
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.21.0-alpha (1 constraints: f7137265)
+io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.21.0 (2 constraints: d7280b4d)
+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-noop:0.33.0 (4 constraints: 48361e21)
io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b)
+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)
io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
@@ -212,6 +242,7 @@ 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)
org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)
org.apache.zookeeper:zookeeper:3.8.0 (2 constraints: 9f13215f)
org.apache.zookeeper:zookeeper-jute:3.8.0 (2 constraints: 97123223)
@@ -281,8 +312,10 @@ org.jctools:jctools-core:3.3.0 (1 constraints: 08050336)
org.jdom:jdom2:2.0.6.1 (1 constraints: be0c371b)
org.jetbrains:annotations:13.0 (1 constraints: df0e795c)
org.jetbrains.kotlin:kotlin-bom:1.7.21 (1 constraints: 31109caf)
-org.jetbrains.kotlin:kotlin-stdlib:1.7.21 (7 constraints: 1e659044)
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21 (4 constraints: 873864a4)
+org.jetbrains.kotlin:kotlin-stdlib:1.7.21 (6 constraints: d65aa2de)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21 (4 constraints: 363ab4c3)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21 (2 constraints: e11ec2c7)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21 (4 constraints: 573ab5e7)
org.junit:junit-bom:5.9.1 (2 constraints: cb21f18e)
org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760)
org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a)
@@ -357,7 +390,6 @@ com.squareup.okhttp3:mockwebserver:4.9.3 (1 constraints: c60ebf62)
io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)
io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)
io.micrometer:micrometer-core:1.7.12 (1 constraints: fc162119)
-io.netty:netty-codec-http:4.1.82.Final (1 constraints: 59075f61)
io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)
jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)
@@ -391,8 +423,6 @@ org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-gri
org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
org.jetbrains.kotlin:kotlin-reflect:1.7.21 (3 constraints: 61328ffd)
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21 (2 constraints: e11ec2c7)
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21 (3 constraints: 5d2e399a)
org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b)
org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)
org.objenesis:objenesis:3.1 (1 constraints: b00a12bd)
diff --git a/versions.props b/versions.props
index 924d066f98b..d48860fb213 100644
--- a/versions.props
+++ b/versions.props
@@ -20,8 +20,10 @@ commons-codec:commons-codec=1.15
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
io.prometheus:*=0.2.0
io.swagger.core.v3:*=2.2.2
@@ -53,6 +55,7 @@ org.apache.logging.log4j:*=2.19.0
org.apache.lucene:*=9.4.2
org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.4
+org.apache.tomcat:annotations-api=6.0.53
org.apache.zookeeper:*=3.8.0
org.bitbucket.b_c:jose4j=0.7.9
org.carrot2:carrot2-core=4.5.0