Skip to content

Allow putDimensionSet after setDimensions #63

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
Jan 5, 2021
Merged

Allow putDimensionSet after setDimensions #63

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
2 changes: 1 addition & 1 deletion src/main/java/software/amazon/cloudwatchlogs/emf/model/MetricDirective.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ List<Set<String>> getAllDimensionKeys() {
*/
void setDimensions(List<DimensionSet> dimensionSets) {
shouldUseDefaultDimension = false;
dimensions = dimensionSets;
dimensions = new ArrayList<>(dimensionSets);
}

/**
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/software/amazon/cloudwatchlogs/emf/model/MetricDirectiveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Arrays;
import java.util.Collections;
import org.junit.Test;

public class MetricDirectiveTest {
Expand Down Expand Up @@ -126,4 +127,18 @@ public void testPutDimensionsWhenDefaultDimensionsDefined() throws JsonProcessin
serializedMetricDirective,
"{\"Dimensions\":[[\"Version\",\"Region\"],[\"Version\",\"Instance\"]],\"Metrics\":[],\"Namespace\":\"aws-embedded-metrics\"}");
}

@Test
public void testPutDimensionsAfterSetDimensions() throws JsonProcessingException {
MetricDirective metricDirective = new MetricDirective();
metricDirective.setDimensions(Collections.singletonList(DimensionSet.of("Version", "1")));
metricDirective.putDimensionSet(DimensionSet.of("Region", "us-east-1"));
metricDirective.putDimensionSet(DimensionSet.of("Instance", "inst-1"));

String serializedMetricDirective = objectMapper.writeValueAsString(metricDirective);

assertEquals(
serializedMetricDirective,
"{\"Dimensions\":[[\"Version\"],[\"Region\"],[\"Instance\"]],\"Metrics\":[],\"Namespace\":\"aws-embedded-metrics\"}");
}
}