Skip to content

Use zoned date time in benchmark params #4351

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
Aug 25, 2023
Merged

Use zoned date time in benchmark params #4351

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
27 changes: 13 additions & 14 deletions ...k-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.infra.BenchmarkParams;
Expand All @@ -46,9 +45,9 @@ public class SdkBenchmarkParams {

private Mode mode;

@JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDateTime date;
@JsonSerialize(using = ZonedDateSerializer.class)
@JsonDeserialize(using = ZonedDateDeserializer.class)
private ZonedDateTime date;

public SdkBenchmarkParams() {
}
Expand All @@ -59,7 +58,7 @@ public SdkBenchmarkParams(BenchmarkParams benchmarkParams) {
this.jvmName = benchmarkParams.getVmName();
this.jvmVersion = benchmarkParams.getVmVersion();
this.mode = benchmarkParams.getMode();
this.date = LocalDateTime.now();
this.date = ZonedDateTime.now();
}

public String getSdkVersion() {
Expand Down Expand Up @@ -94,11 +93,11 @@ public void setJvmVersion(String jvmVersion) {
this.jvmVersion = jvmVersion;
}

public LocalDateTime getDate() {
public ZonedDateTime getDate() {
return date;
}

public void setDate(LocalDateTime date) {
public void setDate(ZonedDateTime date) {
this.date = date;
}

Expand All @@ -110,18 +109,18 @@ public void setMode(Mode mode) {
this.mode = mode;
}

private static class LocalDateSerializer extends JsonSerializer<LocalDateTime> {
private static class ZonedDateSerializer extends JsonSerializer<ZonedDateTime> {

@Override
public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
gen.writeString(value.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
public void serialize(ZonedDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
gen.writeString(value.format(DateTimeFormatter.ISO_ZONED_DATE_TIME));
}
}

private static class LocalDateDeserializer extends JsonDeserializer<LocalDateTime> {
private static class ZonedDateDeserializer extends JsonDeserializer<ZonedDateTime> {
@Override
public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
return LocalDateTime.parse(p.readValueAs(String.class));
public ZonedDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
return ZonedDateTime.parse(p.getValueAsString());
}
}
}
Loading