Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01dcb83
Bump com.google.protobuf:protobuf-java from 3.25.5 to 4.31.1
dependabot[bot] May 29, 2025
c62562b
update logback steno
BrandonArp May 29, 2025
913dae4
fix deprecation issues
BrandonArp May 29, 2025
9c6061f
update other protobuf deps
BrandonArp May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,21 +130,21 @@
<junit.version>4.13.2</junit.version>
<junitparams.version>1.1.1</junitparams.version>
<logback.version>1.5.18</logback.version>
<logback.steno.version>2.1.2</logback.steno.version>
<logback.steno.version>2.2.0</logback.steno.version>
<log4j.over.slf4j.version>2.0.17</log4j.over.slf4j.version>
<metrics.client.version>0.13.0</metrics.client.version>
<metrics.client.incubator.version>0.13.0</metrics.client.incubator.version>
<metrics.jvm.extra.version>0.13.1</metrics.jvm.extra.version>
<metrics.http.extra.version>0.13.1</metrics.http.extra.version>
<metrics.aggregator.protocol.version>1.2.1</metrics.aggregator.protocol.version>
<metrics.http.extra.version>0.14.0</metrics.http.extra.version>
<metrics.aggregator.protocol.version>1.3.0</metrics.aggregator.protocol.version>
<mockito.version>5.18.0</mockito.version>
<netty.version>4.0.56.Final</netty.version>
<netty.all.version>4.0.21.Final</netty.all.version>
<ning.http.client.version>1.9.31</ning.http.client.version>
<oval.version>3.2.1</oval.version>
<play.ws.version>3.0.7</play.ws.version>
<postgresql.version>42.7.6</postgresql.version>
<protobuf.version>3.25.5</protobuf.version>
<protobuf.version>4.31.1</protobuf.version>
<reflections.version>0.11.7</reflections.version>
<scala.version>2.13</scala.version>
<scala.library.version>2.13.16</scala.library.version>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/arpnetworking/clusteraggregator/client/AggClientConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.arpnetworking.tsdcore.statistics.Statistic;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.protobuf.GeneratedMessageV3;
import com.google.protobuf.GeneratedMessage;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
Expand Down Expand Up @@ -153,7 +153,7 @@ private void processMessages() {
while (messageOptional.isPresent()) {
final AggregationMessage message = messageOptional.get();
current = current.drop(message.getLength());
final GeneratedMessageV3 gm = message.getMessage();
final GeneratedMessage gm = message.getMessage();
if (gm instanceof Messages.HostIdentification) {
final Messages.HostIdentification hostIdent = (Messages.HostIdentification) gm;
_hostName = Optional.ofNullable(hostIdent.getHostName());
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/arpnetworking/clusteraggregator/client/HttpSourceActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.google.common.util.concurrent.AtomicDouble;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import com.google.protobuf.GeneratedMessageV3;
import com.google.protobuf.GeneratedMessage;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.http.HttpHeaders;
import org.apache.pekko.Done;
Expand Down Expand Up @@ -145,8 +145,8 @@ private void handleAggregation(

final AggregationMode aggregationMode = aggregationRequest.getAggregationMode();
for (final AggregationMessage aggregationMessage : aggregationRequest.getAggregationMessages()) {
final GeneratedMessageV3 generatedMessageV3 = aggregationMessage.getMessage();
if (generatedMessageV3 instanceof Messages.StatisticSetRecord) {
final GeneratedMessage generatedMessage = aggregationMessage.getMessage();
if (generatedMessage instanceof Messages.StatisticSetRecord) {
final Messages.StatisticSetRecord statisticSetRecord =
(Messages.StatisticSetRecord) aggregationMessage.getMessage();

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/arpnetworking/tsdcore/model/AggregationMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.InvalidProtocolBufferException;
import org.apache.commons.codec.binary.Hex;
import org.apache.pekko.util.ByteIterator;
Expand All @@ -42,7 +42,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);
}

Expand Down Expand Up @@ -139,7 +139,7 @@ public ByteString serialize() {
return AggregationMessage.serialize(_message);
}

private static ByteString serialize(final GeneratedMessageV3 message) {
private static ByteString serialize(final GeneratedMessage message) {
final ByteStringBuilder b = ByteString.createBuilder();
if (message instanceof Messages.HostIdentification) {
b.putByte((byte) 0x01);
Expand All @@ -166,24 +166,24 @@ private static ByteString serialize(final GeneratedMessageV3 message) {
return sizePrefix.result().concat(b.result());
}

public GeneratedMessageV3 getMessage() {
public GeneratedMessage getMessage() {
return _message;
}

public int getLength() {
return _length;
}

private AggregationMessage(final GeneratedMessageV3 message) {
private AggregationMessage(final GeneratedMessage message) {
this(message, serialize(message).length());
}

private AggregationMessage(final GeneratedMessageV3 message, final int length) {
private AggregationMessage(final GeneratedMessage message, final int length) {
_length = length;
_message = message;
}

private final GeneratedMessageV3 _message;
private final GeneratedMessage _message;
private final int _length;

private static final int BYTE_SIZE_IN_BYTES = 1;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/arpnetworking/tsdcore/model/AggregationMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 org.apache.pekko.util.ByteString;
import org.apache.pekko.util.ByteStringBuilder;
import org.junit.Assert;
Expand All @@ -34,7 +34,7 @@ public class AggregationMessageTest {

@Test
public void testHostIdentification() {
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());
Expand Down Expand Up @@ -65,7 +65,7 @@ public void testHostIdentification() {

@Test(expected = IllegalArgumentException.class)
public void testSerializedUnsupportedMessage() {
final GeneratedMessageV3 message = Messages.SparseHistogramEntry.newBuilder()
final GeneratedMessage message = Messages.SparseHistogramEntry.newBuilder()
.build();
AggregationMessage.create(message).serialize();
}
Expand Down