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

[Dynatrace v2] Update to utils library v2 #4064

Closed
wants to merge 9 commits into from
Closed

[Dynatrace v2] Update to utils library v2 #4064

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd40784
Dynatrace update to utils library v2
mkleinegger Aug 31, 2023
e180651
finishing touches
pirgeo Sep 7, 2023
ac0c96c
Use latest dynatrace-metric-utils-java
arminru Sep 12, 2023
32bb4fe
fix: ensure metadataLine is not null, move null check to metadataBuil…
pichlermarc Sep 18, 2023
d772d10
fix: rename createMetadataBuilder() -> createMetadataStep()
pichlermarc Sep 18, 2023
0d6d7f0
fix: add comment clarifying why index starts at 1
pichlermarc Sep 18, 2023
98f3514
fix: rename for clarity
pichlermarc Sep 18, 2023
75ab913
fix: rename metadata step arguments, renmae enrichMetadataBuilder() -…
pichlermarc Sep 18, 2023
fac673e
fix: apply format
pichlermarc Sep 18, 2023
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
Prev Previous commit
Next Next commit
fix: rename createMetadataBuilder() -> createMetadataStep()
  • Loading branch information
@pichlermarc
pichlermarc committed Sep 18, 2023
commit d772d10cfa0b422a8849651efa1bba4cd4eafc40
20 changes: 10 additions & 10 deletions ...eter-registry-dynatrace/src/main/java/io/micrometer/dynatrace/v2/DynatraceExporterV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ private String createGaugeLine(Meter meter, Map<String, String> seenMetadata, Me
}
MetricLineBuilder.GaugeStep metricBuilder = createMetricBuilder(meter).gauge();
jonatan-ivanov marked this conversation as resolved.
Show resolved Hide resolved

storeMetadataLine(createMetadataBuilder(metricBuilder, meter), seenMetadata);
storeMetadataLine(createMetadataStep(metricBuilder, meter), seenMetadata);

return metricBuilder.value(value).timestamp(Instant.ofEpochMilli(clock.wallTime())).build();
}
Expand All @@ -244,7 +244,7 @@ private String createCounterLine(Meter meter, Map<String, String> seenMetadata,
try {
MetricLineBuilder.CounterStep metricBuilder = createMetricBuilder(meter).count();

storeMetadataLine(createMetadataBuilder(metricBuilder, meter), seenMetadata);
storeMetadataLine(createMetadataStep(metricBuilder, meter), seenMetadata);

return metricBuilder.delta(measurement.getValue())
.timestamp(Instant.ofEpochMilli(clock.wallTime()))
Expand Down Expand Up @@ -301,7 +301,7 @@ private Stream<String> createSummaryLine(Meter meter, Map<String, String> seenMe
try {
MetricLineBuilder.GaugeStep metricBuilder = createMetricBuilder(meter).gauge();

storeMetadataLine(createMetadataBuilder(metricBuilder, meter), seenMetadata);
storeMetadataLine(createMetadataStep(metricBuilder, meter), seenMetadata);

return Stream.of(metricBuilder.summary(min, max, total, count)
.timestamp(Instant.ofEpochMilli(clock.wallTime()))
Expand Down Expand Up @@ -466,13 +466,13 @@ private void handleSuccess(int totalSent, HttpSender.Response response) {
}
}

private MetricLineBuilder.MetadataStep createMetadataBuilder(MetricLineBuilder.GaugeStep metricBuilder,
Meter meter) {
private MetricLineBuilder.MetadataStep createMetadataStep(MetricLineBuilder.GaugeStep metricBuilder,
Meter meter) {
return enrichMetadataBuilder(metricBuilder.metadata(), meter);
}

private MetricLineBuilder.MetadataStep createMetadataBuilder(MetricLineBuilder.CounterStep metricBuilder,
Meter meter) {
private MetricLineBuilder.MetadataStep createMetadataStep(MetricLineBuilder.CounterStep metricBuilder,
Meter meter) {
return enrichMetadataBuilder(metricBuilder.metadata(), meter);
}

Expand All @@ -481,19 +481,19 @@ private MetricLineBuilder.MetadataStep enrichMetadataBuilder(MetricLineBuilder.M
return metadataBuilder.description(meter.getId().getDescription()).unit(meter.getId().getBaseUnit());
}

private void storeMetadataLine(MetricLineBuilder.MetadataStep metadataBuilder, Map<String, String> seenMetadata)
private void storeMetadataLine(MetricLineBuilder.MetadataStep metadataStep, Map<String, String> seenMetadata)
throws MetricException {
// if the config to export metadata is turned off, the seenMetadata map will be
// null.
if (seenMetadata == null) {
return;
}

if (metadataBuilder == null) {
if (metadataStep == null) {
return;
}

String metadataLine = metadataBuilder.build();
String metadataLine = metadataStep.build();

if (metadataLine == null){
return;
Expand Down