Skip to content

Polish gh-3625 #3860

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.

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
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ default Map<String, String> resourceAttributes() {
* {@link AggregationTemporality} of the OtlpMeterRegistry. This determines whether
* the meters should be cumulative(AGGREGATION_TEMPORALITY_CUMULATIVE) or
* step/delta(AGGREGATION_TEMPORALITY_DELTA).
* @return the aggregationTemporality for OtlpRegistry
* @return the aggregationTemporality for OtlpMeterRegistry
* @see <a href=
* "https://opentelemetry.io/docs/reference/specification/metrics/data-model/#temporality">OTLP
* Temporality</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private OtlpMeterRegistry(OtlpConfig config, Clock clock, HttpSender httpSender)
this.resource = Resource.newBuilder().addAllAttributes(getResourceAttributes()).build();
this.otlpAggregationTemporality = AggregationTemporality
.toOtlpAggregationTemporality(config.aggregationTemporality());
this.setDeltaAggregationTimeUnixNano();
setDeltaAggregationTimeUnixNano();
config().namingConvention(NamingConvention.dot);
start(DEFAULT_THREAD_FACTORY);
}
Expand All @@ -131,7 +131,7 @@ public void stop() {
@Override
protected void publish() {
if (isDelta()) {
this.setDeltaAggregationTimeUnixNano();
setDeltaAggregationTimeUnixNano();
}
for (List<Meter> batch : MeterPartition.partition(this, config.batchSize())) {
List<Metric> metrics = batch.stream()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ class OtlpStepDistributionSummary extends AbstractDistributionSummary {
private final StepMax max;

/**
* Create a new {@code StepDistributionSummary}.
* Create a new {@code OtlpStepDistributionSummary}.
* @param id ID
* @param clock clock
* @param distributionStatisticConfig distribution static configuration
* @param distributionStatisticConfig distribution statistic configuration
* @param scale scale
* @param stepMillis step in milliseconds
*/
public OtlpStepDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
OtlpStepDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
double scale, long stepMillis) {
super(id, scale, OtlpMeterRegistry.getHistogram(clock, distributionStatisticConfig,
AggregationTemporality.DELTA, stepMillis));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ class OtlpStepTimer extends AbstractTimer {
private final StepMax max;

/**
* Create a new {@code StepTimer}.
* Create a new {@code OtlpStepTimer}.
* @param id ID
* @param clock clock
* @param distributionStatisticConfig distribution statistic configuration
* @param pauseDetector pause detector
* @param baseTimeUnit base time unit
* @param stepDurationMillis step in milliseconds
*/
public OtlpStepTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
OtlpStepTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
PauseDetector pauseDetector, TimeUnit baseTimeUnit, long stepDurationMillis) {
super(id, clock, pauseDetector, baseTimeUnit, OtlpMeterRegistry.getHistogram(clock, distributionStatisticConfig,
AggregationTemporality.DELTA, stepDurationMillis));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,22 @@ void aggregationTemporalityDefault() {
assertThat(otlpConfig.validate().isValid()).isTrue();
assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.CUMULATIVE);

properties.put("otlp.aggregationTemporality", AggregationTemporality.CUMULATIVE.toString());
properties.put("otlp.aggregationTemporality", AggregationTemporality.CUMULATIVE.name());
assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.CUMULATIVE);
}

@Test
void aggregationTemporalityDelta() {
Map<String, String> properties = new HashMap<>();
properties.put("otlp.aggregationTemporality", AggregationTemporality.DELTA.toString());
properties.put("otlp.aggregationTemporality", AggregationTemporality.DELTA.name());

OtlpConfig otlpConfig = properties::get;
assertThat(otlpConfig.validate().isValid()).isTrue();
assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.DELTA);
}

@Test
void inValidAggregationTemporalityShouldBeCaptured() {
void invalidAggregationTemporalityShouldBeCaptured() {
Map<String, String> properties = new HashMap<>();
properties.put("otlp.aggregationTemporality", "some_random_thing");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ void longTaskTimer() {
void testMetricsStartAndEndTime() {
Counter counter = Counter.builder("test_publish_time").register(registry);
final long startTime = ((StartTimeAwareMeter) counter).getStartTimeNanos();
Function<Meter, NumberDataPoint> getDataPoint = (Meter meter) -> writeToMetric(meter).getSum().getDataPoints(0);
Function<Meter, NumberDataPoint> getDataPoint = (meter) -> writeToMetric(meter).getSum().getDataPoints(0);
assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(startTime);
assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(1000000L);
clock.addSeconds(59);
Expand Down
Loading