Apply suggestions from code review

Co-authored-by: Tyler Yahn <[email protected]>

Author: jennynilsen

CHANGELOG.md

@@ -9,7 +9,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [Unreleased]
 
 ### Added
-- Dynamodb spans will now have the appropriate attributes added for the operation being performed, this is detected automatically but it is also now possible to provide a custom function to set attributes using `WithAttributeSetter` 
+
+- Dynamodb spans created with the `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/` package will now have the appropriate database attributes added for the operation being performed.
+  These attributes are detected automatically, but it is also now possible to provide a custom function to set attributes using `WithAttributeSetter`. (#1582)
 
 - Add `WithClientTrace` option to `otelhttp.Transport` (#875)
 

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go

@@ -39,7 +39,7 @@ type AttributeSetter func(context.Context, middleware.InitializeInput) []attribu
 
 type otelMiddlewares struct {
 	tracer          trace.Tracer
-	attributesetter []AttributeSetter
+	attributeSetter []AttributeSetter
 }
 
 func (m otelMiddlewares) initializeMiddlewareBefore(stack *middleware.Stack) error {
@@ -60,7 +60,8 @@ func (m otelMiddlewares) initializeMiddlewareAfter(stack *middleware.Stack) erro
 
 		serviceID := v2Middleware.GetServiceID(ctx)
 
-		attributes := []attribute.KeyValue{ServiceAttr(serviceID),
+		attributes := []attribute.KeyValue{
+			ServiceAttr(serviceID),
 			RegionAttr(v2Middleware.GetRegion(ctx)),
 			OperationAttr(v2Middleware.GetOperationName(ctx)),
 		}

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/config.go

@@ -49,7 +49,6 @@ func WithTracerProvider(provider trace.TracerProvider) Option {
 // WithAttributeSetter specifies an attribute setter function for setting service specific attributes.
 // If none is specified, the service will be determined by the DefaultAttributeSetter function and the corresponding attributes will be included.
 func WithAttributeSetter(attributesetters ...AttributeSetter) Option {
-
 	return optionFunc(func(cfg *config) {
 		if len(attributesetters) > 0 {
 			cfg.AttributeSetter = append(cfg.AttributeSetter, attributesetters...)

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/dynamodbattributes.go

@@ -25,7 +25,7 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
 )
 
-func DynamodbAttributeSetter(ctx context.Context, in middleware.InitializeInput) []attribute.KeyValue {
+func DynamoDBAttributeSetter(ctx context.Context, in middleware.InitializeInput) []attribute.KeyValue {
 
 	dynamodbAttributes := []attribute.KeyValue{
 		{
@@ -47,14 +47,7 @@ func DynamodbAttributeSetter(ctx context.Context, in middleware.InitializeInput)
 			dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBProjectionKey.String(*v.ProjectionExpression))
 		}
 
-	case *dynamodb.BatchGetItemInput:
-		var tableNames []string
-		for k, _ := range v.RequestItems {
-			tableNames = append(tableNames, k)
-		}
-		dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBTableNamesKey.StringSlice(tableNames))
-
-	case *dynamodb.BatchWriteItemInput:
+	case *dynamodb.BatchGetItemInput, *dynamodb.BatchWriteItemInput:
 		var tableNames []string
 		for k, _ := range v.RequestItems {
 			tableNames = append(tableNames, k)
@@ -79,13 +72,7 @@ func DynamodbAttributeSetter(ctx context.Context, in middleware.InitializeInput)
 			dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBProvisionedWriteCapacityKey.Int64(*v.ProvisionedThroughput.WriteCapacityUnits))
 		}
 
-	case *dynamodb.DeleteItemInput:
-		dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBTableNamesKey.String(*v.TableName))
-
-	case *dynamodb.DeleteTableInput:
-		dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBTableNamesKey.String(*v.TableName))
-
-	case *dynamodb.DescribeTableInput:
+	case *dynamodb.DeleteItemInput, *dynamodb.DeleteTableInput, *dynamodb.DescribeTableInput, *dynamodb.PutItemInput:
 		dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBTableNamesKey.String(*v.TableName))
 
 	case *dynamodb.ListTablesInput:
@@ -98,10 +85,6 @@ func DynamodbAttributeSetter(ctx context.Context, in middleware.InitializeInput)
 			dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBLimitKey.Int(int(*v.Limit)))
 		}
 
-	case *dynamodb.PutItemInput:
-
-		dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBTableNamesKey.String(*v.TableName))
-
 	case *dynamodb.QueryInput:
 
 		dynamodbAttributes = append(dynamodbAttributes, semconv.AWSDynamoDBTableNamesKey.String(*v.TableName))

instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/dynamodbattributes_test.go

@@ -26,7 +26,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 )
 
-func TestDynamodbTagsBatchGetItemInput(t *testing.T) {
+func TestDynamoDBTagsBatchGetItemInput(t *testing.T) {
 	input := middleware.InitializeInput{
 		Parameters: &dynamodb.BatchGetItemInput{
 			RequestItems: map[string]dtypes.KeysAndAttributes{