More Debug Logs

Author: Manish Ranjan Mahanta

internal/gcs-sidecar/handlers.go

@@ -527,6 +527,7 @@ func (b *Bridge) modifyServiceSettings(req *request) (err error) {
 
 					// Update the allowed log sources in the settings. This will be forwarded to inbox GCS which expects the log sources in a JSON string format with GUIDs for providers included.
 					allowedLogSources = etw.UpdateLogSources(req.ctx, allowedLogSources, false, true)
+					log.G(req.ctx).Tracef("Allowed log sources after appending GUIDs: %v", allowedLogSources)
 					settings.Settings = allowedLogSources
 				}
 			default:

internal/vm/vmutils/etw/provider_map.go

@@ -257,10 +257,26 @@ func UpdateLogSources(ctx context.Context, base64EncodedJSONLogConfig string, us
 							// Merge providers
 							providerMap := make(map[string]EtwProvider)
 							for _, provider := range defSrc.Providers {
-								providerMap[provider.ProviderName] = provider
+								key := provider.ProviderName
+								if provider.ProviderGUID != "" {
+									if key != "" {
+										key = provider.ProviderName + "|" + provider.ProviderGUID
+									} else {
+										key = provider.ProviderGUID
+									}
+								}
+								providerMap[key] = provider
 							}
 							for _, provider := range userSrc.Providers {
-								providerMap[provider.ProviderName] = provider
+								key := provider.ProviderName
+								if provider.ProviderGUID != "" {
+									if key != "" {
+										key = provider.ProviderName + "|" + provider.ProviderGUID
+									} else {
+										key = provider.ProviderGUID
+									}
+								}
+								providerMap[key] = provider
 							}
 							etwProviders := make([]EtwProvider, 0, len(providerMap))
 							for _, provider := range providerMap {
@@ -288,11 +304,13 @@ func UpdateLogSources(ctx context.Context, base64EncodedJSONLogConfig string, us
 						guid, err := NormalizeGUID(provider.ProviderGUID)
 						if err != nil {
 							log.G(ctx).Warningf("Skipping invalid GUID %q for provider %q: %v", provider.ProviderGUID, provider.ProviderName, err)
+							// This will override the invalid GUID with an empty string, which is fine because we will still include the provider based on the name if it is valid.
 						}
 						resultLogCfg.LogConfig.Sources[i].Providers[j].ProviderGUID = guid
 					}
 					if provider.ProviderName != "" && provider.ProviderGUID == "" {
 						resultLogCfg.LogConfig.Sources[i].Providers[j].ProviderGUID = GetProviderGUIDFromName(ctx, provider.ProviderName)
+						log.G(ctx).Tracef("Mapped provider name %q to GUID %q", provider.ProviderName, resultLogCfg.LogConfig.Sources[i].Providers[j].ProviderGUID)
 					}
 				}
 			}
@@ -310,6 +328,7 @@ func UpdateLogSources(ctx context.Context, base64EncodedJSONLogConfig string, us
 							continue
 						}
 						if strings.EqualFold(guid, GetProviderGUIDFromName(ctx, provider.ProviderName)) {
+							log.G(ctx).Tracef("Removing GUID %q for provider %q as it matches the GUID from the name in the ETW map", guid, provider.ProviderName)
 							resultLogCfg.LogConfig.Sources[i].Providers[j].ProviderGUID = ""
 						} else {
 							resultLogCfg.LogConfig.Sources[i].Providers[j].ProviderGUID = guid
@@ -327,6 +346,8 @@ func UpdateLogSources(ctx context.Context, base64EncodedJSONLogConfig string, us
 		return base64EncodedJSONLogConfig
 	}
 
+	log.G(ctx).Tracef("Merged log config before encoding: %s", string(jsonBytes))
+
 	encodedCfg := base64.StdEncoding.EncodeToString(jsonBytes)
 	return encodedCfg