early return when there are no metrics

hashicorp · Apr 27, 2023 · b1b4d96 · b1b4d96
1 parent 0c190cb
commit b1b4d96
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/agent/hcp/telemetry/otel_exporter.go b/agent/hcp/telemetry/otel_exporter.go
@@ -41,6 +41,10 @@ func (e *OTELExporter) Aggregation(kind metric.InstrumentKind) aggregation.Aggre
 
 // Export serializes and transmits metric data to a receiver.
 func (e *OTELExporter) Export(ctx context.Context, metrics *metricdata.ResourceMetrics) error {
+	if len(metrics.ScopeMetrics) == 0 || len(metrics.ScopeMetrics[0].Metrics) == 0 {
+		return nil
+	}
+
 	otlpMetrics, merr := transformOTLP(metrics)
 	err := e.client.ExportMetrics(ctx, otlpMetrics, e.endpoint)
 	return multierror.Append(merr, err)

diff --git a/agent/hcp/telemetry/otel_exporter_test.go b/agent/hcp/telemetry/otel_exporter_test.go
@@ -62,10 +62,35 @@ func TestExport(t *testing.T) {
 		metrics *metricdata.ResourceMetrics
 		client  client.MetricsClient
 	}{
+		"earlyReturnWithoutScopeMetrics": {
+			client: &mockErrMetricsClient{},
+			metrics: &metricdata.ResourceMetrics{
+				Resource: resource.Empty(),
+				ScopeMetrics: []metricdata.ScopeMetrics{
+					{Metrics: []metricdata.Metrics{}},
+				},
+			},
+		},
+		"earlyReturnWithoutMetrics": {
+			client: &mockErrMetricsClient{},
+			metrics: &metricdata.ResourceMetrics{
+				Resource:     resource.Empty(),
+				ScopeMetrics: []metricdata.ScopeMetrics{},
+			},
+		},
 		"errorWithExportFailure": {
 			client: &mockErrMetricsClient{},
 			metrics: &metricdata.ResourceMetrics{
 				Resource: resource.Empty(),
+				ScopeMetrics: []metricdata.ScopeMetrics{
+					{
+						Metrics: []metricdata.Metrics{
+							{
+								Name: "consul.raft.commitTime",
+							},
+						},
+					},
+				},
 			},
 			wantErr: "failed to export metrics",
 		},
@@ -110,8 +135,13 @@ func TestExport(t *testing.T) {
 			}
 
 			err := exp.Export(context.Background(), test.metrics)
-			require.Error(t, err)
-			require.Contains(t, err.Error(), test.wantErr)
+			if test.wantErr != "" {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), test.wantErr)
+				return
+			}
+
+			require.NoError(t, err)
 		})
 	}
 }