style nit

aws · Sep 18, 2024 · 89db9ac · 89db9ac
1 parent 24e8315
commit 89db9ac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/...n/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/ServiceGenerator.java b/...n/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/ServiceGenerator.java
@@ -390,7 +390,8 @@ private GoWriter.Writable generateInvokeOperation() {
                         o.Properties.Set("rpc.method", opID)
                         o.Properties.Set("rpc.service", ServiceID)
                     })
-                    defer startMetricTimer(ctx, "client.call.duration")()
+                    endTimer := startMetricTimer(ctx, "client.call.duration")
+                    defer endTimer()
                     defer span.End()
 
                     handler := $newClientHandler:T(options.HTTPClient)

diff --git a/...main/java/software/amazon/smithy/go/codegen/integration/HttpBindingProtocolGenerator.java b/...main/java/software/amazon/smithy/go/codegen/integration/HttpBindingProtocolGenerator.java
@@ -398,7 +398,8 @@ private void generateOperationDeserializerMiddleware(GenerationContext context,
 
             writer.write(goTemplate("""
                     _, span := $T(ctx, "OperationDeserializer")
-                    defer startMetricTimer(ctx, "client.call.deserialization_duration")()
+                    endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+                    defer endTimer()
                     defer span.End()
                     """, SMITHY_TRACING.func("StartSpan")));
 

diff --git a/...src/main/java/software/amazon/smithy/go/codegen/integration/HttpRpcProtocolGenerator.java b/...src/main/java/software/amazon/smithy/go/codegen/integration/HttpRpcProtocolGenerator.java
@@ -344,7 +344,8 @@ private void generateOperationDeserializer(GenerationContext context, OperationS
 
             writer.write(goTemplate("""
                     _, span := $T(ctx, "OperationDeserializer")
-                    defer startMetricTimer(ctx, "client.call.deserialization_duration")()
+                    endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
+                    defer endTimer()
                     defer span.End()
                     """, SMITHY_TRACING.func("StartSpan")));
 

diff --git a/...n/src/main/java/software/amazon/smithy/go/codegen/integration/OperationMetricsStruct.java b/...n/src/main/java/software/amazon/smithy/go/codegen/integration/OperationMetricsStruct.java
@@ -54,7 +54,7 @@ private GoWriter.Writable generateStruct() {
                 type operationMetrics struct {
                     Duration                metrics.Float64Histogram
                     SerializeDuration       metrics.Float64Histogram
-                    GetIdentityDuration     metrics.Float64Histogram
+                    ResolveIdentityDuration metrics.Float64Histogram
                     ResolveEndpointDuration metrics.Float64Histogram
                     SignRequestDuration     metrics.Float64Histogram
                     DeserializeDuration     metrics.Float64Histogram
@@ -83,7 +83,7 @@ func withOperationMetrics(parent context.Context, mp metrics.MeterProvider) (con
                     if err != nil {
                         return nil, err
                     }
-                    om.GetIdentityDuration, err = operationMetricTimer(meter, "client.call.auth.resolve_identity_duration",
+                    om.ResolveIdentityDuration, err = operationMetricTimer(meter, "client.call.auth.resolve_identity_duration",
                         "The time taken to acquire an identity (AWS credentials, bearer token, etc) from an Identity Provider")
                     if err != nil {
                         return nil, err
@@ -129,7 +129,7 @@ private GoWriter.Writable generateHelpers() {
                     case "client.call.serialization_duration":
                         return m.SerializeDuration
                     case "client.call.resolve_identity_duration":
-                        return m.GetIdentityDuration
+                        return m.ResolveIdentityDuration
                     case "client.call.resolve_endpoint_duration":
                         return m.ResolveEndpointDuration
                     case "client.call.signing_duration":