Merge remote-tracking branch 'upstream/master' into master-remerged-v…

…0.13.2

.github/auto_assign.yml

@@ -15,6 +15,7 @@ assigneeGroups:
     - james-bebbington
     - jrcamp
     - jpkrohling
+    - kbrockhoff
     - nilebox
     - owais
     - tigrannajaryan

exporter/alibabacloudlogserviceexporter/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/census-instrumentation/opencensus-proto v0.3.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb
+	go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136
 	go.uber.org/zap v1.16.0
 	google.golang.org/protobuf v1.25.0
 )

exporter/alibabacloudlogserviceexporter/go.sum

@@ -1038,8 +1038,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb h1:3M71pl4LBA6t3cEenTRvB9i0W7BAwoO7u5eE6C1LMds=
-go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb/go.mod h1:itblxiZ5r454TNNQVvcAp7vj7LbwCdeNRtodo2t+lGM=
+go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136 h1:i+xO9r7f0oJGb0rmir3nIED84ITITHduHuC5gPukXU0=
+go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136/go.mod h1:itblxiZ5r454TNNQVvcAp7vj7LbwCdeNRtodo2t+lGM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

exporter/awsemfexporter/go.mod

@@ -8,6 +8,6 @@ require (
 	github.com/golang/protobuf v1.4.3
 	github.com/google/uuid v1.1.2
 	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb
+	go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136
 	go.uber.org/zap v1.16.0
 )

exporter/awsemfexporter/go.sum

@@ -1135,8 +1135,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb h1:3M71pl4LBA6t3cEenTRvB9i0W7BAwoO7u5eE6C1LMds=
-go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb/go.mod h1:itblxiZ5r454TNNQVvcAp7vj7LbwCdeNRtodo2t+lGM=
+go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136 h1:i+xO9r7f0oJGb0rmir3nIED84ITITHduHuC5gPukXU0=
+go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136/go.mod h1:itblxiZ5r454TNNQVvcAp7vj7LbwCdeNRtodo2t+lGM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

exporter/awsxrayexporter/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/aws/aws-sdk-go v1.35.20
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb
+	go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136
 	go.uber.org/zap v1.16.0
 	golang.org/x/net v0.0.0-20200822124328-c89045814202
 	google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect

exporter/awsxrayexporter/go.sum

@@ -1134,8 +1134,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb h1:3M71pl4LBA6t3cEenTRvB9i0W7BAwoO7u5eE6C1LMds=
-go.opentelemetry.io/collector v0.13.1-0.20201103180041-ab843b20c2fb/go.mod h1:itblxiZ5r454TNNQVvcAp7vj7LbwCdeNRtodo2t+lGM=
+go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136 h1:i+xO9r7f0oJGb0rmir3nIED84ITITHduHuC5gPukXU0=
+go.opentelemetry.io/collector v0.13.1-0.20201103222843-de104da4f136/go.mod h1:itblxiZ5r454TNNQVvcAp7vj7LbwCdeNRtodo2t+lGM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

exporter/awsxrayexporter/translator/aws.go

@@ -15,6 +15,7 @@
 package translator
 
 import (
+	"bytes"
 	"strconv"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -24,9 +25,21 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
 )
 
+const (
+	attributeInfrastructureService = "cloud.infrastructure_service"
+	awsEcsClusterArn               = "aws.ecs.cluster.arn"
+	awsEcsContainerArn             = "aws.ecs.container.arn"
+	awsEcsTaskArn                  = "aws.ecs.task.arn"
+	awsEcsTaskFamily               = "aws.ecs.task.family"
+	awsEcsLaunchType               = "aws.ecs.launchtype"
+	awsLogGroupNames               = "aws.log.group.names"
+	awsLogGroupArns                = "aws.log.group.arns"
+)
+
 func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]string, *awsxray.AWSData) {
 	var (
 		cloud        string
+		service      string
 		account      string
 		zone         string
 		hostID       string
@@ -49,6 +62,14 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 		containerID  string
 		clusterName  string
 		podUID       string
+		clusterArn   string
+		containerArn string
+		taskArn      string
+		taskFamily   string
+		launchType   string
+		logGroups    pdata.AnyValueArray
+		logGroupArns pdata.AnyValueArray
+		cwl          []awsxray.LogGroupMetadata
 		ec2          *awsxray.EC2Metadata
 		ecs          *awsxray.ECSMetadata
 		ebs          *awsxray.BeanstalkMetadata
@@ -61,6 +82,8 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 			switch key {
 			case semconventions.AttributeCloudProvider:
 				cloud = value.StringVal()
+			case attributeInfrastructureService:
+				service = value.StringVal()
 			case semconventions.AttributeCloudAccount:
 				account = value.StringVal()
 			case semconventions.AttributeCloudZone:
@@ -95,6 +118,20 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 				containerID = value.StringVal()
 			case semconventions.AttributeK8sCluster:
 				clusterName = value.StringVal()
+			case awsEcsClusterArn:
+				clusterArn = value.StringVal()
+			case awsEcsContainerArn:
+				containerArn = value.StringVal()
+			case awsEcsTaskArn:
+				taskArn = value.StringVal()
+			case awsEcsTaskFamily:
+				taskFamily = value.StringVal()
+			case awsEcsLaunchType:
+				launchType = value.StringVal()
+			case awsLogGroupNames:
+				logGroups = value.ArrayVal()
+			case awsLogGroupArns:
+				logGroupArns = value.ArrayVal()
 			}
 		})
 	}
@@ -125,25 +162,32 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 			filtered[key] = value
 		}
 	}
-	if cloud != "aws" && cloud != "" {
+	if cloud != semconventions.AttributeCloudProviderAWS && cloud != "" {
 		return filtered, nil // not AWS so return nil
 	}
-	// progress from least specific to most specific origin so most specific ends up as origin
-	// as per X-Ray docs
-	if hostID != "" {
+
+	if service == "EC2" || hostID != "" {
 		ec2 = &awsxray.EC2Metadata{
 			InstanceID:       awsxray.String(hostID),
 			AvailabilityZone: awsxray.String(zone),
 			InstanceSize:     awsxray.String(hostType),
 			AmiID:            awsxray.String(amiID),
 		}
 	}
-	if container != "" {
+	if service == "ECS" || container != "" {
 		ecs = &awsxray.ECSMetadata{
-			ContainerName: awsxray.String(container),
-			ContainerID:   awsxray.String(containerID),
+			ContainerName:    awsxray.String(container),
+			ContainerID:      awsxray.String(containerID),
+			AvailabilityZone: awsxray.String(zone),
+			ContainerArn:     awsxray.String(containerArn),
+			ClusterArn:       awsxray.String(clusterArn),
+			TaskArn:          awsxray.String(taskArn),
+			TaskFamily:       awsxray.String(taskFamily),
+			LaunchType:       awsxray.String(launchType),
 		}
 	}
+
+	// TODO(willarmiros): Add infrastructure_service checks once their resource detectors are implemented
 	if deployID != "" {
 		deployNum, err := strconv.ParseInt(deployID, 10, 64)
 		if err != nil {
@@ -163,6 +207,14 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 		}
 	}
 
+	// Since we must couple log group ARNs and Log Group Names in the same CWLogs object, we first try to derive the
+	// names from the ARN, then fall back to just recording the names
+	if logGroupArns != (pdata.AnyValueArray{}) && logGroupArns.Len() > 0 {
+		cwl = getLogGroupMetadata(logGroupArns, true)
+	} else if logGroups != (pdata.AnyValueArray{}) && logGroups.Len() > 0 {
+		cwl = getLogGroupMetadata(logGroups, false)
+	}
+
 	if sdkName != "" && sdkLanguage != "" {
 		// Convention for SDK name for xray SDK information is e.g., `X-Ray SDK for Java`, `X-Ray for Go`.
 		// We fill in with e.g, `opentelemetry for java` by using the conventions
@@ -180,6 +232,7 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 	awsData := &awsxray.AWSData{
 		AccountID:    awsxray.String(account),
 		Beanstalk:    ebs,
+		CWLogs:       cwl,
 		ECS:          ecs,
 		EC2:          ec2,
 		EKS:          eks,
@@ -192,3 +245,32 @@ func makeAws(attributes map[string]string, resource pdata.Resource) (map[string]
 	}
 	return filtered, awsData
 }
+
+// Given an array of log group ARNs, create a corresponding amount of LogGroupMetadata objects with log_group and arn
+// populated, or given an array of just log group names, create the LogGroupMetadata objects with arn omitted
+func getLogGroupMetadata(logGroups pdata.AnyValueArray, isArn bool) []awsxray.LogGroupMetadata {
+	var lgm []awsxray.LogGroupMetadata
+	for i := 0; i < logGroups.Len(); i++ {
+		if isArn {
+			lgm = append(lgm, awsxray.LogGroupMetadata{
+				Arn:      awsxray.String(logGroups.At(i).StringVal()),
+				LogGroup: awsxray.String(parseLogGroup(logGroups.At(i).StringVal())),
+			})
+		} else {
+			lgm = append(lgm, awsxray.LogGroupMetadata{
+				LogGroup: awsxray.String(logGroups.At(i).StringVal()),
+			})
+		}
+	}
+
+	return lgm
+}
+
+func parseLogGroup(arn string) string {
+	i := bytes.LastIndexByte([]byte(arn), byte(':'))
+	if i != -1 {
+		return arn[i+1:]
+	}
+
+	return arn
+}

exporter/awsxrayexporter/translator/aws_test.go

@@ -33,6 +33,7 @@ func TestAwsFromEc2Resource(t *testing.T) {
 	resource.InitEmpty()
 	attrs := pdata.NewAttributeMap()
 	attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
+	attrs.InsertString(attributeInfrastructureService, "EC2")
 	attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
 	attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
 	attrs.InsertString(semconventions.AttributeHostID, instanceID)
@@ -63,12 +64,19 @@ func TestAwsFromEcsResource(t *testing.T) {
 	instanceID := "i-00f7c0bcb26da2a99"
 	containerName := "signup_aggregator-x82ufje83"
 	containerID := "0123456789A"
+	az := "us-east-1c"
+	launchType := "fargate"
+	family := "family"
+	taskArn := "arn:aws:ecs:us-west-2:123456789123:task/123"
+	clusterArn := "arn:aws:ecs:us-west-2:123456789123:cluster/my-cluster"
+	containerArn := "arn:aws:ecs:us-west-2:123456789123:container-instance/123"
 	resource := pdata.NewResource()
 	resource.InitEmpty()
 	attrs := pdata.NewAttributeMap()
 	attrs.InsertString(semconventions.AttributeCloudProvider, semconventions.AttributeCloudProviderAWS)
+	attrs.InsertString(attributeInfrastructureService, "ECS")
 	attrs.InsertString(semconventions.AttributeCloudAccount, "123456789")
-	attrs.InsertString(semconventions.AttributeCloudZone, "us-east-1c")
+	attrs.InsertString(semconventions.AttributeCloudZone, az)
 	attrs.InsertString(semconventions.AttributeContainerImage, "otel/signupaggregator")
 	attrs.InsertString(semconventions.AttributeContainerTag, "v1")
 	attrs.InsertString(semconventions.AttributeK8sCluster, "production")
@@ -78,7 +86,13 @@ func TestAwsFromEcsResource(t *testing.T) {
 	attrs.InsertString(semconventions.AttributeContainerName, containerName)
 	attrs.InsertString(semconventions.AttributeContainerID, containerID)
 	attrs.InsertString(semconventions.AttributeHostID, instanceID)
+	attrs.InsertString(awsEcsClusterArn, clusterArn)
+	attrs.InsertString(awsEcsContainerArn, containerArn)
+	attrs.InsertString(awsEcsTaskArn, taskArn)
+	attrs.InsertString(awsEcsTaskFamily, family)
+	attrs.InsertString(awsEcsLaunchType, launchType)
 	attrs.InsertString(semconventions.AttributeHostType, "m5.xlarge")
+
 	attrs.CopyTo(resource.Attributes())
 
 	attributes := make(map[string]string)
@@ -92,8 +106,14 @@ func TestAwsFromEcsResource(t *testing.T) {
 	assert.Nil(t, awsData.Beanstalk)
 	assert.NotNil(t, awsData.EKS)
 	assert.Equal(t, &awsxray.ECSMetadata{
-		ContainerName: aws.String(containerName),
-		ContainerID:   aws.String(containerID),
+		ContainerName:    aws.String(containerName),
+		ContainerID:      aws.String(containerID),
+		AvailabilityZone: aws.String(az),
+		ClusterArn:       aws.String(clusterArn),
+		ContainerArn:     aws.String(containerArn),
+		TaskArn:          aws.String(taskArn),
+		TaskFamily:       aws.String(family),
+		LaunchType:       aws.String(launchType),
 	}, awsData.ECS)
 }
 
@@ -343,3 +363,61 @@ func TestCustomSDK(t *testing.T) {
 	assert.Equal(t, "opentracing for java", *awsData.XRay.SDK)
 	assert.Equal(t, "2.0.3", *awsData.XRay.SDKVersion)
 }
+
+func TestLogGroups(t *testing.T) {
+	cwl1 := awsxray.LogGroupMetadata{
+		LogGroup: awsxray.String("group1"),
+	}
+	cwl2 := awsxray.LogGroupMetadata{
+		LogGroup: awsxray.String("group2"),
+	}
+
+	attributes := make(map[string]string)
+	resource := pdata.NewResource()
+	resource.InitEmpty()
+	lg := pdata.NewAttributeValueArray()
+	ava := lg.ArrayVal()
+	ava.Append(pdata.NewAttributeValueString("group1"))
+	ava.Append(pdata.NewAttributeValueString("group2"))
+
+	resource.Attributes().Insert(awsLogGroupNames, lg)
+
+	filtered, awsData := makeAws(attributes, resource)
+
+	assert.NotNil(t, filtered)
+	assert.NotNil(t, awsData)
+	assert.Equal(t, 2, len(awsData.CWLogs))
+	assert.Contains(t, awsData.CWLogs, cwl1)
+	assert.Contains(t, awsData.CWLogs, cwl2)
+}
+
+func TestLogGroupsFromArns(t *testing.T) {
+	group1 := "arn:aws:logs:us-east-1:123456789123:log-group:group1"
+	cwl1 := awsxray.LogGroupMetadata{
+		LogGroup: awsxray.String("group1"),
+		Arn:      awsxray.String(group1),
+	}
+	group2 := "arn:aws:logs:us-east-1:123456789123:log-group:group2"
+	cwl2 := awsxray.LogGroupMetadata{
+		LogGroup: awsxray.String("group2"),
+		Arn:      awsxray.String(group2),
+	}
+
+	attributes := make(map[string]string)
+	resource := pdata.NewResource()
+	resource.InitEmpty()
+	lga := pdata.NewAttributeValueArray()
+	ava := lga.ArrayVal()
+	ava.Append(pdata.NewAttributeValueString(group1))
+	ava.Append(pdata.NewAttributeValueString(group2))
+
+	resource.Attributes().Insert(awsLogGroupArns, lga)
+
+	filtered, awsData := makeAws(attributes, resource)
+
+	assert.NotNil(t, filtered)
+	assert.NotNil(t, awsData)
+	assert.Equal(t, 2, len(awsData.CWLogs))
+	assert.Contains(t, awsData.CWLogs, cwl1)
+	assert.Contains(t, awsData.CWLogs, cwl2)
+}

exporter/awsxrayexporter/translator/cause.go

@@ -23,15 +23,14 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
-	tracetranslator "go.opentelemetry.io/collector/translator/trace"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
 )
 
 func makeCause(span pdata.Span, attributes map[string]string, resource pdata.Resource) (isError, isFault bool,
 	filtered map[string]string, cause *awsxray.CauseData) {
 	status := span.Status()
-	if status.IsNil() || status.Code() == 0 {
+	if status.IsNil() || status.Code() == pdata.StatusCodeUnset {
 		return false, false, attributes, nil
 	}
 	filtered = attributes
@@ -118,7 +117,7 @@ func makeCause(span pdata.Span, attributes map[string]string, resource pdata.Res
 		}
 	}
 
-	if isClientError(status.Code()) {
+	if status.Code() == pdata.StatusCodeError {
 		isError = true
 		isFault = false
 	} else {
@@ -128,11 +127,6 @@ func makeCause(span pdata.Span, attributes map[string]string, resource pdata.Res
 	return isError, isFault, filtered, cause
 }
 
-func isClientError(code pdata.StatusCode) bool {
-	httpStatus := tracetranslator.HTTPStatusCodeFromOCStatus(int32(code))
-	return httpStatus >= 400 && httpStatus < 500
-}
-
 func parseException(exceptionType string, message string, stacktrace string, language string) []awsxray.Exception {
 	r := textproto.NewReader(bufio.NewReader(strings.NewReader(stacktrace)))