From 4b39c30ef36fd8d3836cdd9509eef99dc36ac1bc Mon Sep 17 00:00:00 2001
From: yulius-take2 <69262219+yulius-take2@users.noreply.github.com>
Date: Mon, 2 May 2022 08:10:46 -0700
Subject: [PATCH] contrib/aws/aws-sdk-go: add request id to trace (#1266)

---
 contrib/aws/aws-sdk-go/aws/aws.go      | 2 ++
 contrib/aws/aws-sdk-go/aws/aws_test.go | 1 +
 2 files changed, 3 insertions(+)

diff --git a/contrib/aws/aws-sdk-go/aws/aws.go b/contrib/aws/aws-sdk-go/aws/aws.go
index 60557c4e4c..1a6dd59edc 100644
--- a/contrib/aws/aws-sdk-go/aws/aws.go
+++ b/contrib/aws/aws-sdk-go/aws/aws.go
@@ -24,6 +24,7 @@ const (
 	tagAWSOperation  = "aws.operation"
 	tagAWSRegion     = "aws.region"
 	tagAWSRetryCount = "aws.retry_count"
+	tagAWSRequestID  = "aws.request_id"
 )
 
 type handlers struct {
@@ -78,6 +79,7 @@ func (h *handlers) Complete(req *request.Request) {
 		return
 	}
 	span.SetTag(tagAWSRetryCount, req.RetryCount)
+	span.SetTag(tagAWSRequestID, req.RequestID)
 	if req.HTTPResponse != nil {
 		span.SetTag(ext.HTTPCode, strconv.Itoa(req.HTTPResponse.StatusCode))
 	}
diff --git a/contrib/aws/aws-sdk-go/aws/aws_test.go b/contrib/aws/aws-sdk-go/aws/aws_test.go
index 8a1906ea29..db4f0bfde6 100644
--- a/contrib/aws/aws-sdk-go/aws/aws_test.go
+++ b/contrib/aws/aws-sdk-go/aws/aws_test.go
@@ -57,6 +57,7 @@ func TestAWS(t *testing.T) {
 		assert.Equal(t, "403", s.Tag(ext.HTTPCode))
 		assert.Equal(t, "PUT", s.Tag(ext.HTTPMethod))
 		assert.Equal(t, "http://s3.us-west-2.amazonaws.com/BUCKET", s.Tag(ext.HTTPURL))
+		assert.NotNil(t, s.Tag(tagAWSRequestID))
 	})
 
 	t.Run("ec2", func(t *testing.T) {