Merge pull request #58090 from serathius/pass-location-to-event-exporter

Automatic merge from submit-queue (batch tested with PRs 60054, 60202, 60219, 58090, 60275). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Pass location parameter to event exporter.

**What this PR does / why we need it**:
This PR makes event-exporter export cluster location together with events.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

test/e2e/instrumentation/logging/stackdrvier/utils.go

@@ -328,6 +328,8 @@ func (p *sdLogProvider) tryGetName(sdLogEntry sd.LogEntry) (string, bool) {
 
 func convertLogEntry(sdLogEntry sd.LogEntry) (entry utils.LogEntry, err error) {
 	entry = utils.LogEntry{LogName: sdLogEntry.LogName}
+	entry.Location = sdLogEntry.Resource.Labels["location"]
+
 	if sdLogEntry.TextPayload != "" {
 		entry.TextPayload = sdLogEntry.TextPayload
 		return

test/e2e/instrumentation/logging/utils/types.go

@@ -32,6 +32,7 @@ var (
 type LogEntry struct {
 	LogName     string
 	TextPayload string
+	Location    string
 	JSONPayload map[string]interface{}
 }
 

test/e2e/instrumentation/logging/utils/wait.go

@@ -48,6 +48,9 @@ func UntilFirstEntryFromLog(log string) IngestionPred {
 	return func(_ string, entries []LogEntry) (bool, error) {
 		for _, e := range entries {
 			if e.LogName == log {
+				if e.Location != framework.TestContext.CloudConfig.Zone {
+					return false, fmt.Errorf("Bad location in logs '%s' != '%d'", e.Location, framework.TestContext.CloudConfig.Zone)
+				}
 				return true, nil
 			}
 		}