diff --git a/CHANGELOG.md b/CHANGELOG.md index b3aa88360e2e8..7aab93c3fd5f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.jruby.joni:joni` from 2.2.3 to 2.2.6 ([#20714](https://github.com/opensearch-project/OpenSearch/pull/20714)) - Bump `tj-actions/changed-files` from 47.0.1 to 47.0.4 ([#20638](https://github.com/opensearch-project/OpenSearch/pull/20638), [#20716](https://github.com/opensearch-project/OpenSearch/pull/20716)) - Bump `com.nimbusds:nimbus-jose-jwt` from 10.7 to 10.8 ([#20715](https://github.com/opensearch-project/OpenSearch/pull/20715)) +- Bump OpenTelemetry to 1.59.0 and OpenTelemetry Semconv to 1.40.0 ([#20737](https://github.com/opensearch-project/OpenSearch/pull/20737)) ### Removed diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a5b696e4305c..b8b7547086f0c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,8 +94,8 @@ jzlib = "1.1.3" resteasy = "6.2.4.Final" # opentelemetry dependencies -opentelemetry = "1.58.0" -opentelemetrysemconv = "1.37.0" +opentelemetry = "1.59.0" +opentelemetrysemconv = "1.40.0" # arrow dependencies arrow = "18.1.0" diff --git a/plugins/telemetry-otel/build.gradle b/plugins/telemetry-otel/build.gradle index daf4de85add6c..cc628d09a0fd7 100644 --- a/plugins/telemetry-otel/build.gradle +++ b/plugins/telemetry-otel/build.gradle @@ -56,20 +56,10 @@ thirdPartyAudit { 'android.security.NetworkSecurityPolicy', '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', 'io.grpc.KnownLength', 'io.grpc.ManagedChannel', - 'io.grpc.MethodDescriptor', - 'io.grpc.MethodDescriptor$Builder', - 'io.grpc.MethodDescriptor$Marshaller', - 'io.grpc.MethodDescriptor$MethodType', - 'io.grpc.stub.AbstractFutureStub', - 'io.grpc.stub.AbstractStub', - 'io.grpc.stub.ClientCalls', 'org.bouncycastle.jsse.BCSSLParameters', 'org.bouncycastle.jsse.BCSSLSocket', 'org.conscrypt.Conscrypt', diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-1.58.0.jar.sha1 deleted file mode 100644 index c899310666d61..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-api-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6d2be0c909cfe6c9e0d9349d4b1f5d7edf4f57ee \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..c0553ff4c7f1d --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-api-1.59.0.jar.sha1 @@ -0,0 +1 @@ +87246ba2d83ac8ee5e2f421f19a9bb47f9d8a725 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.58.0-alpha.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.58.0-alpha.jar.sha1 deleted file mode 100644 index b4ac5043f13c5..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.58.0-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b2be07335417b99c9060c2f95c2c8b61dc1c80bd \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.59.0-alpha.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.59.0-alpha.jar.sha1 new file mode 100644 index 0000000000000..31744065f5275 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.59.0-alpha.jar.sha1 @@ -0,0 +1 @@ +3937cf2d5f11f5dea927de927aecb2ceda98515c \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-common-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-common-1.58.0.jar.sha1 deleted file mode 100644 index 6c5737627c255..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-common-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b010feca635862d4e0cc65ffdacaa2ce2cb764f1 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-common-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-common-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..da7ad06a27dd6 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-common-1.59.0.jar.sha1 @@ -0,0 +1 @@ +dbda8ee7a98fc5e4fa2935da2e405d2650d5f637 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-context-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-context-1.58.0.jar.sha1 deleted file mode 100644 index 1b5ef23682d1b..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-context-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2df0b731c3c7c461816310891885777d424a1799 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-context-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-context-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..c9dac6bcee5ba --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-context-1.59.0.jar.sha1 @@ -0,0 +1 @@ +e4400150dc06124a4716cbacd8cf7a8b2abb40d0 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.58.0.jar.sha1 deleted file mode 100644 index 3d25ebc3602ef..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fb5a5f523dae8854924cdf3ba43b07d45df5146 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..58a2ccdc8bb80 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.59.0.jar.sha1 @@ -0,0 +1 @@ +abf58233632ae73772bdc073468fa286b4a77b37 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.58.0.jar.sha1 deleted file mode 100644 index 8977d4050558c..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0b3481db6c64972ca8a163f228500f6291dc7a68 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..5df8437703359 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.59.0.jar.sha1 @@ -0,0 +1 @@ +03a3056fe1e651ef4aa81abf9f572750e6fe02ca \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.58.0.jar.sha1 deleted file mode 100644 index 223cb86c88455..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -40c785f54ca2a1b9550f76e33b3809e4588be01a \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..34aed4fe120ce --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.59.0.jar.sha1 @@ -0,0 +1 @@ +61d2957576916fa724410f34ad9d5e40babbe143 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.58.0.jar.sha1 deleted file mode 100644 index 1e7f3a1681a07..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a1ece1d1ff59dfd2e2df87c8c5d017a8a6cb367 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..b0dd78d9b646b --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.59.0.jar.sha1 @@ -0,0 +1 @@ +cae8015e4f247d9f4f6361a3129fca96d3b0da95 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.58.0.jar.sha1 deleted file mode 100644 index f868631bd3222..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -efdbae060f4cb9b03018c51165ccba9c5d323bb3 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..9b69855a3676b --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.59.0.jar.sha1 @@ -0,0 +1 @@ +f331bca348735de8d9d90a3f7fb6b2d6ed2e220f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.58.0.jar.sha1 deleted file mode 100644 index 8ef85cb296b75..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fa186c881713e996c61196a338ebb940886022b \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..9e00ffefe0f9d --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.59.0.jar.sha1 @@ -0,0 +1 @@ +494c507864175f8f352b0ea0e0398adfc7c1d44b \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.58.0.jar.sha1 deleted file mode 100644 index 09bb37a46e19e..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bc3b1a245e6f863dde963d2c67a9a3547d3ee803 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..80dcbbee80f64 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.59.0.jar.sha1 @@ -0,0 +1 @@ +022901dac7c9c6bb996607ca7e651016022e055a \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.58.0.jar.sha1 deleted file mode 100644 index eb3fbc9333b24..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -01728a1f8bec376d9d86b28b875a7640f614aa99 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..9710f9ed84a6b --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.59.0.jar.sha1 @@ -0,0 +1 @@ +464e22a9ee57d9721ab8a70ef24fed7062a744db \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.58.0.jar.sha1 deleted file mode 100644 index 2445a09f646fe..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -932972a00bb15a8c3a27c4d57870ad9fb7a915eb \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..697a7d6a6914d --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.59.0.jar.sha1 @@ -0,0 +1 @@ +19e50ed26ef2615faa8b35288b63fb1a792abdb2 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.58.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.58.0.jar.sha1 deleted file mode 100644 index 860c4122d8c90..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.58.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -282fe44a99a59b83595186de9026b223b0b8f34f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.59.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.59.0.jar.sha1 new file mode 100644 index 0000000000000..7133bb8e48b4d --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.59.0.jar.sha1 @@ -0,0 +1 @@ +4f5cad2b8ecc205c0da4249fae63f418e7ffeed0 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.37.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.37.0.jar.sha1 deleted file mode 100644 index ebc684e879210..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.37.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c6f9a930842c93c08fd87349db3defcbc228e925 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.40.0.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.40.0.jar.sha1 new file mode 100644 index 0000000000000..d16b3608696ad --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-semconv-1.40.0.jar.sha1 @@ -0,0 +1 @@ +fca8594d7edb9ac5f7f9baa8d68f135354a7a243 \ No newline at end of file