Skip to content

Commit

Permalink
observability naming adjustments (#537)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucix-aws authored Sep 18, 2024
1 parent 671c0a5 commit 6f58823
Show file tree
Hide file tree
Showing 20 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -398,14 +398,14 @@ defer endTimer()
decorated := middleware.DecorateHandler(handler, stack)
result, metadata, err = decorated.Handle(ctx, params)
if err != nil {
span.SetProperty("error.go.type", fmt.Sprintf("%T", err))
span.SetProperty("error.go.error", err.Error())
span.SetProperty("exception.type", fmt.Sprintf("%T", err))
span.SetProperty("exception.message", err.Error())
var aerr smithy.APIError
if $errors.As:T(err, &aerr) {
span.SetProperty("error.api.code", aerr.ErrorCode())
span.SetProperty("error.api.message", aerr.ErrorMessage())
span.SetProperty("error.api.fault", aerr.ErrorFault().String())
span.SetProperty("api.error_code", aerr.ErrorCode())
span.SetProperty("api.error_message", aerr.ErrorMessage())
span.SetProperty("api.error_fault", aerr.ErrorFault().String())
}
err = &$operationError:T{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private GoWriter.Writable generateBody() {
ctx = setResolvedAuthScheme(ctx, scheme)
span.SetProperty("operation.auth.resolved_scheme_id", scheme.Scheme.SchemeID())
span.SetProperty("auth.scheme_id", scheme.Scheme.SchemeID())
span.End()
return next.HandleFinalize(ctx, in)
""",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private GoWriter.Writable generateResolveEndpoint() {
return out, metadata, $fmt.Errorf:T("failed to resolve service endpoint, %w", err)
}
span.SetProperty("operation.resolved_endpoint", endpt.URI.String())
span.SetProperty("client.call.resolved_endpoint", endpt.URI.String())
if endpt.URI.RawPath == "" && req.URL.RawPath != "" {
endpt.URI.RawPath = endpt.URI.Path
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// import (
// "github.com/aws/aws-sdk-go-v2/config"
// "github.com/aws/aws-sdk-go-v2/service/s3"
// smithyotelmetrics "github.com/aws/smithy-go/metrics/smithy-otel-metrics"
// "github.com/aws/smithy-go/metrics/smithyotelmetrics"
// "go.opentelemetry.io/otel/sdk/metric"
// "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
// )
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/aws/smithy-go/metrics/smithy-otel-metrics
module github.com/aws/smithy-go/metrics/smithyotelmetrics

go 1.22

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// import (
// "github.com/aws/aws-sdk-go-v2/config"
// "github.com/aws/aws-sdk-go-v2/service/s3"
// smithyoteltracing "github.com/aws/smithy-go/tracing/smithy-otel-tracing"
// "github.com/aws/smithy-go/tracing/smithyoteltracing"
// "go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
// "go.opentelemetry.io/otel/sdk/trace"
// )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/aws/smithy-go/tracing/smithy-otel-tracing
module github.com/aws/smithy-go/tracing/smithyoteltracing

go 1.22

Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions transport/http/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ func (c ClientHandler) Handle(ctx context.Context, input interface{}) (
return nil, metadata, err
}

span.SetProperty("http.request.method", req.Method)
span.SetProperty("http.request.content_length", -1) // at least indicate unknown
span.SetProperty("http.method", req.Method)
span.SetProperty("http.request_content_length", -1) // at least indicate unknown
length, ok, err := req.StreamLength()
if err != nil {
return nil, metadata, err
}
if ok {
span.SetProperty("http.request.content_length", length)
span.SetProperty("http.request_content_length", length)
}

resp, err := c.client.Do(builtRequest)
Expand Down Expand Up @@ -93,9 +93,9 @@ func (c ClientHandler) Handle(ctx context.Context, input interface{}) (
_ = builtRequest.Body.Close()
}

span.SetProperty("http.proto", fmt.Sprintf("%d.%d", resp.ProtoMajor, resp.ProtoMinor))
span.SetProperty("http.response.status_code", resp.StatusCode)
span.SetProperty("http.response.content_length", resp.ContentLength)
span.SetProperty("net.protocol.version", fmt.Sprintf("%d.%d", resp.ProtoMajor, resp.ProtoMinor))
span.SetProperty("http.status_code", resp.StatusCode)
span.SetProperty("http.response_content_length", resp.ContentLength)

return &Response{Response: resp}, metadata, err
}
Expand Down

0 comments on commit 6f58823

Please sign in to comment.