Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix aws sdk span name #3582

Merged
merged 9 commits into from
Mar 20, 2023
Merged

fix aws sdk span name #3582

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
77f56a5
fix aws sdk span name
nemoshlag Mar 13, 2023
8cc278f
fix aws sdk span name
nemoshlag Mar 13, 2023
16f575a
Merge branch 'main' into fix-aws-span-name
nemoshlag Mar 13, 2023
5518f90
Merge branch 'main' into fix-aws-span-name
hanyuancheung Mar 14, 2023
605ab8b
Update CHANGELOG.md
nemoshlag Mar 14, 2023
585508a
Merge branch 'main' into fix-aws-span-name
nemoshlag Mar 16, 2023
d87a208
add empty operation handling
nemoshlag Mar 20, 2023
3dd4a95
Update CHANGELOG.md
nemoshlag Mar 20, 2023
58199b3
Merge branch 'main' into fix-aws-span-name
nemoshlag Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068)

### Fixed

- Fix aws sdk span name
nemoshlag marked this conversation as resolved.
Show resolved Hide resolved
([#3582](https://github.com/open-telemetry/opentelemetry-go-contrib/issues/3521))

## [1.16.0-rc.1/0.41.0-rc.1/0.9.0-rc.1] - 2023-03-02

### Changed
Expand Down
3 changes: 2 additions & 1 deletion instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func (m otelMiddlewares) initializeMiddlewareAfter(stack *middleware.Stack) erro
ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
out middleware.InitializeOutput, metadata middleware.Metadata, err error) {
serviceID := v2Middleware.GetServiceID(ctx)
operation := v2Middleware.GetOperationName(ctx)
MrAlias marked this conversation as resolved.
Show resolved Hide resolved

attributes := []attribute.KeyValue{
ServiceAttr(serviceID),
Expand All @@ -70,7 +71,7 @@ func (m otelMiddlewares) initializeMiddlewareAfter(stack *middleware.Stack) erro
attributes = append(attributes, setter(ctx, in)...)
}

ctx, span := m.tracer.Start(ctx, serviceID,
ctx, span := m.tracer.Start(ctx, serviceID+"."+operation,
trace.WithTimestamp(ctx.Value(spanTimestampKey{}).(time.Time)),
trace.WithSpanKind(trace.SpanKindClient),
trace.WithAttributes(attributes...),
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestAppendMiddlewares(t *testing.T) {
require.Len(t, spans, 1)
span := spans[0]

assert.Equal(t, "Route 53", span.Name())
assert.Equal(t, "Route 53.ChangeResourceRecordSets", span.Name())
assert.Equal(t, trace.SpanKindClient, span.SpanKind())
assert.Equal(t, c.expectedError, span.Status().Code)
attrs := span.Attributes()
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/dynamodbattributes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func TestDynamodbTags(t *testing.T) {
require.Len(t, spans, 1)
span := spans[0]

assert.Equal(t, "DynamoDB", span.Name())
assert.Equal(t, "DynamoDB.GetItem", span.Name())
assert.Equal(t, trace.SpanKindClient, span.SpanKind())
attrs := span.Attributes()
assert.Contains(t, attrs, attribute.Int("http.status_code", cases.expectedStatusCode))
Expand Down Expand Up @@ -182,7 +182,7 @@ func TestDynamodbTagsCustomSetter(t *testing.T) {
require.Len(t, spans, 1)
span := spans[0]

assert.Equal(t, "DynamoDB", span.Name())
assert.Equal(t, "DynamoDB.GetItem", span.Name())
assert.Equal(t, trace.SpanKindClient, span.SpanKind())
attrs := span.Attributes()
assert.Contains(t, attrs, attribute.Int("http.status_code", cases.expectedStatusCode))
Expand Down