W-13680300: fix empty response

salesforce · Sep 8, 2023 · 7f16783 · 7f16783
1 parent 09fa531
commit 7f16783
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/...ervice/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataServlet.java b/...ervice/src/main/java/com/demandware/carbonj/service/engine/GraphiteSeriesDataServlet.java
@@ -164,27 +164,32 @@ else if ( protobuf )
             for ( Series series : seriesList )
             {
 
-                MetricsResponse.Series.Builder metricsSeriesBuilder = MetricsResponse.Series.newBuilder()
-                    .setName( series.name ).setStart( (int) series.start ).setEnd( (int) series.end );
+                boolean valuesAdded = false;
+                MetricsResponse.Series.Builder metricsSeriesBuilder =
+                    MetricsResponse.Series.newBuilder().setName( series.name ).setStart( (int) series.start )
+                        .setEnd( (int) series.end ).setStep( (int) series.step );
                 for ( Double value : series.values )
                 {
                     LOG.info( String.format( "carbonapi request: found value [%s]",
                         ( value == null ? "null" : (double) value ) ) );
                     if ( value != null )
                     {
-                        metricsSeriesBuilder =
-                            metricsSeriesBuilder.setStep( (int) series.step ).addValues( value ).addIsAbsent( false );
+                        valuesAdded = true;
+                        metricsSeriesBuilder = metricsSeriesBuilder.addValues( value ).addIsAbsent( false );
                     }
                 }
 
-                MetricsResponse.Series metricsSeries = metricsSeriesBuilder.build();
-                metricsSeriesList.add( metricsSeries );
+                if ( valuesAdded )
+                {
+                    MetricsResponse.Series metricsSeries = metricsSeriesBuilder.build();
+                    metricsSeriesList.add( metricsSeries );
+                }
             }
 
             MetricsResponse.SeriesList response =
                 MetricsResponse.SeriesList.newBuilder().addAllSeriesList( metricsSeriesList ).build();
 
-            LOG.info( "carbonapi request: done formatting response " + response);
+            LOG.info( "carbonapi request: done formatting response " + response );
 
             try
             {