From 6b46836f69ff045c1c568748717ac6870c7f2fec Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Wed, 13 Aug 2025 20:57:55 -0400 Subject: [PATCH] Update OpenTelemetry to 1.53.0 and OpenTelemetry SemConv to 1.34.0 Signed-off-by: Andriy Redko --- CHANGELOG.md | 1 + gradle/libs.versions.toml | 4 +- plugins/telemetry-otel/build.gradle | 5 +- .../opentelemetry-api-1.46.0.jar.sha1 | 1 - .../opentelemetry-api-1.53.0.jar.sha1 | 1 + ...emetry-api-incubator-1.46.0-alpha.jar.sha1 | 1 - ...emetry-api-incubator-1.53.0-alpha.jar.sha1 | 1 + .../opentelemetry-common-1.53.0.jar.sha1 | 1 + .../licenses/opentelemetry-common-LICENSE.txt | 202 ++++++++++++++++++ .../licenses/opentelemetry-common-NOTICE.txt | 0 .../opentelemetry-context-1.46.0.jar.sha1 | 1 - .../opentelemetry-context-1.53.0.jar.sha1 | 1 + ...ntelemetry-exporter-common-1.46.0.jar.sha1 | 1 - ...ntelemetry-exporter-common-1.53.0.jar.sha1 | 1 + ...telemetry-exporter-logging-1.46.0.jar.sha1 | 1 - ...telemetry-exporter-logging-1.53.0.jar.sha1 | 1 + ...pentelemetry-exporter-otlp-1.46.0.jar.sha1 | 1 - ...pentelemetry-exporter-otlp-1.53.0.jar.sha1 | 1 + ...metry-exporter-otlp-common-1.46.0.jar.sha1 | 1 - ...metry-exporter-otlp-common-1.53.0.jar.sha1 | 1 + ...try-exporter-sender-okhttp-1.46.0.jar.sha1 | 1 - ...try-exporter-sender-okhttp-1.53.0.jar.sha1 | 1 + .../opentelemetry-sdk-1.46.0.jar.sha1 | 1 - .../opentelemetry-sdk-1.53.0.jar.sha1 | 1 + .../opentelemetry-sdk-common-1.46.0.jar.sha1 | 1 - .../opentelemetry-sdk-common-1.53.0.jar.sha1 | 1 + .../opentelemetry-sdk-logs-1.46.0.jar.sha1 | 1 - .../opentelemetry-sdk-logs-1.53.0.jar.sha1 | 1 + .../opentelemetry-sdk-metrics-1.46.0.jar.sha1 | 1 - .../opentelemetry-sdk-metrics-1.53.0.jar.sha1 | 1 + .../opentelemetry-sdk-trace-1.46.0.jar.sha1 | 1 - .../opentelemetry-sdk-trace-1.53.0.jar.sha1 | 1 + ...pentelemetry-semconv-1.29.0-alpha.jar.sha1 | 1 - .../opentelemetry-semconv-1.34.0.jar.sha1 | 1 + .../tracing/OTelResourceProvider.java | 4 +- 35 files changed, 225 insertions(+), 20 deletions(-) delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-api-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-api-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.46.0-alpha.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.53.0-alpha.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-common-1.53.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-common-LICENSE.txt create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-common-NOTICE.txt delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-context-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-context-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.46.0.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 delete mode 100644 plugins/telemetry-otel/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 create mode 100644 plugins/telemetry-otel/licenses/opentelemetry-semconv-1.34.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 328b66bc10fcf..e503b92980d62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.jline:jline` from 3.30.4 to 3.30.5 ([#19013](https://github.com/opensearch-project/OpenSearch/pull/19013)) - Bump `com.github.spotbugs:spotbugs-annotations` from 4.9.3 to 4.9.4 ([#19015](https://github.com/opensearch-project/OpenSearch/pull/19015)) - Bump `com.azure:azure-storage-common` from 12.29.1 to 12.30.1 ([#19016](https://github.com/opensearch-project/OpenSearch/pull/19016)) +- Update OpenTelemetry to 1.53.0 and OpenTelemetry SemConv to 1.34.0 ([#19068](https://github.com/opensearch-project/OpenSearch/pull/19068)) ### Deprecated diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 58cae3ee6b986..501eb24665339 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -87,8 +87,8 @@ jzlib = "1.1.3" resteasy = "6.2.4.Final" # opentelemetry dependencies -opentelemetry = "1.46.0" -opentelemetrysemconv = "1.29.0-alpha" +opentelemetry = "1.53.0" +opentelemetrysemconv = "1.34.0" # arrow dependencies arrow = "18.1.0" diff --git a/plugins/telemetry-otel/build.gradle b/plugins/telemetry-otel/build.gradle index 54f4f2f897562..9bc110e168717 100644 --- a/plugins/telemetry-otel/build.gradle +++ b/plugins/telemetry-otel/build.gradle @@ -22,6 +22,7 @@ opensearchplugin { dependencies { api project(":libs:opensearch-telemetry") api "io.opentelemetry:opentelemetry-api:${versions.opentelemetry}" + api "io.opentelemetry:opentelemetry-common:${versions.opentelemetry}" api "io.opentelemetry:opentelemetry-context:${versions.opentelemetry}" api "io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}" api "io.opentelemetry:opentelemetry-sdk-common:${versions.opentelemetry}" @@ -61,6 +62,7 @@ thirdPartyAudit { 'android.util.Log', 'com.google.common.io.ByteStreams', 'com.google.common.util.concurrent.ListenableFuture', + 'com.fasterxml.jackson.databind.ObjectMapper', 'io.grpc.CallOptions', 'io.grpc.Channel', 'io.grpc.Drainable', @@ -88,8 +90,7 @@ thirdPartyAudit { 'io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider', 'io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener', 'io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider', - 'io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties', - 'io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties' + 'io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties' ) } diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-1.46.0.jar.sha1 deleted file mode 100644 index b2d1d3575fcde..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-api-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afd2d5781454088400cceabbe84f7a9b29d27161 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..baaa6474126ca --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-api-1.53.0.jar.sha1 @@ -0,0 +1 @@ +fc6d4f6a0f5c5a97cbafbd198f5008ba8a023c3f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.46.0-alpha.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.46.0-alpha.jar.sha1 deleted file mode 100644 index e89de4cb29f16..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.46.0-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1a708444d2818ac1a47767a2b35d74ef55d26af8 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.53.0-alpha.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.53.0-alpha.jar.sha1 new file mode 100644 index 0000000000000..4a2d9380cdc35 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.53.0-alpha.jar.sha1 @@ -0,0 +1 @@ +9884b5d82eb055bd22233d3d070706b2452c2c43 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-common-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-common-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..9fa901f7db646 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-common-1.53.0.jar.sha1 @@ -0,0 +1 @@ +e9ee5d5738ee7a8e00a12922920af3f05daa9c42 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-common-LICENSE.txt b/plugins/telemetry-otel/licenses/opentelemetry-common-LICENSE.txt new file mode 100644 index 0000000000000..d645695673349 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-common-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/plugins/telemetry-otel/licenses/opentelemetry-common-NOTICE.txt b/plugins/telemetry-otel/licenses/opentelemetry-common-NOTICE.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/plugins/telemetry-otel/licenses/opentelemetry-context-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-context-1.46.0.jar.sha1 deleted file mode 100644 index df658f4c87ac2..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-context-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8cee1fa7ec9129f7b252595c612c19f4570d567f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-context-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-context-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..f1a39ccae1b6b --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-context-1.53.0.jar.sha1 @@ -0,0 +1 @@ +9733ca6c3741f0f40de6c99f9874fc239ed066cf \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.46.0.jar.sha1 deleted file mode 100644 index e6503871bff53..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e2d8f3b51b1a2b1184f11d9059e129c5e39147a \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..d61cd2cb3454f --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 @@ -0,0 +1 @@ +a42984afaa0216de2667d56f5996926055b5f8d8 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.46.0.jar.sha1 deleted file mode 100644 index 65757fff8b0e7..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a0ef76a383a086b812395ca5a5cdf94804a59a3f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..001ff3d5747ea --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.53.0.jar.sha1 @@ -0,0 +1 @@ +3b87d5842e3432f2f8dbcbda88391ec970e57713 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.46.0.jar.sha1 deleted file mode 100644 index 0fc550e83748e..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1122a5ea0562147547ddf0eb28e1035d549c0ea0 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..0eeca87c6ba13 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 @@ -0,0 +1 @@ +092aa3e070ab3f70f9edaa457a777a4bcdc0570b \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.46.0.jar.sha1 deleted file mode 100644 index a01f85d9e1258..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abeb93b8b6d2cb0007b1d6122325f94a11e61ca4 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..c666779246507 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 @@ -0,0 +1 @@ +fb3f8b04344b47ffe4b78db487ba9997e0fbb36d \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.46.0.jar.sha1 deleted file mode 100644 index 8c755281bab05..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32a0fe0fa7cd9831b502075f27c1fe6d28280cdb \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..6d30125e7bb84 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 @@ -0,0 +1 @@ +27f729e20bd15d32b3e971d62332064cee503d5a \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.46.0.jar.sha1 deleted file mode 100644 index a41c756db7096..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3a77fff1084177c4f5099bbb7db6181d6efd752 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..443aec77224bc --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.53.0.jar.sha1 @@ -0,0 +1 @@ +c49f224a0d8a4cb5392aa8fbc4742248d6c71a85 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.46.0.jar.sha1 deleted file mode 100644 index 1bd211a143c03..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d353ee4e980ff77c742350fc7000b732b6c6b3f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..0046baeafef43 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 @@ -0,0 +1 @@ +2180d1e384d1de5dddd00b7ca66513846aff70d8 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.46.0.jar.sha1 deleted file mode 100644 index 084a703a4d4cc..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1bd9bb4f3ce9ac573613b353a78d51491cd02bbd \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..7b13afa5fab06 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 @@ -0,0 +1 @@ +26f1c04034202b0645cfe6f320c8d65ec6753275 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.46.0.jar.sha1 deleted file mode 100644 index 1fe3c4842d41d..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -475d900ffd0567a7ddf2452290b2e5d51ac35c58 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..ffc0e3b85f10c --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 @@ -0,0 +1 @@ +b264c6929feffe6632b99a0b9812278ff1779135 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.46.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.46.0.jar.sha1 deleted file mode 100644 index da00b35812afb..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.46.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c6e39faabf0741780189861156d0a7763e942796 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 new file mode 100644 index 0000000000000..fe0c4da8cd409 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 @@ -0,0 +1 @@ +d5f3c5243bfe5452db3941ce048f621415aac3a1 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 deleted file mode 100644 index 3326c366cb4c9..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -613d7f7743eb2b974680ad1af1685802e6a7cb58 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.34.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.34.0.jar.sha1 new file mode 100644 index 0000000000000..ccc719ac45f66 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.34.0.jar.sha1 @@ -0,0 +1 @@ +5813eb3ae6140425393cdcc1c40501c647048ceb \ No newline at end of file diff --git a/plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java b/plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java index 475fc09d04bff..720780402cb35 100644 --- a/plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java +++ b/plugins/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java @@ -34,7 +34,7 @@ import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.export.SpanExporter; import io.opentelemetry.sdk.trace.samplers.Sampler; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import static org.opensearch.telemetry.OTelTelemetrySettings.TRACER_EXPORTER_BATCH_SIZE_SETTING; import static org.opensearch.telemetry.OTelTelemetrySettings.TRACER_EXPORTER_DELAY_SETTING; @@ -79,7 +79,7 @@ public static OpenTelemetrySdk get( ContextPropagators contextPropagators, Sampler sampler ) { - Resource resource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "OpenSearch")); + Resource resource = Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, "OpenSearch")); SdkTracerProvider sdkTracerProvider = createSdkTracerProvider(settings, spanExporter, sampler, resource); SdkMeterProvider sdkMeterProvider = createSdkMetricProvider(settings, resource); return OpenTelemetrySdk.builder()