Skip to content
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

Jump to bottom

Remove the duplicate key/value when ingesting log from opentelemetry-dotnet #4394

Closed
wants to merge 2 commits into from
Closed

Remove the duplicate key/value when ingesting log from opentelemetry-dotnet #4394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ea7f86
Remove the duplicate key/value in Otel collector
hoangthanh28 Mar 31, 2024
24ae806
Adding unit test
hoangthanh28 Apr 13, 2024
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 ...to-common/src/main/java/org/opensearch/dataprepper/plugins/otel/codec/OTelProtoCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ public static Object convertAnyValue(final AnyValue value) {
*/
public static Map<String, Object> convertKeysOfDataPointAttributes(final NumberDataPoint numberDataPoint) {
return numberDataPoint.getAttributesList().stream()
.collect(Collectors.toMap(i -> PREFIX_AND_METRIC_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue())));
.collect(Collectors.toMap(i -> PREFIX_AND_METRIC_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue()), (existing, replacement) -> existing));
}

/**
Expand All @@ -1099,7 +1099,7 @@ public static Map<String, Object> convertKeysOfDataPointAttributes(final NumberD
*/
public static Map<String, Object> unpackKeyValueList(List<KeyValue> attributesList) {
return attributesList.stream()
.collect(Collectors.toMap(i -> PREFIX_AND_METRIC_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue())));
.collect(Collectors.toMap(i -> PREFIX_AND_METRIC_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue()), (existing, replacement) -> existing));
}

/**
Expand All @@ -1112,7 +1112,7 @@ public static Map<String, Object> unpackKeyValueList(List<KeyValue> attributesLi
*/
public static Map<String, Object> unpackKeyValueListLog(List<KeyValue> attributesList) {
return attributesList.stream()
.collect(Collectors.toMap(i -> PREFIX_AND_LOG_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue())));
.collect(Collectors.toMap(i -> PREFIX_AND_LOG_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue()), (existing, replacement) -> existing));
}


Expand All @@ -1126,7 +1126,7 @@ public static Map<String, Object> unpackKeyValueListLog(List<KeyValue> attribute
*/
public static Map<String, Object> unpackExemplarValueList(List<KeyValue> attributesList) {
return attributesList.stream()
.collect(Collectors.toMap(i -> PREFIX_AND_EXEMPLAR_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue())));
.collect(Collectors.toMap(i -> PREFIX_AND_EXEMPLAR_ATTRIBUTES_REPLACE_DOT_WITH_AT.apply(i.getKey()), i -> convertAnyValue(i.getValue()), (existing, replacement) -> existing));
}


Expand Down
57 changes: 57 additions & 0 deletions ...ommon/src/test/java/org/opensearch/dataprepper/plugins/otel/codec/OTelProtoCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,4 +1318,61 @@ public void testBoundsKeyNotEqualsSign() {
assertNotEquals(k1, k2);
}

@Test
void testConvertKeysOfDataPointAttributesRemoveDuplicatedKey() {
final String keyName = "duplicate_key_name";
final String keyValue = "duplicate_value";
final KeyValue duplicateAttribute1 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final KeyValue duplicateAttribute2 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final NumberDataPoint actual = NumberDataPoint.newBuilder()
.addAllAttributes(Arrays.asList(duplicateAttribute1, duplicateAttribute2)).build();

Map<String, Object> map = OTelProtoCodec.convertKeysOfDataPointAttributes(actual);
assertThat(map.size(), is(equalTo(1)));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand, that it is enough to test for non-duplication. However, this is unspecified behaviour, when the key values are different. It is not clear, which value will be chosen. Even if this is undocumented behaviour, I think the unit test should force a specific selection. This is how I understand @dlvenable comment: #4394 (comment)

}

@Test
void testUnpackKeyValueListRemoveDuplicatedKey() {
final String keyName = "duplicate_key_name";
final String keyValue = "duplicate_value";
final KeyValue duplicateAttribute1 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final KeyValue duplicateAttribute2 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final List<KeyValue> actual = Arrays.asList(duplicateAttribute1, duplicateAttribute2);

Map<String, Object> map = OTelProtoCodec.unpackKeyValueList(actual);
assertThat(map.size(), is(equalTo(1)));
}

@Test
void testUnpackKeyValueListLogRemoveDuplicatedKey() {
final String keyName = "duplicate_key_name";
final String keyValue = "duplicate_value";
final KeyValue duplicateAttribute1 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final KeyValue duplicateAttribute2 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final List<KeyValue> actual = Arrays.asList(duplicateAttribute1, duplicateAttribute2);

Map<String, Object> map = OTelProtoCodec.unpackKeyValueListLog(actual);
assertThat(map.size(), is(equalTo(1)));
}

@Test
void testUnpackExemplarValueListRemoveDuplicatedKey() {
final String keyName = "duplicate_key_name";
final String keyValue = "duplicate_value";
final KeyValue duplicateAttribute1 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final KeyValue duplicateAttribute2 = KeyValue.newBuilder().setKey(keyName).setValue(AnyValue.newBuilder()
.setStringValue(keyValue).build()).build();
final List<KeyValue> actual = Arrays.asList(duplicateAttribute1, duplicateAttribute2);

Map<String, Object> map = OTelProtoCodec.unpackExemplarValueList(actual);
assertThat(map.size(), is(equalTo(1)));
}

}
Loading