Merge pull request #38 from newrelic/unique-keys

Unique keys

Author: camdencheek

CHANGELOG.md

@@ -5,6 +5,11 @@ 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/).
 
+## 2.0.0 - 2019-04-29
+### Changed
+- Added identity attributes for better uniqueness
+- Updated the SDK
+
 ## 1.0.4 - 2019-03-19
 ### Changed
 - Include jvm-metrics.yml.sample in package

src/jmx.go

@@ -29,7 +29,7 @@ type argumentList struct {
 
 const (
 	integrationName    = "com.newrelic.jmx"
-	integrationVersion = "1.0.4"
+	integrationVersion = "2.0.0"
 )
 
 var (
@@ -95,7 +95,7 @@ func main() {
 			os.Exit(1)
 		}
 
-		if err := runCollection(collection, jmxIntegration); err != nil {
+		if err := runCollection(collection, jmxIntegration, args.JmxHost, args.JmxPort); err != nil {
 			log.Error("Failed to complete collection: %s", err)
 		}
 	}

src/request.go

@@ -24,7 +24,7 @@ type beanAttrValuePair struct {
 	value    interface{}
 }
 
-func runCollection(collection []*domainDefinition, i *integration.Integration) error {
+func runCollection(collection []*domainDefinition, i *integration.Integration, host, port string) error {
 	for _, domain := range collection {
 		var errors []error
 		for _, request := range domain.beans {
@@ -34,7 +34,7 @@ func runCollection(collection []*domainDefinition, i *integration.Integration) e
 				log.Error("Failed to retrieve metrics for request %s: %s", requestString, err)
 				return err
 			}
-			if err := handleResponse(domain.eventType, request, result, i); err != nil {
+			if err := handleResponse(domain.eventType, request, result, i, host, port); err != nil {
 				errors = append(errors, err)
 			}
 		}
@@ -50,7 +50,7 @@ func runCollection(collection []*domainDefinition, i *integration.Integration) e
 // handleResponse takes a response, filters out the excluded beans,
 // sorts the responses by domain, and passes each domain off to
 // insertDomainMetrics to populate the metric list
-func handleResponse(eventType string, request *beanRequest, response queryResponse, i *integration.Integration) error {
+func handleResponse(eventType string, request *beanRequest, response queryResponse, i *integration.Integration, host, port string) error {
 
 	// Delete excluded mbeans
 	for key := range response {
@@ -75,7 +75,7 @@ func handleResponse(eventType string, request *beanRequest, response queryRespon
 
 	// For each domain, create an entity and a metric set
 	for domain, beanAttrVals := range domainsMap {
-		err := insertDomainMetrics(eventType, domain, beanAttrVals, request, i)
+		err := insertDomainMetrics(eventType, domain, beanAttrVals, request, i, host, port)
 		if err != nil {
 			return err
 		}
@@ -87,10 +87,12 @@ func handleResponse(eventType string, request *beanRequest, response queryRespon
 // insertDomainMetrics akes a domain and a list of attr:value pairs,
 // creates an entity and metric set for the domain, and populates the
 // metric set for each attribute to be collected
-func insertDomainMetrics(eventType string, domain string, beanAttrVals []*beanAttrValuePair, request *beanRequest, i *integration.Integration) error {
+func insertDomainMetrics(eventType string, domain string, beanAttrVals []*beanAttrValuePair, request *beanRequest, i *integration.Integration, host, port string) error {
 
 	// Create an entity for the domain
-	e, err := i.Entity(domain, "domain")
+	hostIDAttr := integration.NewIDAttribute("host", host)
+	portIDAttr := integration.NewIDAttribute("port", port)
+	e, err := i.Entity(domain, "jmx-domain", hostIDAttr, portIDAttr)
 	if err != nil {
 		return err
 	}

src/request_test.go

@@ -54,7 +54,7 @@ func TestRunCollection(t *testing.T) {
 
 	i, _ := integration.New("jmxtest", "0.1.0")
 
-	runCollection(collection, i)
+	runCollection(collection, i, "testhost", "1234")
 
 	if !reflect.DeepEqual(expectedMetrics, i.Entities[0].Metrics[0].Metrics) {
 		fmt.Println(pretty.Diff(expectedMetrics, i.Entities[0].Metrics[0].Metrics))
@@ -233,7 +233,7 @@ func TestInsertDomainMetrics(t *testing.T) {
 
 	eventType := "TestEventTypeSample"
 
-	insertDomainMetrics(eventType, domain, beanAttrVals, request, i)
+	insertDomainMetrics(eventType, domain, beanAttrVals, request, i, "testhost", "1234")
 
 	expectedMetrics := map[string]interface{}{
 		"event_type":  "TestEventTypeSample",
@@ -268,14 +268,15 @@ func TestHandleResponse(t *testing.T) {
 	}
 	i, _ := integration.New("jmx", "0.1.0")
 
-	err := handleResponse(eventType, request, response, i)
+	err := handleResponse(eventType, request, response, i, "testhost", "1234")
 	if err != nil {
 		t.Error(err)
 	}
 
 	jsonbytes, _ := i.MarshalJSON()
 
-	expectedMarshalled := `{"name":"jmx","protocol_version":"3","integration_version":"0.1.0","data":[{"entity":{"name":"test.domain","type":"domain","id_attributes":[]},"metrics":[],"inventory":{},"events":[]}]}`
+	fmt.Println(string(jsonbytes))
+	expectedMarshalled := `{"name":"jmx","protocol_version":"3","integration_version":"0.1.0","data":[{"entity":{"name":"test.domain","type":"jmx-domain","id_attributes":[{"Key":"host","Value":"testhost"},{"Key":"port","Value":"1234"}]},"metrics":[],"inventory":{},"events":[]}]}`
 
 	if string(jsonbytes) != expectedMarshalled {
 		t.Error("Failed to get expected marshalled json")
@@ -302,7 +303,7 @@ func TestDefaultMetricType(t *testing.T) {
 	}
 	i, _ := integration.New("jmx", "0.1.0")
 
-	err = handleResponse(eventType, request, response, i)
+	err = handleResponse(eventType, request, response, i, "testhost", "1234")
 	if err != nil {
 		t.Error(err)
 	}