Merge pull request #19 from newrelic/unique-keys

Unique keys

Author: camdencheek

CHANGELOG.md

@@ -5,6 +5,12 @@ 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-25
+### Changed
+- Prefixed namespaces for uniqueness
+- Updated SDK
+- Added ID attributes
+
 ## 1.1.1 - 2019-04-17
 ### Added
 - Use address rather than name to connect

src/agent/agent.go

@@ -44,7 +44,8 @@ func CreateAgents(client *api.Client, i *integration.Integration, args *args.Arg
 	agents = make([]*Agent, 0, len(members))
 	for _, member := range members {
 
-		entity, err := i.Entity(member.Name, "agent")
+		memberNameIDAttr := integration.NewIDAttribute("co-agent", member.Name)
+		entity, err := i.Entity(fmt.Sprintf("%s:%d", member.Addr, member.Port), "co-agent", memberNameIDAttr)
 		if err != nil {
 			log.Error("Error creating entity for Agent '%s': %s", member.Name, err.Error())
 			continue

src/agent/agent_test.go

@@ -75,7 +75,7 @@ func TestCreateAgents(t *testing.T) {
 	}
 
 	agent := agents[0]
-	if agent.entity.Metadata.Name != "consul-0" {
+	if agent.entity.Metadata.Name != "10.0.0.1:8301" {
 		t.Errorf("Expected Entity name 'consul-0' got %s", agent.entity.Metadata.Name)
 	} else if agent != leader {
 		t.Error("Leader was no correclty set")

src/consul.go

@@ -15,7 +15,7 @@ import (
 
 const (
 	integrationName    = "com.newrelic.consul"
-	integrationVersion = "1.1.1"
+	integrationVersion = "2.0.0"
 )
 
 func main() {
@@ -120,6 +120,11 @@ func localCollection(client *api.Client, i *integration.Integration, args *args.
 		return fmt.Errorf("Failed to get member address: %v", ok)
 	}
 
+	memberPort, ok := member["Port"]
+	if !ok {
+		return fmt.Errorf("Failed to get member port: %v", ok)
+	}
+
 	memberDataCenter, ok := member["Tags"].(map[string]interface{})["dc"].(string)
 	if !ok {
 		return fmt.Errorf("Failed to get member datacenter: %v", ok)
@@ -138,7 +143,8 @@ func localCollection(client *api.Client, i *integration.Integration, args *args.
 		isLeader = false
 	}
 
-	entity, err := i.Entity(memberName, "agent")
+	agentNameIDAttr := integration.NewIDAttribute("co-agent", memberName)
+	entity, err := i.Entity(fmt.Sprintf("%s:%v", memberAddr, memberPort), "co-agent", agentNameIDAttr)
 	agentInstance := agent.NewAgent(client, entity, memberAddr, memberDataCenter)
 
 	if args.HasMetrics() {

src/datacenter/datacenter.go

@@ -31,7 +31,7 @@ func NewDatacenter(leader *agent.Agent, i *integration.Integration) (*Datacenter
 		return nil, err
 	}
 
-	dcEntity, err := i.Entity(*dcName, "datacenter")
+	dcEntity, err := i.Entity(*dcName, "co-datacenter")
 	if err != nil {
 		return nil, err
 	}

src/datacenter/datacenter_test.go

@@ -68,7 +68,7 @@ func TestNewDatacenter_Normal(t *testing.T) {
 
 	if out.entity.Metadata.Name != "dev-uss" {
 		t.Fatalf("Entity was not named correctly %s", out.entity.Metadata.Name)
-	} else if out.entity.Metadata.Namespace != "datacenter" {
+	} else if out.entity.Metadata.Namespace != "co-datacenter" {
 		t.Fatalf("Entity has wrong namespace %s", out.entity.Metadata.Namespace)
 	}