From 5341126da8a77594d116d8561153043d1d68b5ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 21:54:24 +0000
Subject: [PATCH 1/4] Bump com.google.errorprone:error_prone_core from 2.35.1
 to 2.36.0

Bumps [com.google.errorprone:error_prone_core](https://github.com/google/error-prone) from 2.35.1 to 2.36.0.
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.35.1...v2.36.0)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 astra/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/astra/pom.xml b/astra/pom.xml
index 196d972fe3..a435ec7cd5 100644
--- a/astra/pom.xml
+++ b/astra/pom.xml
@@ -29,7 +29,7 @@
         <curator.version>5.7.1</curator.version>
         <log4j.version>2.24.2</log4j.version>
         <aws.sdk.version>2.29.24</aws.sdk.version>
-        <error.prone.version>2.35.1</error.prone.version>
+        <error.prone.version>2.36.0</error.prone.version>
         <junit.jupiter.version>5.11.3</junit.jupiter.version>
     </properties>
 

From 971eff7ede8cd3ee6132d14d6dbf50dfd19e3cea Mon Sep 17 00:00:00 2001
From: kyle-sammons <kyle.sammons@protonmail.com>
Date: Mon, 2 Dec 2024 14:23:46 -0800
Subject: [PATCH 2/4] Add --should-stop=ifError=FLOW

---
 astra/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/astra/pom.xml b/astra/pom.xml
index a435ec7cd5..901b292fa7 100644
--- a/astra/pom.xml
+++ b/astra/pom.xml
@@ -567,6 +567,7 @@
                         <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+                        <arg>>--should-stop=ifError=FLOW</arg>
                         <!-- Error prone settings -->
                         <arg>
                             <!-- TODO: consider removing all specific error upgrades in favor of -Werror (all warnings as build errors) -->

From 4c600def2d8701fbb4eb886571a16bb243166239 Mon Sep 17 00:00:00 2001
From: kyle-sammons <kyle.sammons@protonmail.com>
Date: Mon, 2 Dec 2024 14:25:47 -0800
Subject: [PATCH 3/4] Remove extraneous >

---
 astra/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/astra/pom.xml b/astra/pom.xml
index 901b292fa7..61446bc3cb 100644
--- a/astra/pom.xml
+++ b/astra/pom.xml
@@ -567,7 +567,7 @@
                         <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
-                        <arg>>--should-stop=ifError=FLOW</arg>
+                        <arg>--should-stop=ifError=FLOW</arg>
                         <!-- Error prone settings -->
                         <arg>
                             <!-- TODO: consider removing all specific error upgrades in favor of -Werror (all warnings as build errors) -->

From cc054335209c08e0826cb12f428eb3f739e47c1c Mon Sep 17 00:00:00 2001
From: kyle-sammons <kyle.sammons@protonmail.com>
Date: Mon, 2 Dec 2024 15:42:11 -0800
Subject: [PATCH 4/4] Collapse duplicate branches

---
 .../slack/astra/schema/SpanFormatterWithSchemaTest.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/astra/src/test/java/com/slack/astra/schema/SpanFormatterWithSchemaTest.java b/astra/src/test/java/com/slack/astra/schema/SpanFormatterWithSchemaTest.java
index 46b61927a4..6f94daf890 100644
--- a/astra/src/test/java/com/slack/astra/schema/SpanFormatterWithSchemaTest.java
+++ b/astra/src/test/java/com/slack/astra/schema/SpanFormatterWithSchemaTest.java
@@ -603,13 +603,8 @@ public void testTraceProtoToLuceneDocumentTest() throws Exception {
                   assertThat(field.binaryValue().utf8ToString()).isEqualTo(tag.getVStr());
                 } else if (fieldType == FieldType.IP) {
                   assertThat(tag.getFieldType()).isEqualTo(Schema.SchemaFieldType.IP);
-                  if (field instanceof SortedDocValuesField) {
-                    assertThat(InetAddressPoint.decode(field.binaryValue().bytes).getHostName())
-                        .isEqualTo(tag.getVStr());
-                  } else {
-                    assertThat(InetAddressPoint.decode(field.binaryValue().bytes).getHostName())
-                        .isEqualTo(tag.getVStr());
-                  }
+                  assertThat(InetAddressPoint.decode(field.binaryValue().bytes).getHostName())
+                      .isEqualTo(tag.getVStr());
                 } else if (fieldType == FieldType.BYTE) {
                   assertThat(tag.getFieldType()).isEqualTo(Schema.SchemaFieldType.BYTE);
                   assertThat(field.numericValue().byteValue()).isEqualTo((byte) tag.getVInt32());