Merge pull request #13 from newrelic/fix_metrics_with_inventory

[IHOST-177] Do not return metrics when only INVENTORY flag provided

Author: cristianciutea

CHANGELOG.md

@@ -4,27 +4,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Next Release (date TBD)
+### Fixed
+- Issue where the plugin returned metrics when only inventory was requested.
+
 ## 1.1.4 (2018-10-19)
 
 ### Bugs fixed
 
 #### Allow rate and deltas
 
-Metrics of type rate and delta cannot be added unless there is a namespacing attribute on the metric-set.
+- Metrics of type rate and delta cannot be added unless there is a namespacing attribute on the metric-set.
 
 ## 1.1.3 (2018-10-12)
 
 ### Changed:
 
 ####  Update to SDKv3
 
-Updated the integration code from the previous version of the SDK to [SDK v3](https://github.com/newrelic/infra-integrations-sdk/#upgrading-from-sdk-v2-to-v3).
+- Updated the integration code from the previous version of the SDK to [SDK v3](https://github.com/newrelic/infra-integrations-sdk/#upgrading-from-sdk-v2-to-v3).
 
 ### Added:
 
 #### Old password support
 
-Previously when trying to run Mysql integration on a mysql-server with old password support https://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_old_passwords integration won't run. If customer has set old_passwords=1 at the MySQL server integration can now connect to it.
+- Previously when trying to run Mysql integration on a mysql-server with old password support https://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_old_passwords integration won't run. If customer has set old_passwords=1 at the MySQL server integration can now connect to it.
 
 #### Ignore bin folder
 
@@ -33,7 +37,7 @@ Previously when trying to run Mysql integration on a mysql-server with old passw
 ### Bugs fixed
 
 #### Hostname issue 
-Integration CLI-arguments are no longer overridden by environment-variables
+- Integration CLI-arguments are no longer overridden by environment-variables
 As CLI-args are used by the NRI agent `HOSTNAME` that is a common bash env-var is not used to set MySql-host unless no hostname is provided via config.
 
 ## 1.1.2 (2018-10-16)

src/mysql.go

@@ -44,7 +44,6 @@ func main() {
 	log.SetupLogging(args.Verbose)
 
 	e := i.LocalEntity()
-	ms := e.NewMetricSet("MysqlSample", metric.Attr("hostname", args.Hostname))
 
 	db, err := openDB(generateDSN(args))
 	fatalIfErr(err)
@@ -58,6 +57,7 @@ func main() {
 	}
 
 	if args.HasMetrics() {
+		ms := e.NewMetricSet("MysqlSample", metric.Attr("hostname", args.Hostname))
 		populateMetrics(ms, rawMetrics)
 	}