Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit a7746ad

Browse files
diegomarquezpdiegomarquezp
committed
make protobuf timestamp conversion fully precise (epoch seconds + nanos)
1 parent ca275dc commit a7746ad

5 files changed

Lines changed: 57 additions & 15 deletions

File tree

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/CreateBackupRequest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
2323
import com.google.common.base.Objects;
2424
import com.google.common.base.Preconditions;
25-
import com.google.protobuf.util.Timestamps;
25+
import com.google.protobuf.Timestamp;
2626
import javax.annotation.Nonnull;
2727

2828
/** Fluent wrapper for {@link com.google.bigtable.admin.v2.CreateBackupRequest} */
@@ -91,7 +91,11 @@ public CreateBackupRequest setHotToStandardTimeInstant(java.time.Instant hotToSt
9191
Preconditions.checkNotNull(hotToStandardTime);
9292
requestBuilder
9393
.getBackupBuilder()
94-
.setHotToStandardTime(Timestamps.fromMillis(hotToStandardTime.toEpochMilli()));
94+
.setHotToStandardTime(
95+
Timestamp.newBuilder()
96+
.setSeconds(hotToStandardTime.getEpochSecond())
97+
.setNanos(hotToStandardTime.getNano())
98+
.build());
9599
return this;
96100
}
97101

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/UpdateBackupRequest.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.google.common.base.Objects;
2525
import com.google.common.base.Preconditions;
2626
import com.google.protobuf.FieldMask;
27+
import com.google.protobuf.Timestamp;
2728
import com.google.protobuf.util.FieldMaskUtil;
28-
import com.google.protobuf.util.Timestamps;
2929
import javax.annotation.Nonnull;
3030

3131
/** Fluent wrapper for {@link com.google.bigtable.admin.v2.UpdateBackupRequest} */
@@ -62,7 +62,11 @@ public UpdateBackupRequest setExpireTimeInstant(java.time.Instant expireTime) {
6262
Preconditions.checkNotNull(expireTime);
6363
requestBuilder
6464
.getBackupBuilder()
65-
.setExpireTime(Timestamps.fromMillis(expireTime.toEpochMilli()));
65+
.setExpireTime(
66+
Timestamp.newBuilder()
67+
.setSeconds(expireTime.getEpochSecond())
68+
.setNanos(expireTime.getNano())
69+
.build());
6670
updateFieldMask(Backup.EXPIRE_TIME_FIELD_NUMBER);
6771
return this;
6872
}
@@ -81,7 +85,11 @@ public UpdateBackupRequest setHotToStandardTimeInstant(java.time.Instant hotToSt
8185
Preconditions.checkNotNull(hotToStandardTime);
8286
requestBuilder
8387
.getBackupBuilder()
84-
.setHotToStandardTime(Timestamps.fromMillis(hotToStandardTime.toEpochMilli()));
88+
.setHotToStandardTime(
89+
Timestamp.newBuilder()
90+
.setSeconds(hotToStandardTime.getEpochSecond())
91+
.setNanos(hotToStandardTime.getNano())
92+
.build());
8593
updateFieldMask(Backup.HOT_TO_STANDARD_TIME_FIELD_NUMBER);
8694
return this;
8795
}

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/CreateBackupRequestTest.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.bigtable.admin.v2.Backup;
2121
import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
2222
import com.google.cloud.bigtable.admin.v2.models.Backup.BackupType;
23-
import com.google.protobuf.util.Timestamps;
23+
import com.google.protobuf.Timestamp;
2424
import java.time.Duration;
2525
import java.time.Instant;
2626
import org.junit.Test;
@@ -53,10 +53,17 @@ public void testToProto() {
5353
.setBackup(
5454
Backup.newBuilder()
5555
.setSourceTable(NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID))
56-
.setExpireTime(Timestamps.fromMillis(EXPIRE_TIME.toEpochMilli()))
56+
.setExpireTime(
57+
Timestamp.newBuilder()
58+
.setSeconds(EXPIRE_TIME.getEpochSecond())
59+
.setNanos(EXPIRE_TIME.getNano())
60+
.build())
5761
.setBackupType(Backup.BackupType.HOT)
5862
.setHotToStandardTime(
59-
Timestamps.fromMillis(HOT_TO_STANDARD_TIME.toEpochMilli()))
63+
Timestamp.newBuilder()
64+
.setSeconds(HOT_TO_STANDARD_TIME.getEpochSecond())
65+
.setNanos(HOT_TO_STANDARD_TIME.getNano())
66+
.build())
6067
.build())
6168
.setParent(NameUtil.formatClusterName(PROJECT_ID, INSTANCE_ID, CLUSTER_ID))
6269
.build();

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/UpdateBackupRequestTest.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.bigtable.admin.v2.Backup;
2121
import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
2222
import com.google.protobuf.FieldMask;
23-
import com.google.protobuf.util.Timestamps;
23+
import com.google.protobuf.Timestamp;
2424
import java.time.Duration;
2525
import java.time.Instant;
2626
import org.junit.Test;
@@ -52,9 +52,16 @@ public void testToProto() {
5252
Backup.newBuilder()
5353
.setName(
5454
NameUtil.formatBackupName(PROJECT_ID, INSTANCE_ID, CLUSTER_ID, BACKUP_ID))
55-
.setExpireTime(Timestamps.fromMillis(EXPIRE_TIME.toEpochMilli()))
55+
.setExpireTime(
56+
Timestamp.newBuilder()
57+
.setSeconds(EXPIRE_TIME.getEpochSecond())
58+
.setNanos(EXPIRE_TIME.getNano())
59+
.build())
5660
.setHotToStandardTime(
57-
Timestamps.fromMillis(HOT_TO_STANDARD_TIME.toEpochMilli()))
61+
Timestamp.newBuilder()
62+
.setSeconds(HOT_TO_STANDARD_TIME.getEpochSecond())
63+
.setNanos(HOT_TO_STANDARD_TIME.getNano())
64+
.build())
5865
.build())
5966
.setUpdateMask(
6067
FieldMask.newBuilder()

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BuiltinMetricsIT.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,16 @@ public void testBuiltinMetricsWithDefaultOTEL() throws Exception {
220220
Instant end = Instant.now().plus(Duration.ofMinutes(3));
221221
TimeInterval interval =
222222
TimeInterval.newBuilder()
223-
.setStartTime(Timestamps.fromMillis(start.toEpochMilli()))
224-
.setEndTime(Timestamps.fromMillis(end.toEpochMilli()))
223+
.setStartTime(
224+
Timestamp.newBuilder()
225+
.setSeconds(start.getEpochSecond())
226+
.setNanos(start.getNano())
227+
.build())
228+
.setEndTime(
229+
Timestamp.newBuilder()
230+
.setSeconds(end.getEpochSecond())
231+
.setNanos(end.getNano())
232+
.build())
225233
.build();
226234

227235
for (String view : VIEWS) {
@@ -282,8 +290,16 @@ public void testBuiltinMetricsWithCustomOTEL() throws Exception {
282290
Instant end = start.plus(Duration.ofMinutes(3));
283291
TimeInterval interval =
284292
TimeInterval.newBuilder()
285-
.setStartTime(Timestamps.fromMillis(start.toEpochMilli()))
286-
.setEndTime(Timestamps.fromMillis(end.toEpochMilli()))
293+
.setStartTime(
294+
Timestamp.newBuilder()
295+
.setSeconds(start.getEpochSecond())
296+
.setNanos(start.getNano())
297+
.build())
298+
.setEndTime(
299+
Timestamp.newBuilder()
300+
.setSeconds(end.getEpochSecond())
301+
.setNanos(end.getNano())
302+
.build())
287303
.build();
288304

289305
for (String view : VIEWS) {

0 commit comments

Comments
 (0)