final code review fixups

client/client.go

@@ -2033,6 +2033,8 @@ func (c *Client) emitHostStats() {
 	c.setGaugeForUptime(hStats)
 	c.setGaugeForCPUStats(nodeID, hStats)
 	c.setGaugeForDiskStats(nodeID, hStats)
+
+	// TODO: This should be moved to emitClientMetrics
 	c.setGaugeForAllocationStats(nodeID)
 }
 

command/agent/config.go

@@ -584,19 +584,17 @@ func DefaultConfig() *Config {
 		Consul:         config.DefaultConsulConfig(),
 		Vault:          config.DefaultVaultConfig(),
 		Client: &ClientConfig{
-			Enabled:                    false,
-			MaxKillTimeout:             "30s",
-			ClientMinPort:              14000,
-			ClientMaxPort:              14512,
-			Reserved:                   &Resources{},
-			GCInterval:                 1 * time.Minute,
-			GCParallelDestroys:         2,
-			GCDiskUsageThreshold:       80,
-			GCInodeUsageThreshold:      70,
-			GCMaxAllocs:                50,
-			NoHostUUID:                 helper.BoolToPtr(true),
-			DisableTaggedMetrics:       false,
-			BackwardsCompatibleMetrics: false,
+			Enabled:               false,
+			MaxKillTimeout:        "30s",
+			ClientMinPort:         14000,
+			ClientMaxPort:         14512,
+			Reserved:              &Resources{},
+			GCInterval:            1 * time.Minute,
+			GCParallelDestroys:    2,
+			GCDiskUsageThreshold:  80,
+			GCInodeUsageThreshold: 70,
+			GCMaxAllocs:           50,
+			NoHostUUID:            helper.BoolToPtr(true),
 		},
 		Server: &ServerConfig{
 			Enabled:          false,

command/agent/config_test.go

@@ -89,6 +89,8 @@ func TestConfig_Merge(t *testing.T) {
 				ReservedPorts:       "1,10-30,55",
 				ParsedReservedPorts: []int{1, 2, 4},
 			},
+			DisableTaggedMetrics:       true,
+			BackwardsCompatibleMetrics: true,
 		},
 		Server: &ServerConfig{
 			Enabled:                false,