@@ -92,14 +92,14 @@ private Multimap<ProjectName, TimeSeries> convertMetricData(MetricData metricDat
9292 }
9393
9494 ImmutableMultimap .Builder <ProjectName , TimeSeries > builder = ImmutableMultimap .builder ();
95-
95+ MetricKind metricKind = convertMetricKind ( metricData );
9696 for (PointData pd : metricData .getData ().getPoints ()) {
9797 ProjectName projectName =
9898 metricDef .getSchema ().extractProjectName (pd .getAttributes (), envInfo , clientInfo );
9999
100100 TimeSeries timeSeries =
101101 TimeSeries .newBuilder ()
102- .setMetricKind (convertMetricKind ( metricData ) )
102+ .setMetricKind (metricKind )
103103 .setValueType (convertValueType (metricData .getType ()))
104104 .setResource (
105105 metricDef
@@ -110,20 +110,22 @@ private Multimap<ProjectName, TimeSeries> convertMetricData(MetricData metricDat
110110 .setType (metricDef .getExternalName ())
111111 .putAllLabels (
112112 metricDef .extractMetricLabels (pd .getAttributes (), envInfo , clientInfo )))
113- .addPoints (convertPointData (metricData .getType (), pd ))
113+ .addPoints (convertPointData (metricData .getType (), pd , metricKind ))
114114 .build ();
115115
116116 builder .put (projectName , timeSeries );
117117 }
118118 return builder .build ();
119119 }
120120
121- private Point convertPointData (MetricDataType type , PointData pointData ) {
121+ private Point convertPointData (MetricDataType type , PointData pointData , MetricKind metricKind ) {
122+ long startNanos = metricKind == GAUGE ? pointData .getEpochNanos () : pointData .getStartEpochNanos ();
123+
122124 TimeInterval timeInterval =
123- TimeInterval .newBuilder ()
124- .setStartTime (Timestamps .fromNanos (pointData . getStartEpochNanos () ))
125- .setEndTime (Timestamps .fromNanos (pointData .getEpochNanos ()))
126- .build ();
125+ TimeInterval .newBuilder ()
126+ .setStartTime (Timestamps .fromNanos (startNanos ))
127+ .setEndTime (Timestamps .fromNanos (pointData .getEpochNanos ()))
128+ .build ();
127129
128130 Point .Builder builder = Point .newBuilder ().setInterval (timeInterval );
129131 switch (type ) {
0 commit comments