diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d9c289e69071..1ac9fd1ac20b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,7 +77,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.7 ([#20714](https://github.com/opensearch-project/OpenSearch/pull/20714), [#20759](https://github.com/opensearch-project/OpenSearch/pull/20759)) - 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)) +- Bump OpenTelemetry to 1.60.1 and OpenTelemetry Semconv to 1.40.0 ([#20737](https://github.com/opensearch-project/OpenSearch/pull/20737), [#20797](https://github.com/opensearch-project/OpenSearch/pull/20797)) - Bump `ch.qos.logback:logback-classic` from 1.5.27 to 1.5.32 ([#20761](https://github.com/opensearch-project/OpenSearch/pull/20761)) - Bump `actions/upload-artifact` from 6 to 7 ([#20762](https://github.com/opensearch-project/OpenSearch/pull/20762)) - Bump `org.tukaani:xz` from 1.11 to 1.12 ([#20760](https://github.com/opensearch-project/OpenSearch/pull/20760)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e4c6ef5d00713..64ca44a091790 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,7 +94,7 @@ jzlib = "1.1.3" resteasy = "6.2.4.Final" # opentelemetry dependencies -opentelemetry = "1.59.0" +opentelemetry = "1.60.1" opentelemetrysemconv = "1.40.0" # arrow dependencies diff --git a/plugins/telemetry-otel/build.gradle b/plugins/telemetry-otel/build.gradle index cc628d09a0fd7..d4c49eb3b8f16 100644 --- a/plugins/telemetry-otel/build.gradle +++ b/plugins/telemetry-otel/build.gradle @@ -75,7 +75,8 @@ 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.DefaultConfigProperties', + 'io.opentelemetry.sdk.autoconfigure.spi.internal.ExtendedDeclarativeConfigProperties' ) } 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 deleted file mode 100644 index c0553ff4c7f1d..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-api-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -87246ba2d83ac8ee5e2f421f19a9bb47f9d8a725 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..fa1ee91fef22d --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-api-1.60.1.jar.sha1 @@ -0,0 +1 @@ +67a515491f676e9ac9719839a97cbde7b1ffc2c2 \ 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 deleted file mode 100644 index 31744065f5275..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.59.0-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3937cf2d5f11f5dea927de927aecb2ceda98515c \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.60.1-alpha.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.60.1-alpha.jar.sha1 new file mode 100644 index 0000000000000..b6fd46833bbf5 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-api-incubator-1.60.1-alpha.jar.sha1 @@ -0,0 +1 @@ +381dd18d40d71b6d00043d8c0d9c865cfacbb0f4 \ 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 deleted file mode 100644 index da7ad06a27dd6..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-common-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbda8ee7a98fc5e4fa2935da2e405d2650d5f637 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-common-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-common-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..3085f2edba959 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-common-1.60.1.jar.sha1 @@ -0,0 +1 @@ +5dac05298857f292183de4ab5ea56bb7fe272daf \ 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 deleted file mode 100644 index c9dac6bcee5ba..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-context-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e4400150dc06124a4716cbacd8cf7a8b2abb40d0 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-context-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-context-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..d783c89ca7b54 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-context-1.60.1.jar.sha1 @@ -0,0 +1 @@ +000d525534a510c73d1bdc7c6abf9d737214f821 \ 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 deleted file mode 100644 index 58a2ccdc8bb80..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abf58233632ae73772bdc073468fa286b4a77b37 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..441bd10d26481 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-common-1.60.1.jar.sha1 @@ -0,0 +1 @@ +328f11758e8665733c42d8289ab3d6203b10ae23 \ 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 deleted file mode 100644 index 5df8437703359..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -03a3056fe1e651ef4aa81abf9f572750e6fe02ca \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..8d42364e3f981 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-logging-1.60.1.jar.sha1 @@ -0,0 +1 @@ +a5c3b028d2693ca8eef20f209806813f7b474899 \ 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 deleted file mode 100644 index 34aed4fe120ce..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -61d2957576916fa724410f34ad9d5e40babbe143 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..6500b1ddbe722 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-1.60.1.jar.sha1 @@ -0,0 +1 @@ +3fbd1110e980455850a5dcb2e8890e29b3b346a9 \ 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 deleted file mode 100644 index b0dd78d9b646b..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cae8015e4f247d9f4f6361a3129fca96d3b0da95 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..ce573268f9a5c --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-otlp-common-1.60.1.jar.sha1 @@ -0,0 +1 @@ +599f68f3691421d3fe00b121ec43913ed217f62a \ 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 deleted file mode 100644 index 9b69855a3676b..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f331bca348735de8d9d90a3f7fb6b2d6ed2e220f \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..704980dd6a6a7 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-exporter-sender-okhttp-1.60.1.jar.sha1 @@ -0,0 +1 @@ +7f21bf8fe4281d801d459c7279c07cb9bf13c8ec \ 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 deleted file mode 100644 index 9e00ffefe0f9d..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -494c507864175f8f352b0ea0e0398adfc7c1d44b \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..89ece19091623 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-1.60.1.jar.sha1 @@ -0,0 +1 @@ +3e7636ca532e0bff7ba3c132807785dbe0d44c7f \ 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 deleted file mode 100644 index 80dcbbee80f64..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -022901dac7c9c6bb996607ca7e651016022e055a \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..62f26cc37ae4f --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-common-1.60.1.jar.sha1 @@ -0,0 +1 @@ +71d4fcd2a690339a510250638c289a38ec3d87fa \ 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 deleted file mode 100644 index 9710f9ed84a6b..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -464e22a9ee57d9721ab8a70ef24fed7062a744db \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..c3db496dd3e0a --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-logs-1.60.1.jar.sha1 @@ -0,0 +1 @@ +31cc57d5a122b9a72fd38c6bda1b7fa9baf0ca19 \ 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 deleted file mode 100644 index 697a7d6a6914d..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19e50ed26ef2615faa8b35288b63fb1a792abdb2 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..0fea664ad824e --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-metrics-1.60.1.jar.sha1 @@ -0,0 +1 @@ +16f463873a923ef1eb2391e2df2c9a18b2ce0b6f \ 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 deleted file mode 100644 index 7133bb8e48b4d..0000000000000 --- a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.59.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f5cad2b8ecc205c0da4249fae63f418e7ffeed0 \ No newline at end of file diff --git a/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.60.1.jar.sha1 b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.60.1.jar.sha1 new file mode 100644 index 0000000000000..6533fcc8b4c44 --- /dev/null +++ b/plugins/telemetry-otel/licenses/opentelemetry-sdk-trace-1.60.1.jar.sha1 @@ -0,0 +1 @@ +32c79993d8403ac08e330d53d8375eae20dffd04 \ No newline at end of file