From 611af29a025e1df95837d31a1bf492a30c68c1d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:41:26 +0200 Subject: [PATCH 1/4] fix(deps): update dependency io.opentelemetry.proto:opentelemetry-proto to v1.4.0-alpha (#2116) * fix(deps): update dependency io.opentelemetry.proto:opentelemetry-proto to v1.4.0-alpha * fix compile error --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin --- dependencyManagement/build.gradle.kts | 2 +- .../java/com/splunk/opentelemetry/TelemetryRetriever.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 9057567b3..c43755526 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -55,6 +55,6 @@ dependencies { api("io.opentelemetry.contrib:opentelemetry-samplers:$otelContribAlphaVersion") api("io.opentelemetry.contrib:opentelemetry-resource-providers:$otelContribAlphaVersion") - api("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha") + api("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha") } } diff --git a/smoke-tests/src/test/java/com/splunk/opentelemetry/TelemetryRetriever.java b/smoke-tests/src/test/java/com/splunk/opentelemetry/TelemetryRetriever.java index 15df37937..92f39ba15 100644 --- a/smoke-tests/src/test/java/com/splunk/opentelemetry/TelemetryRetriever.java +++ b/smoke-tests/src/test/java/com/splunk/opentelemetry/TelemetryRetriever.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest; @@ -95,7 +95,7 @@ private ExportLogsServiceRequest deserializeLogsRequest(JsonNode it) { return builder.build(); } - private void deserializeIntoBuilder(JsonNode it, GeneratedMessageV3.Builder builder) { + private void deserializeIntoBuilder(JsonNode it, GeneratedMessage.Builder builder) { try { JsonFormat.parser().merge(OBJECT_MAPPER.writeValueAsString(it), builder); } catch (InvalidProtocolBufferException | JsonProcessingException e) { From 89c2f1330c0ae7d5f7b91cf50a5ddf19e1b050ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 09:45:58 +0200 Subject: [PATCH 2/4] fix(deps): update dependency io.grpc:grpc-bom to v1.68.2 (#2121) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index c43755526..3e27ec628 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.18.1")) api(enforcedPlatform("com.google.protobuf:protobuf-bom:$protobufVersion")) api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:4.12.0")) - api(enforcedPlatform("io.grpc:grpc-bom:1.68.1")) + api(enforcedPlatform("io.grpc:grpc-bom:1.68.2")) api(enforcedPlatform("io.opentelemetry:opentelemetry-bom-alpha:$otelAlphaVersion")) api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelInstrumentationAlphaVersion")) api(enforcedPlatform("org.junit:junit-bom:5.11.3")) From 8289b9aa919ae3a08b66182dc4b5773b135c232a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 09:46:22 +0200 Subject: [PATCH 3/4] fix(deps): update dependency com.fasterxml.jackson:jackson-bom to v2.18.2 (#2120) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 3e27ec628..ff9e29a50 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -28,7 +28,7 @@ javaPlatform { dependencies { // BOMs - api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.18.1")) + api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.18.2")) api(enforcedPlatform("com.google.protobuf:protobuf-bom:$protobufVersion")) api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:4.12.0")) api(enforcedPlatform("io.grpc:grpc-bom:1.68.2")) From d4b209989b22502cd632a2c2472c92717820baf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 07:52:05 +0200 Subject: [PATCH 4/4] fix(deps): update dependency com.google.protobuf:protobuf-bom to v4.29.0 (#2122) * fix(deps): update dependency com.google.protobuf:protobuf-bom to v4.29.0 * update licenses --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin --- dependencyManagement/build.gradle.kts | 2 +- licenses/licenses.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index ff9e29a50..04e0b0b33 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,7 +11,7 @@ val otelContribAlphaVersion = "1.41.0-alpha" val autoValueVersion = "1.11.0" val dockerJavaVersion = "3.4.0" val mockitoVersion = "5.14.2" -val protobufVersion = "4.28.3" +val protobufVersion = "4.29.0" val slf4jVersion = "2.0.16" // instrumentation version is used to compute Implementation-Version manifest attribute diff --git a/licenses/licenses.md b/licenses/licenses.md index de9c28350..bbb74a182 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # splunk-otel-javaagent ## Dependency License Report -_2024-11-21 14:12:41 EET_ +_2024-11-29 07:33:33 EET_ ## Apache License, Version 2.0 **1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `4.12.0` @@ -132,7 +132,7 @@ _2024-11-21 14:12:41 EET_ ## The 3-Clause BSD License -**30** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `4.28.3` +**30** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `4.29.0` > - **Manifest Project URL**: [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)