Merge branch 'b-exec-cleanup' into f-resource-isolation-cleanup

client/fingerprint/fingerprint.go

@@ -16,9 +16,19 @@ const (
 )
 
 func init() {
+	builtinFingerprintMap["arch"] = NewArchFingerprint
+	builtinFingerprintMap["cpu"] = NewCPUFingerprint
+	builtinFingerprintMap["env_aws"] = NewEnvAWSFingerprint
+	builtinFingerprintMap["env_gce"] = NewEnvGCEFingerprint
+	builtinFingerprintMap["host"] = NewHostFingerprint
+	builtinFingerprintMap["memory"] = NewMemoryFingerprint
+	builtinFingerprintMap["network"] = NewNetworkFingerprint
+	builtinFingerprintMap["nomad"] = NewNomadFingerprint
+	builtinFingerprintMap["storage"] = NewStorageFingerprint
+
 	// Initialize the list of available fingerprinters per platform.  Each
 	// platform defines its own list of available fingerprinters.
-	initFingerprints(builtinFingerprintMap)
+	initPlatformFingerprints(builtinFingerprintMap)
 }
 
 // builtinFingerprintMap contains the built in registered fingerprints which are

client/fingerprint/fingerprint_default.go

@@ -2,14 +2,5 @@
 
 package fingerprint
 
-func initFingerprints(fps map[string]Factory) {
-	fps["arch"] = NewArchFingerprint
-	fps["cpu"] = NewCPUFingerprint
-	fps["env_aws"] = NewEnvAWSFingerprint
-	fps["env_gce"] = NewEnvGCEFingerprint
-	fps["host"] = NewHostFingerprint
-	fps["memory"] = NewMemoryFingerprint
-	fps["network"] = NewNetworkFingerprint
-	fps["nomad"] = NewNomadFingerprint
-	fps["storage"] = NewStorageFingerprint
+func initPlatformFingerprints(fps map[string]Factory) {
 }

client/fingerprint/fingerprint_linux.go

@@ -1,14 +1,5 @@
 package fingerprint
 
-func initFingerprints(fps map[string]Factory) {
-	fps["arch"] = NewArchFingerprint
+func initPlatformFingerprints(fps map[string]Factory) {
 	fps["cgroup"] = NewCGroupFingerprint
-	fps["cpu"] = NewCPUFingerprint
-	fps["env_aws"] = NewEnvAWSFingerprint
-	fps["env_gce"] = NewEnvGCEFingerprint
-	fps["host"] = NewHostFingerprint
-	fps["memory"] = NewMemoryFingerprint
-	fps["network"] = NewNetworkFingerprint
-	fps["nomad"] = NewNomadFingerprint
-	fps["storage"] = NewStorageFingerprint
 }