Skip to content

Commit

Permalink
Polish micrometer-metricsgh-4064
Browse files Browse the repository at this point in the history
  • Loading branch information
@izeye
izeye committed Oct 9, 2023
1 parent 3d42c8b commit 79ed1db
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 26 deletions.
6 changes: 3 additions & 3 deletions ...eter-registry-dynatrace/src/main/java/io/micrometer/dynatrace/v2/DynatraceExporterV2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public DynatraceExporterV2(DynatraceConfig config, Clock clock, HttpSender httpC
try {
MetricLinePreConfiguration.Builder preConfigBuilder = MetricLinePreConfiguration.builder()
.prefix(config.metricKeyPrefix())
.defaultDimensions(enrichWithMetricsSourceDimension(config.defaultDimensions()));
.defaultDimensions(enrichWithMetricsSourceDimensions(config.defaultDimensions()));

if (config.enrichWithDynatraceMetadata()) {
preConfigBuilder.dynatraceMetadataDimensions();
Expand Down Expand Up @@ -126,7 +126,7 @@ private boolean shouldIgnoreToken(DynatraceConfig config) {
return false;
}

private Map<String, String> enrichWithMetricsSourceDimension(Map<String, String> defaultDimensions) {
private Map<String, String> enrichWithMetricsSourceDimensions(Map<String, String> defaultDimensions) {
LinkedHashMap<String, String> orderedDimensions = new LinkedHashMap<>(defaultDimensions);
orderedDimensions.putAll(staticDimensions);
return orderedDimensions;
Expand Down Expand Up @@ -452,7 +452,7 @@ private MetricLineBuilder.MetadataStep enrichMetadata(MetricLineBuilder.Metadata
}

/**
* Adds metadata found in {@link MetadataStep} to the {@code seenMetadata}
* Adds metadata found in {@link MetadataStep} to the {@code seenMetadata}.
* @param metadataStep source of the metadata that should be added to
* {@code seenMetadata}
* @param seenMetadata destination of the metadata
Expand Down
50 changes: 27 additions & 23 deletions ...-registry-dynatrace/src/test/java/io/micrometer/dynatrace/v2/DynatraceExporterV2Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,9 +537,10 @@ void toGaugeLineShouldContainTags() {

List<String> lines = exporter.toGaugeLine(gauge, SEEN_METADATA).collect(Collectors.toList());

assertThat(lines).hasSize(1);
assertThat(extractBase(lines.get(0))).isEqualTo("my.gauge gauge,1.23 " + clock.wallTime());
assertThat(expectedDims).containsExactlyInAnyOrderElementsOf(extractDims(lines.get(0)));
assertThat(lines).hasSize(1).first().satisfies(line -> {
assertThat(extractBase(line)).isEqualTo("my.gauge gauge,1.23 " + clock.wallTime());
assertThat(extractDims(line)).containsExactlyInAnyOrderElementsOf(expectedDims);
});
}

@Test
Expand All @@ -552,9 +553,10 @@ void toGaugeLineShouldOmitBlankTagValues() {

List<String> lines = exporter.toGaugeLine(gauge, SEEN_METADATA).collect(Collectors.toList());

assertThat(lines).hasSize(1);
assertThat(extractBase(lines.get(0))).isEqualTo("my.gauge gauge,1.23 " + clock.wallTime());
assertThat(expectedDims).containsExactlyInAnyOrderElementsOf(extractDims(lines.get(0)));
assertThat(lines).hasSize(1).first().satisfies(line -> {
assertThat(extractBase(line)).isEqualTo("my.gauge gauge,1.23 " + clock.wallTime());
assertThat(extractDims(line)).containsExactlyInAnyOrderElementsOf(expectedDims);
});
}

@Test
Expand All @@ -575,9 +577,10 @@ void toCounterLineShouldContainTags() {

List<String> lines = exporter.toCounterLine(counter, SEEN_METADATA).collect(Collectors.toList());

assertThat(lines).hasSize(1);
assertThat(extractBase(lines.get(0))).isEqualTo("my.counter count,delta=0 " + clock.wallTime());
assertThat(expectedDims).containsExactlyInAnyOrderElementsOf(extractDims(lines.get(0)));
assertThat(lines).hasSize(1).first().satisfies(line -> {
assertThat(extractBase(line)).isEqualTo("my.counter count,delta=0 " + clock.wallTime());
assertThat(extractDims(line)).containsExactlyInAnyOrderElementsOf(expectedDims);
});
}

@Test
Expand All @@ -590,9 +593,10 @@ void toCounterLineShouldOmitBlankTagValues() {

List<String> lines = exporter.toCounterLine(counter, SEEN_METADATA).collect(Collectors.toList());

assertThat(lines).hasSize(1);
assertThat(extractBase(lines.get(0))).isEqualTo("my.counter count,delta=0 " + clock.wallTime());
assertThat(expectedDims).containsExactlyInAnyOrderElementsOf(extractDims(lines.get(0)));
assertThat(lines).hasSize(1).first().satisfies(line -> {
assertThat(extractBase(line)).isEqualTo("my.counter count,delta=0 " + clock.wallTime());
assertThat(extractDims(line)).containsExactlyInAnyOrderElementsOf(expectedDims);
});
}

@Test
Expand Down Expand Up @@ -898,22 +902,22 @@ void conflictingMetadataIsIgnored() {
clock.add(config.step());
exporter.export(meterRegistry.getMeters());

List<List<String>> expectedDimes = Arrays.asList(
Arrays.asList("counter-number=counter1", "dt.metrics.source=micrometer"),
Arrays.asList("counter-number=counter2", "dt.metrics.source=micrometer"));
List<String> expectedBases = Arrays.asList("my.count count,delta=5.234 " + clock.wallTime(),
"my.count count,delta=2.345 " + clock.wallTime());
Iterator<List<String>> expectedDims = Arrays
.asList(Arrays.asList("counter-number=counter1", "dt.metrics.source=micrometer"),
Arrays.asList("counter-number=counter2", "dt.metrics.source=micrometer"))
.iterator();
Iterator<String> expectedBases = Arrays
.asList("my.count count,delta=5.234 " + clock.wallTime(), "my.count count,delta=2.345 " + clock.wallTime())
.iterator();

ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
verify(builder).withPlainText(stringArgumentCaptor.capture());
List<String> lines = Arrays.asList(stringArgumentCaptor.getValue().split("\n"));

assertThat(lines).hasSize(2)
.extracting(line -> extractBase(line))
.containsExactlyInAnyOrderElementsOf(expectedBases);
for (int i = 0; i < lines.size(); i++) {
assertThat(extractDims(lines.get(i))).containsExactlyInAnyOrderElementsOf(expectedDimes.get(i));
}
assertThat(lines).hasSize(2).allSatisfy(line -> {
assertThat(extractBase(line)).isEqualTo(expectedBases.next());
assertThat(extractDims(line)).containsExactlyInAnyOrderElementsOf(expectedDims.next());
});
}

@Test
Expand Down

0 comments on commit 79ed1db

Please sign in to comment.