diff --git a/astra/pom.xml b/astra/pom.xml index e77484ffc4..f09cb67250 100644 --- a/astra/pom.xml +++ b/astra/pom.xml @@ -665,7 +665,7 @@ com.google.googlejavaformat google-java-format - 1.22.0 + 1.23.0 diff --git a/astra/src/main/java/com/slack/astra/writer/SpanFormatter.java b/astra/src/main/java/com/slack/astra/writer/SpanFormatter.java index 8a2abadc53..d73a519aeb 100644 --- a/astra/src/main/java/com/slack/astra/writer/SpanFormatter.java +++ b/astra/src/main/java/com/slack/astra/writer/SpanFormatter.java @@ -106,7 +106,7 @@ public static Trace.KeyValue makeTraceKV(String key, Object value, Schema.Schema } return tagBuilder.build(); } catch (Exception e) { - tagBuilder.setKey(STR."failed_\{key}"); + tagBuilder.setKey(String.format("failed_%s", key)); tagBuilder.setFieldType(Schema.SchemaFieldType.KEYWORD); tagBuilder.setVStr(value.toString()); return tagBuilder.build(); @@ -133,7 +133,7 @@ public static List convertKVtoProto( } Trace.KeyValue additionalKV = makeTraceKV( - STR."\{key}.\{additionalField.getKey()}", + String.format("%s.%s", key, additionalField.getKey()), value, additionalField.getValue().getType()); tags.add(additionalKV); @@ -155,7 +155,7 @@ public static List convertKVtoProtoDefault( .forEach( (key1, value1) -> { List nestedValues = - convertKVtoProtoDefault(STR."\{key}.\{key1}", value1, schema); + convertKVtoProtoDefault(String.format("%s.%s", key, key1), value1, schema); tags.addAll(nestedValues); }); } else if (value instanceof String || value instanceof List) { @@ -176,7 +176,7 @@ public static List convertKVtoProtoDefault( } Trace.KeyValue additionalKV = makeTraceKV( - STR."\{key}.\{additionalField.getKey()}", + String.format("%s.%s", key, additionalField.getKey()), value, additionalField.getValue().getType()); tags.add(additionalKV); diff --git a/astra/src/test/java/com/slack/astra/logstore/opensearch/OpenSearchAdapterTest.java b/astra/src/test/java/com/slack/astra/logstore/opensearch/OpenSearchAdapterTest.java index 0e8060cd81..ad1d9b9abb 100644 --- a/astra/src/test/java/com/slack/astra/logstore/opensearch/OpenSearchAdapterTest.java +++ b/astra/src/test/java/com/slack/astra/logstore/opensearch/OpenSearchAdapterTest.java @@ -482,7 +482,7 @@ public void shouldParseIdFieldSearch() throws Exception { IndexSearcher indexSearcher = logStoreAndSearcherRule.logStore.getSearcherManager().acquire(); Query idQuery = openSearchAdapter.buildQuery( - "foo", STR."\{idField}:\{idValue}", null, null, indexSearcher, null); + "foo", String.format("%s:%s", idField, idValue), null, null, indexSearcher, null); BytesRef queryStrBytes = new BytesRef(Uid.encodeId("1").bytes); // idQuery.toString="#_id:([fe 1f])" // queryStrBytes.toString="[fe 1f]"