From 5f2c39c4f5572ed018d65bf09c6d80b7a6369f49 Mon Sep 17 00:00:00 2001
From: Lei Wang <wangzl@amazon.com>
Date: Thu, 18 Jun 2020 13:44:22 -0700
Subject: [PATCH] support aws plugins EC2/ECS/Beanstalk

---
 exporter/awsxrayexporter/translator/aws.go      | 14 ++++++++++++++
 exporter/awsxrayexporter/translator/aws_test.go | 11 +++++++++--
 exporter/awsxrayexporter/translator/segment.go  | 16 ++++++++++------
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/exporter/awsxrayexporter/translator/aws.go b/exporter/awsxrayexporter/translator/aws.go
index 75cbf0bac37f..8c2caeb51927 100644
--- a/exporter/awsxrayexporter/translator/aws.go
+++ b/exporter/awsxrayexporter/translator/aws.go
@@ -54,6 +54,8 @@ type AWSData struct {
 type EC2Metadata struct {
 	InstanceID       string `json:"instance_id"`
 	AvailabilityZone string `json:"availability_zone"`
+	InstanceSize     string `json:"instance_size"`
+	AmiId            string `json:"ami_id"`
 }
 
 // ECSMetadata provides the shape for unmarshalling ECS metadata.
@@ -74,9 +76,12 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 		account      string
 		zone         string
 		hostID       string
+		hostType     string
+		amiId        string
 		container    string
 		namespace    string
 		deployID     string
+		versionLabel string
 		operation    string
 		remoteRegion string
 		requestID    string
@@ -99,6 +104,10 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 				zone = value.StringVal()
 			case semconventions.AttributeHostID:
 				hostID = value.StringVal()
+			case semconventions.AttributeHostType:
+				hostType = value.StringVal()
+			case semconventions.AttributeHostImageID:
+				amiId = value.StringVal()
 			case semconventions.AttributeContainerName:
 				if container == "" {
 					container = value.StringVal()
@@ -109,6 +118,8 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 				namespace = value.StringVal()
 			case semconventions.AttributeServiceInstance:
 				deployID = value.StringVal()
+			case semconventions.AttributeServiceVersion:
+				versionLabel = value.StringVal()
 			}
 		})
 	}
@@ -148,6 +159,8 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 		ec2 = &EC2Metadata{
 			InstanceID:       hostID,
 			AvailabilityZone: zone,
+			InstanceSize:     hostType,
+			AmiId:            amiId,
 		}
 	}
 	if container != "" {
@@ -163,6 +176,7 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 		ebs = &BeanstalkMetadata{
 			Environment:  namespace,
 			DeploymentID: deployNum,
+			VersionLabel: versionLabel,
 		}
 	}
 	awsData := &AWSData{
diff --git a/exporter/awsxrayexporter/translator/aws_test.go b/exporter/awsxrayexporter/translator/aws_test.go
index 95fa658a807a..5697697a362b 100644
--- a/exporter/awsxrayexporter/translator/aws_test.go
+++ b/exporter/awsxrayexporter/translator/aws_test.go
@@ -24,6 +24,8 @@ import (
 
 func TestAwsFromEc2Resource(t *testing.T) {
 	instanceID := "i-00f7c0bcb26da2a99"
+	hostType := "m5.xlarge"
+	imageId := "ami-0123456789"
 	resource := pdata.NewResource()
 	resource.InitEmpty()
 	attrs := pdata.NewAttributeMap()
@@ -31,7 +33,8 @@ func TestAwsFromEc2Resource(t *testing.T) {
 	attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
 	attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
 	attrs.InsertString(semconventions.AttributeHostID, instanceID)
-	attrs.InsertString(semconventions.AttributeHostType, "m5.xlarge")
+	attrs.InsertString(semconventions.AttributeHostType, hostType)
+	attrs.InsertString(semconventions.AttributeHostImageID, imageId)
 	attrs.CopyTo(resource.Attributes())
 
 	attributes := make(map[string]string)
@@ -47,6 +50,8 @@ func TestAwsFromEc2Resource(t *testing.T) {
 	assert.Equal(t, &EC2Metadata{
 		InstanceID:       instanceID,
 		AvailabilityZone: "us-east-1c",
+		InstanceSize:     hostType,
+		AmiId:            imageId,
 	}, awsData.EC2Metadata)
 }
 
@@ -86,6 +91,7 @@ func TestAwsFromEcsResource(t *testing.T) {
 
 func TestAwsFromBeanstalkResource(t *testing.T) {
 	deployID := "232"
+	versionLabel := "4"
 	resource := pdata.NewResource()
 	resource.InitEmpty()
 	attrs := pdata.NewAttributeMap()
@@ -94,6 +100,7 @@ func TestAwsFromBeanstalkResource(t *testing.T) {
 	attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
 	attrs.InsertString(semconventions.AttributeServiceNamespace, "production")
 	attrs.InsertString(semconventions.AttributeServiceInstance, deployID)
+	attrs.InsertString(semconventions.AttributeServiceVersion, versionLabel)
 	attrs.CopyTo(resource.Attributes())
 
 	attributes := make(map[string]string)
@@ -107,7 +114,7 @@ func TestAwsFromBeanstalkResource(t *testing.T) {
 	assert.NotNil(t, awsData.BeanstalkMetadata)
 	assert.Equal(t, &BeanstalkMetadata{
 		Environment:  "production",
-		VersionLabel: "",
+		VersionLabel: versionLabel,
 		DeploymentID: 232,
 	}, awsData.BeanstalkMetadata)
 }
diff --git a/exporter/awsxrayexporter/translator/segment.go b/exporter/awsxrayexporter/translator/segment.go
index b3839e899101..9c999a53907d 100644
--- a/exporter/awsxrayexporter/translator/segment.go
+++ b/exporter/awsxrayexporter/translator/segment.go
@@ -241,15 +241,19 @@ func newSegmentID() pdata.SpanID {
 }
 
 func determineAwsOrigin(resource pdata.Resource) string {
-	origin := OriginEC2
+	// EB > ECS > EC2
 	if resource.IsNil() {
-		return origin
+		return OriginEC2
 	}
-	_, ok := resource.Attributes().Get(semconventions.AttributeContainerName)
-	if ok {
-		origin = OriginECS
+	_, eb := resource.Attributes().Get(semconventions.AttributeServiceInstance)
+	if eb {
+		return OriginEB
+	}
+	_, ecs := resource.Attributes().Get(semconventions.AttributeContainerName)
+	if ecs {
+		return OriginECS
 	}
-	return origin
+	return OriginEC2
 }
 
 // convertToAmazonTraceID converts a trace ID to the Amazon format.