Bump com.google.protobuf:protobuf-java from 3.25.5 to 4.31.1 (#535)

* Bump com.google.protobuf:protobuf-java from 3.25.5 to 4.31.1

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.25.5 to 4.31.1.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](protocolbuffers/protobuf@v3.25.5...v4.31.1)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-version: 4.31.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* update some proto deps

* update protobuf messages

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brandon Arp <[email protected]>

Author: dependabot[bot]

pom.xml

@@ -77,7 +77,7 @@
     <aspectjrt.version>1.9.24</aspectjrt.version>
     <asynchttpclient.version>3.0.2</asynchttpclient.version>
     <bouncy.castle.version>1.80</bouncy.castle.version>
-    <client.protocol.version>0.12.0</client.protocol.version>
+    <client.protocol.version>0.13.0</client.protocol.version>
     <fastutil.version>8.5.15</fastutil.version>
     <guava.version>33.4.8-jre</guava.version>
     <guice.version>7.0.0</guice.version>
@@ -89,16 +89,16 @@
     <logback.version>1.5.18</logback.version>
     <logback.steno.version>2.1.2</logback.steno.version>
     <log4j.over.slf4j.version>2.0.17</log4j.over.slf4j.version>
-    <metrics.aggregator.protocol.prometheus.version>1.1.0</metrics.aggregator.protocol.prometheus.version>
-    <metrics.aggregator.protocol.version>1.2.1</metrics.aggregator.protocol.version>
+    <metrics.aggregator.protocol.prometheus.version>1.2.0</metrics.aggregator.protocol.prometheus.version>
+    <metrics.aggregator.protocol.version>1.3.0</metrics.aggregator.protocol.version>
     <metrics.client.version>0.13.0</metrics.client.version>
-    <metrics.client.http.version>0.13.1</metrics.client.http.version>
+    <metrics.client.http.version>0.14.0</metrics.client.http.version>
     <metrics.client.incubator.version>0.13.0</metrics.client.incubator.version>
     <metrics.jvm.extra.version>0.13.1</metrics.jvm.extra.version>
     <oval.version>3.2.1</oval.version>
     <pekko.version>1.1.3</pekko.version>
     <pekko.http.version>1.2.0</pekko.http.version>
-    <protobuf.version>3.25.5</protobuf.version>
+    <protobuf.version>4.31.1</protobuf.version>
     <scala.version>2.13</scala.version>
     <scala.library.version>2.13.16</scala.library.version>
     <slf4j.version>2.0.17</slf4j.version>

src/main/java/com/arpnetworking/tsdcore/model/AggregationMessage.java

@@ -16,7 +16,7 @@
 package com.arpnetworking.tsdcore.model;
 
 import com.arpnetworking.metrics.aggregation.protocol.Messages;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import io.vertx.core.buffer.Buffer;
 import org.apache.pekko.util.ByteString;
 import org.apache.pekko.util.ByteStringBuilder;
@@ -37,7 +37,7 @@ public final class AggregationMessage {
      * @param message The message.
      * @return New ${link AggregationMessage} instance.
      */
-    public static AggregationMessage create(final GeneratedMessageV3 message) {
+    public static AggregationMessage create(final GeneratedMessage message) {
         return new AggregationMessage(message);
     }
 
@@ -103,19 +103,19 @@ public ByteString serializeToByteString() {
         return sizePrefix.result().concat(bs);
     }
 
-    public GeneratedMessageV3 getMessage() {
+    public GeneratedMessage getMessage() {
         return _message;
     }
 
     public int getLength() {
         return _message.getSerializedSize() + HEADER_SIZE_IN_BYTES;
     }
 
-    private AggregationMessage(final GeneratedMessageV3 message) {
+    private AggregationMessage(final GeneratedMessage message) {
         _message = message;
     }
 
-    private final GeneratedMessageV3 _message;
+    private final GeneratedMessage _message;
 
     private static final int INTEGER_SIZE_IN_BYTES = Integer.SIZE / 8;
     private static final int HEADER_SIZE_IN_BYTES = INTEGER_SIZE_IN_BYTES + 1;

src/test/java/com/arpnetworking/tsdcore/model/AggregationMessageTest.java

@@ -16,7 +16,7 @@
 package com.arpnetworking.tsdcore.model;
 
 import com.arpnetworking.metrics.aggregation.protocol.Messages;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import com.google.protobuf.UnknownFieldSet;
 import io.vertx.core.buffer.Buffer;
 import org.apache.pekko.util.ByteString;
@@ -35,7 +35,7 @@ public class AggregationMessageTest {
 
     @Test
     public void testToBufferHostIdentification() {
-        final GeneratedMessageV3 protobufMessage = Messages.HostIdentification.getDefaultInstance();
+        final GeneratedMessage protobufMessage = Messages.HostIdentification.getDefaultInstance();
         final AggregationMessage message = AggregationMessage.create(protobufMessage);
         Assert.assertNotNull(message);
         Assert.assertSame(protobufMessage, message.getMessage());
@@ -60,14 +60,14 @@ public void testToBufferHostIdentification() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testToBufferSerializedUnsupportedMessage() {
-        final GeneratedMessageV3 mockMessage = Mockito.mock(GeneratedMessageV3.class);
+        final GeneratedMessage mockMessage = Mockito.mock(GeneratedMessage.class);
         Mockito.doReturn(UnknownFieldSet.getDefaultInstance()).when(mockMessage).getUnknownFields();
         AggregationMessage.create(mockMessage).serializeToBuffer();
     }
 
     @Test
     public void testToByteStringHostIdentification() {
-        final GeneratedMessageV3 protobufMessage = Messages.HostIdentification.getDefaultInstance();
+        final GeneratedMessage protobufMessage = Messages.HostIdentification.getDefaultInstance();
         final AggregationMessage message = AggregationMessage.create(protobufMessage);
         Assert.assertNotNull(message);
         Assert.assertSame(protobufMessage, message.getMessage());
@@ -92,14 +92,14 @@ public void testToByteStringHostIdentification() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testToByteStringSerializedUnsupportedMessage() {
-        final GeneratedMessageV3 mockMessage = Mockito.mock(GeneratedMessageV3.class);
+        final GeneratedMessage mockMessage = Mockito.mock(GeneratedMessage.class);
         Mockito.doReturn(UnknownFieldSet.getDefaultInstance()).when(mockMessage).getUnknownFields();
         AggregationMessage.create(mockMessage).serializeToByteString();
     }
 
     @Test
     public void testPekkoVsVertx() {
-        final GeneratedMessageV3 protobufMessage = Messages.HostIdentification.getDefaultInstance();
+        final GeneratedMessage protobufMessage = Messages.HostIdentification.getDefaultInstance();
         final AggregationMessage message = AggregationMessage.create(protobufMessage);
         Assert.assertNotNull(message);
         Assert.assertSame(protobufMessage, message.getMessage());