[8.3](backport #32281) [metricbeat] gcp: check for nil metadata (#32400)

* [metricbeat] gcp: check for nil metadata (#32281) * add check for nil metadata * add changelog entry (cherry picked from commit fa8d17f) * Update CHANGELOG.next.asciidoc * Update CHANGELOG.next.asciidoc Co-authored-by: gpop63 <[email protected]>
elastic · Aug 25, 2022 · 4678fc6 · 4678fc6
1 parent 6b4566e
commit 4678fc6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -52,7 +52,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 
 *Metricbeat*
 
-- Fix to ARN parsing for Cloudwatch resource names with leading slashes {pull}32446[32446]
+- Check for nil metadata in GCP. {pull}32281[32281]
 
 *Packetbeat*
 

diff --git a/x-pack/metricbeat/module/gcp/metrics/metricset.go b/x-pack/metricbeat/module/gcp/metrics/metricset.go
@@ -322,14 +322,16 @@ func (m *MetricSet) getMetadata(out *metric.MetricDescriptor, metricsWithMeta ma
 		ingestDelay:  0 * time.Second,
 	}
 
-	if out.Metadata.SamplePeriod != nil {
-		m.Logger().Debugf("For metric type %s: sample period = %s", out.Type, out.Metadata.SamplePeriod)
-		meta.samplePeriod = time.Duration(out.Metadata.SamplePeriod.Seconds) * time.Second
-	}
+	if out.Metadata != nil {
+		if out.Metadata.SamplePeriod != nil {
+			m.Logger().Debugf("For metric type %s: sample period = %s", out.Type, out.Metadata.SamplePeriod)
+			meta.samplePeriod = time.Duration(out.Metadata.SamplePeriod.Seconds) * time.Second
+		}
 
-	if out.Metadata.IngestDelay != nil {
-		m.Logger().Debugf("For metric type %s: ingest delay = %s", out.Type, out.Metadata.IngestDelay)
-		meta.ingestDelay = time.Duration(out.Metadata.IngestDelay.Seconds) * time.Second
+		if out.Metadata.IngestDelay != nil {
+			m.Logger().Debugf("For metric type %s: ingest delay = %s", out.Type, out.Metadata.IngestDelay)
+			meta.ingestDelay = time.Duration(out.Metadata.IngestDelay.Seconds) * time.Second
+		}
 	}
 
 	metricsWithMeta[out.Type] = meta