Merge branch 'main' into upstream-2.11.0-alpha-SNAPSHOT

signalfx · Dec 4, 2024 · 6ac8260 · 6ac8260
2 parents e020289 + d4b2099
commit 6ac8260
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -28,10 +28,10 @@ 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.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"))
@@ -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/licenses/licenses.md b/licenses/licenses.md
@@ -1,7 +1,7 @@
 
 # splunk-otel-javaagent
 ## Dependency License Report
-_2024-11-27 11:12:57 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-27 11:12:57 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)

diff --git 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) {