Follow up from #4627 (#4645)

vishweshbankwar · web-flow · commit ad08228dfec8 · 2023-07-07T13:47:48.000-07:00
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
@@ -63,13 +63,19 @@ internal class HttpInListener : ListenerHandler
 #endif
         private readonly PropertyFetcher<Exception> stopExceptionFetcher = new("Exception");
         private readonly AspNetCoreInstrumentationOptions options;
+        private readonly bool emitOldAttributes;
+        private readonly bool emitNewAttributes;
 
         public HttpInListener(AspNetCoreInstrumentationOptions options)
             : base(DiagnosticSourceName)
         {
             Guard.ThrowIfNull(options);
 
             this.options = options;
+
+            this.emitOldAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old);
+
+            this.emitNewAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New);
         }
 
         public override void OnEventWritten(string name, object payload)
@@ -195,7 +201,7 @@ public void OnStartActivity(Activity activity, object payload)
                 activity.DisplayName = path;
 
                 // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/http.md
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+                if (this.emitOldAttributes)
                 {
                     if (request.Host.HasValue)
                     {
@@ -224,7 +230,7 @@ public void OnStartActivity(Activity activity, object payload)
                 }
 
                 // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+                if (this.emitNewAttributes)
                 {
                     if (request.Host.HasValue)
                     {
@@ -281,12 +287,12 @@ public void OnStopActivity(Activity activity, object payload)
 
                 var response = context.Response;
 
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+                if (this.emitOldAttributes)
                 {
                     activity.SetTag(SemanticConventions.AttributeHttpStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
                 }
 
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+                if (this.emitNewAttributes)
                 {
                     activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
                 }
@@ -485,12 +491,12 @@ private void AddGrpcAttributes(Activity activity, string grpcMethod, HttpContext
                 activity.SetTag(SemanticConventions.AttributeNetPeerIp, context.Connection.RemoteIpAddress.ToString());
             }
 
-            if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+            if (this.emitOldAttributes)
             {
                 activity.SetTag(SemanticConventions.AttributeNetPeerPort, context.Connection.RemotePort);
             }
 
-            if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+            if (this.emitNewAttributes)
             {
                 activity.SetTag(SemanticConventions.AttributeServerPort, context.Connection.RemotePort);
             }
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs
@@ -34,13 +34,19 @@ internal sealed class HttpInMetricsListener : ListenerHandler
         private readonly Meter meter;
         private readonly AspNetCoreMetricsInstrumentationOptions options;
         private readonly Histogram<double> httpServerDuration;
+        private readonly bool emitOldAttributes;
+        private readonly bool emitNewAttributes;
 
         internal HttpInMetricsListener(string name, Meter meter, AspNetCoreMetricsInstrumentationOptions options)
             : base(name)
         {
             this.meter = meter;
             this.options = options;
             this.httpServerDuration = meter.CreateHistogram<double>(HttpServerDurationMetricName, "ms", "Measures the duration of inbound HTTP requests.");
+
+            this.emitOldAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old);
+
+            this.emitNewAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New);
         }
 
         public override void OnEventWritten(string name, object payload)
@@ -79,7 +85,7 @@ public override void OnEventWritten(string name, object payload)
                 TagList tags = default;
 
                 // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/http.md
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+                if (this.emitOldAttributes)
                 {
                     tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeHttpFlavor, HttpTagHelper.GetFlavorTagValueFromProtocol(context.Request.Protocol)));
                     tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeHttpScheme, context.Request.Scheme));
@@ -98,7 +104,7 @@ public override void OnEventWritten(string name, object payload)
                 }
 
                 // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+                if (this.emitNewAttributes)
                 {
                     tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeNetworkProtocolVersion, HttpTagHelper.GetFlavorTagValueFromProtocol(context.Request.Protocol)));
                     tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeUrlScheme, context.Request.Scheme));
diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs
@@ -45,6 +45,8 @@ internal sealed class HttpHandlerDiagnosticListener : ListenerHandler
         private readonly PropertyFetcher<Exception> stopExceptionFetcher = new("Exception");
         private readonly PropertyFetcher<TaskStatus> stopRequestStatusFetcher = new("RequestTaskStatus");
         private readonly HttpClientInstrumentationOptions options;
+        private readonly bool emitOldAttributes;
+        private readonly bool emitNewAttributes;
 
         static HttpHandlerDiagnosticListener()
         {
@@ -62,6 +64,10 @@ public HttpHandlerDiagnosticListener(HttpClientInstrumentationOptions options)
             : base("HttpHandlerDiagnosticListener")
         {
             this.options = options;
+
+            this.emitOldAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old);
+
+            this.emitNewAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New);
         }
 
         public override void OnEventWritten(string name, object payload)
@@ -159,7 +165,7 @@ public void OnStartActivity(Activity activity, object payload)
                 }
 
                 // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/http.md
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+                if (this.emitOldAttributes)
                 {
                     activity.SetTag(SemanticConventions.AttributeHttpScheme, request.RequestUri.Scheme);
                     activity.SetTag(SemanticConventions.AttributeHttpMethod, HttpTagHelper.GetNameForHttpMethod(request.Method));
@@ -174,7 +180,7 @@ public void OnStartActivity(Activity activity, object payload)
                 }
 
                 // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md
-                if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+                if (this.emitNewAttributes)
                 {
                     activity.SetTag(SemanticConventions.AttributeUrlScheme, request.RequestUri.Scheme);
                     activity.SetTag(SemanticConventions.AttributeHttpRequestMethod, HttpTagHelper.GetNameForHttpMethod(request.Method));
@@ -238,12 +244,12 @@ public void OnStopActivity(Activity activity, object payload)
 
                 if (this.stopResponseFetcher.TryFetch(payload, out HttpResponseMessage response) && response != null)
                 {
-                    if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+                    if (this.emitOldAttributes)
                     {
                         activity.SetTag(SemanticConventions.AttributeHttpStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
                     }
 
-                    if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+                    if (this.emitNewAttributes)
                     {
                         activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
                     }
diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerMetricsDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerMetricsDiagnosticListener.cs
@@ -32,12 +32,18 @@ internal sealed class HttpHandlerMetricsDiagnosticListener : ListenerHandler
         private readonly PropertyFetcher<HttpRequestMessage> stopRequestFetcher = new("Request");
         private readonly Histogram<double> httpClientDuration;
         private readonly HttpClientMetricInstrumentationOptions options;
+        private readonly bool emitOldAttributes;
+        private readonly bool emitNewAttributes;
 
         public HttpHandlerMetricsDiagnosticListener(string name, Meter meter, HttpClientMetricInstrumentationOptions options)
             : base(name)
         {
             this.httpClientDuration = meter.CreateHistogram<double>("http.client.duration", "ms", "Measures the duration of outbound HTTP requests.");
             this.options = options;
+
+            this.emitOldAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old);
+
+            this.emitNewAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New);
         }
 
         public override void OnEventWritten(string name, object payload)
@@ -55,7 +61,7 @@ public override void OnEventWritten(string name, object payload)
                     TagList tags = default;
 
                     // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/http.md
-                    if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))
+                    if (this.emitOldAttributes)
                     {
                         tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeHttpMethod, HttpTagHelper.GetNameForHttpMethod(request.Method)));
                         tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeHttpScheme, request.RequestUri.Scheme));
@@ -74,7 +80,7 @@ public override void OnEventWritten(string name, object payload)
                     }
 
                     // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md
-                    if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))
+                    if (this.emitNewAttributes)
                     {
                         tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeHttpRequestMethod, HttpTagHelper.GetNameForHttpMethod(request.Method)));
                         tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeUrlScheme, request.RequestUri.Scheme));

Original file line number	Diff line number	Diff line change
`@@ -63,13 +63,19 @@ internal class HttpInListener : ListenerHandler`
`63`	`63`	`#endif`
`64`	`64`	`private readonly PropertyFetcher<Exception> stopExceptionFetcher = new("Exception");`
`65`	`65`	`private readonly AspNetCoreInstrumentationOptions options;`
	`66`	`+ private readonly bool emitOldAttributes;`
	`67`	`+ private readonly bool emitNewAttributes;`
`66`	`68`
`67`	`69`	`public HttpInListener(AspNetCoreInstrumentationOptions options)`
`68`	`70`	`: base(DiagnosticSourceName)`
`69`	`71`	`{`
`70`	`72`	`Guard.ThrowIfNull(options);`
`71`	`73`
`72`	`74`	`this.options = options;`
	`75`	`+`
	`76`	`+ this.emitOldAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old);`
	`77`	`+`
	`78`	`+ this.emitNewAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New);`
`73`	`79`	`}`
`74`	`80`
`75`	`81`	`public override void OnEventWritten(string name, object payload)`
`@@ -195,7 +201,7 @@ public void OnStartActivity(Activity activity, object payload)`
`195`	`201`	`activity.DisplayName = path;`
`196`	`202`
`197`	`203`	`// see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/http.md`
`198`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))`
	`204`	`+ if (this.emitOldAttributes)`
`199`	`205`	`{`
`200`	`206`	`if (request.Host.HasValue)`
`201`	`207`	`{`
`@@ -224,7 +230,7 @@ public void OnStartActivity(Activity activity, object payload)`
`224`	`230`	`}`
`225`	`231`
`226`	`232`	`// see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md`
`227`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))`
	`233`	`+ if (this.emitNewAttributes)`
`228`	`234`	`{`
`229`	`235`	`if (request.Host.HasValue)`
`230`	`236`	`{`
`@@ -281,12 +287,12 @@ public void OnStopActivity(Activity activity, object payload)`
`281`	`287`
`282`	`288`	`var response = context.Response;`
`283`	`289`
`284`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))`
	`290`	`+ if (this.emitOldAttributes)`
`285`	`291`	`{`
`286`	`292`	`activity.SetTag(SemanticConventions.AttributeHttpStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));`
`287`	`293`	`}`
`288`	`294`
`289`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))`
	`295`	`+ if (this.emitNewAttributes)`
`290`	`296`	`{`
`291`	`297`	`activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));`
`292`	`298`	`}`
`@@ -485,12 +491,12 @@ private void AddGrpcAttributes(Activity activity, string grpcMethod, HttpContext`
`485`	`491`	`activity.SetTag(SemanticConventions.AttributeNetPeerIp, context.Connection.RemoteIpAddress.ToString());`
`486`	`492`	`}`
`487`	`493`
`488`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))`
	`494`	`+ if (this.emitOldAttributes)`
`489`	`495`	`{`
`490`	`496`	`activity.SetTag(SemanticConventions.AttributeNetPeerPort, context.Connection.RemotePort);`
`491`	`497`	`}`
`492`	`498`
`493`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))`
	`499`	`+ if (this.emitNewAttributes)`
`494`	`500`	`{`
`495`	`501`	`activity.SetTag(SemanticConventions.AttributeServerPort, context.Connection.RemotePort);`
`496`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ internal sealed class HttpHandlerDiagnosticListener : ListenerHandler`
`45`	`45`	`private readonly PropertyFetcher<Exception> stopExceptionFetcher = new("Exception");`
`46`	`46`	`private readonly PropertyFetcher<TaskStatus> stopRequestStatusFetcher = new("RequestTaskStatus");`
`47`	`47`	`private readonly HttpClientInstrumentationOptions options;`
	`48`	`+ private readonly bool emitOldAttributes;`
	`49`	`+ private readonly bool emitNewAttributes;`
`48`	`50`
`49`	`51`	`static HttpHandlerDiagnosticListener()`
`50`	`52`	`{`
`@@ -62,6 +64,10 @@ public HttpHandlerDiagnosticListener(HttpClientInstrumentationOptions options)`
`62`	`64`	`: base("HttpHandlerDiagnosticListener")`
`63`	`65`	`{`
`64`	`66`	`this.options = options;`
	`67`	`+`
	`68`	`+ this.emitOldAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old);`
	`69`	`+`
	`70`	`+ this.emitNewAttributes = this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New);`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`public override void OnEventWritten(string name, object payload)`
`@@ -159,7 +165,7 @@ public void OnStartActivity(Activity activity, object payload)`
`159`	`165`	`}`
`160`	`166`
`161`	`167`	`// see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/trace/semantic_conventions/http.md`
`162`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))`
	`168`	`+ if (this.emitOldAttributes)`
`163`	`169`	`{`
`164`	`170`	`activity.SetTag(SemanticConventions.AttributeHttpScheme, request.RequestUri.Scheme);`
`165`	`171`	`activity.SetTag(SemanticConventions.AttributeHttpMethod, HttpTagHelper.GetNameForHttpMethod(request.Method));`
`@@ -174,7 +180,7 @@ public void OnStartActivity(Activity activity, object payload)`
`174`	`180`	`}`
`175`	`181`
`176`	`182`	`// see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md`
`177`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))`
	`183`	`+ if (this.emitNewAttributes)`
`178`	`184`	`{`
`179`	`185`	`activity.SetTag(SemanticConventions.AttributeUrlScheme, request.RequestUri.Scheme);`
`180`	`186`	`activity.SetTag(SemanticConventions.AttributeHttpRequestMethod, HttpTagHelper.GetNameForHttpMethod(request.Method));`
`@@ -238,12 +244,12 @@ public void OnStopActivity(Activity activity, object payload)`
`238`	`244`
`239`	`245`	`if (this.stopResponseFetcher.TryFetch(payload, out HttpResponseMessage response) && response != null)`
`240`	`246`	`{`
`241`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.Old))`
	`247`	`+ if (this.emitOldAttributes)`
`242`	`248`	`{`
`243`	`249`	`activity.SetTag(SemanticConventions.AttributeHttpStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));`
`244`	`250`	`}`
`245`	`251`
`246`		`- if (this.options.HttpSemanticConvention.HasFlag(HttpSemanticConvention.New))`
	`252`	`+ if (this.emitNewAttributes)`
`247`	`253`	`{`
`248`	`254`	`activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));`
`249`	`255`	`}`