Skip to content

fix: filter out entities with empty ids #247

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 1 commit into from
Aug 4, 2021
Merged

fix: filter out entities with empty ids #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions ...e-reader/src/main/java/org/hypertrace/trace/reader/entities/DefaultTraceEntityReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.hypertrace.trace.reader.entities;

import static io.reactivex.rxjava3.core.Maybe.zip;
import static java.util.function.Predicate.not;

import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Single;
Expand Down Expand Up @@ -132,10 +133,12 @@ private Maybe<Entity> buildEntity(EntityType entityType, T trace, S span) {
this.resolveAllAttributes(entityType.getAttributeScope(), trace, span).cache();

Maybe<String> id =
attributes.mapOptional(map -> this.extractString(map, entityType.getIdAttributeKey()));
attributes.mapOptional(
map -> this.extractNonEmptyString(map, entityType.getIdAttributeKey()));

Maybe<String> name =
attributes.mapOptional(map -> this.extractString(map, entityType.getNameAttributeKey()));
attributes.mapOptional(
map -> this.extractNonEmptyString(map, entityType.getNameAttributeKey()));

return zip(
id,
Expand Down Expand Up @@ -187,13 +190,14 @@ private Maybe<Entry<String, AttributeValue>> resolveAttribute(
.map(value -> Map.entry(attributeMetadata.getKey(), value));
}

private Optional<String> extractString(
private Optional<String> extractNonEmptyString(
Map<String, AttributeValue> attributeValueMap, String key) {
return Optional.ofNullable(attributeValueMap.get(key))
.filter(value -> value.getTypeCase().equals(TypeCase.VALUE))
.map(AttributeValue::getValue)
.filter(value -> value.getTypeCase().equals(Value.TypeCase.STRING))
.map(Value::getString);
.map(Value::getString)
.filter(not(String::isEmpty));
}

private GrpcRxExecutionContext spanTenantContext(S span) {
Expand Down
17 changes: 17 additions & 0 deletions ...ader/src/test/java/org/hypertrace/trace/reader/entities/DefaultTraceEntityReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,23 @@ void omitsEntityBasedOnMissingAttributes() {
.getAssociatedEntityForSpan(TEST_ENTITY_TYPE_NAME, TEST_TRACE, TEST_SPAN)
.isEmpty()
.blockingGet());
verifyNoInteractions(mockDataClient);
}

@Test
void omitsEntityBasedOnEmptyId() {
mockSingleEntityType();
mockGetAllAttributes(TEST_ENTITY_ID_ATTRIBUTE, TEST_ENTITY_NAME_ATTRIBUTE);
mockTenantId();
mockAttributeRead(TEST_ENTITY_ID_ATTRIBUTE, stringLiteral(""));
mockAttributeRead(TEST_ENTITY_NAME_ATTRIBUTE, stringLiteral(TEST_ENTITY_NAME_ATTRIBUTE_VALUE));

assertTrue(
this.entityReader
.getAssociatedEntityForSpan(TEST_ENTITY_TYPE_NAME, TEST_TRACE, TEST_SPAN)
.isEmpty()
.blockingGet());
verifyNoInteractions(mockDataClient);
}

@Test
Expand Down