fix(logging): allow nil or custom zones in resource detection (#3997)

freelerobot · web-flow · commit aded90b92de3 · 2021-05-02T20:01:07.000-07:00
diff --git a/logging/logging.go b/logging/logging.go
@@ -404,7 +404,11 @@ func monitoredResource(parent string) *mrpb.MonitoredResource {
 }
 
 func regionFromZone(zone string) string {
-	return zone[:strings.LastIndex(zone, "-")]
+	cutoff := strings.LastIndex(zone, "-")
+	if cutoff > 0 {
+		return zone[:cutoff]
+	}
+	return zone
 }
 
 func globalResource(projectID string) *mrpb.MonitoredResource {

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,11 @@ func monitoredResource(parent string) *mrpb.MonitoredResource {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`func regionFromZone(zone string) string {`
`407`		`- return zone[:strings.LastIndex(zone, "-")]`
	`407`	`+ cutoff := strings.LastIndex(zone, "-")`
	`408`	`+ if cutoff > 0 {`
	`409`	`+ return zone[:cutoff]`
	`410`	`+ }`
	`411`	`+ return zone`
`408`	`412`	`}`
`409`	`413`
`410`	`414`	`func globalResource(projectID string) *mrpb.MonitoredResource {`