OpenTelemetry now logs HTTP scheme and flavour for you

Dotnet-Boxed · Aug 3, 2022 · e66477c · e66477c
1 parent 4ca0be3
commit e66477c
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 138 deletions.
diff --git a/Source/ApiTemplate/.template.config/template.json b/Source/ApiTemplate/.template.config/template.json
@@ -153,7 +153,6 @@
           "condition": "(!OpenTelemetry)",
           "exclude": [
             "Source/ApiTemplate/Constants/OpenTelemetryAttributeName.cs",
-            "Source/ApiTemplate/Constants/OpenTelemetryHttpFlavour.cs",
             "Source/ApiTemplate/TracerProviderBuilderExtensions.cs"
           ]
         }

diff --git a/Source/ApiTemplate/Source/ApiTemplate/Constants/OpenTelemetryAttributeName.cs b/Source/ApiTemplate/Source/ApiTemplate/Constants/OpenTelemetryAttributeName.cs
@@ -51,18 +51,6 @@ public static class EndUser
     /// </summary>
     public static class Http
     {
-        /// <summary>
-        /// The URI scheme identifying the used protocol.
-        /// </summary>
-        /// <example>E.g. http or https.</example>
-        public const string Scheme = "http.scheme";
-
-        /// <summary>
-        /// Kind of HTTP protocol used.
-        /// </summary>
-        /// <example>E.g. 1.0, 1.1, 2.0, SPDY or QUIC.</example>
-        public const string Flavor = "http.flavor";
-
         /// <summary>
         /// The IP address of the original client behind all proxies, if known (e.g. from X-Forwarded-For).
         /// </summary>

diff --git a/Source/ApiTemplate/Source/ApiTemplate/Constants/OpenTelemetryHttpFlavour.cs b/Source/ApiTemplate/Source/ApiTemplate/Constants/OpenTelemetryHttpFlavour.cs
diff --git a/Source/ApiTemplate/Source/ApiTemplate/TracerProviderBuilderExtensions.cs b/Source/ApiTemplate/Source/ApiTemplate/TracerProviderBuilderExtensions.cs
@@ -61,8 +61,6 @@ private static void Enrich(Activity activity, string eventName, object obj)
         if (obj is HttpRequest request)
         {
             var context = request.HttpContext;
-            activity.AddTag(OpenTelemetryAttributeName.Http.Flavor, OpenTelemetryHttpFlavour.GetHttpFlavour(request.Protocol));
-            activity.AddTag(OpenTelemetryAttributeName.Http.Scheme, request.Scheme);
             activity.AddTag(OpenTelemetryAttributeName.Http.ClientIP, context.Connection.RemoteIpAddress);
             activity.AddTag(OpenTelemetryAttributeName.Http.RequestContentLength, request.ContentLength);
             activity.AddTag(OpenTelemetryAttributeName.Http.RequestContentType, request.ContentType);

diff --git a/Source/GraphQLTemplate/.template.config/template.json b/Source/GraphQLTemplate/.template.config/template.json
@@ -146,7 +146,6 @@
           "condition": "(!OpenTelemetry)",
           "exclude": [
             "Source/GraphQLTemplate/Constants/OpenTelemetryAttributeName.cs",
-            "Source/GraphQLTemplate/Constants/OpenTelemetryHttpFlavour.cs",
             "Source/GraphQLTemplate/TracerProviderBuilderExtensions.cs"
           ]
         }

diff --git a/Source/GraphQLTemplate/Source/GraphQLTemplate/Constants/OpenTelemetryAttributeName.cs b/Source/GraphQLTemplate/Source/GraphQLTemplate/Constants/OpenTelemetryAttributeName.cs
@@ -51,18 +51,6 @@ public static class EndUser
     /// </summary>
     public static class Http
     {
-        /// <summary>
-        /// The URI scheme identifying the used protocol.
-        /// </summary>
-        /// <example>E.g. http or https.</example>
-        public const string Scheme = "http.scheme";
-
-        /// <summary>
-        /// Kind of HTTP protocol used.
-        /// </summary>
-        /// <example>E.g. 1.0, 1.1, 2.0, SPDY or QUIC.</example>
-        public const string Flavor = "http.flavor";
-
         /// <summary>
         /// The IP address of the original client behind all proxies, if known (e.g. from X-Forwarded-For).
         /// </summary>

diff --git a/Source/GraphQLTemplate/Source/GraphQLTemplate/Constants/OpenTelemetryHttpFlavour.cs b/Source/GraphQLTemplate/Source/GraphQLTemplate/Constants/OpenTelemetryHttpFlavour.cs
diff --git a/Source/GraphQLTemplate/Source/GraphQLTemplate/TracerProviderBuilderExtensions.cs b/Source/GraphQLTemplate/Source/GraphQLTemplate/TracerProviderBuilderExtensions.cs
@@ -67,8 +67,6 @@ private static void Enrich(Activity activity, string eventName, object obj)
         if (obj is HttpRequest request)
         {
             var context = request.HttpContext;
-            activity.AddTag(OpenTelemetryAttributeName.Http.Flavor, OpenTelemetryHttpFlavour.GetHttpFlavour(request.Protocol));
-            activity.AddTag(OpenTelemetryAttributeName.Http.Scheme, request.Scheme);
             activity.AddTag(OpenTelemetryAttributeName.Http.ClientIP, context.Connection.RemoteIpAddress);
             activity.AddTag(OpenTelemetryAttributeName.Http.RequestContentLength, request.ContentLength);
             activity.AddTag(OpenTelemetryAttributeName.Http.RequestContentType, request.ContentType);

diff --git a/Source/OrleansTemplate/.template.config/template.json b/Source/OrleansTemplate/.template.config/template.json
@@ -86,7 +86,6 @@
           "condition": "(!OpenTelemetry)",
           "exclude": [
             "Source/OrleansTemplate.Abstractions/Constants/OpenTelemetryAttributeName.cs",
-            "Source/OrleansTemplate.Abstractions/Constants/OpenTelemetryHttpFlavour.cs",
             "Source/OrleansTemplate.Server/TracerProviderBuilderExtensions.cs"
           ]
         }

diff --git a/...leansTemplate/Source/OrleansTemplate.Abstractions/Constants/OpenTelemetryAttributeName.cs b/...leansTemplate/Source/OrleansTemplate.Abstractions/Constants/OpenTelemetryAttributeName.cs
@@ -51,18 +51,6 @@ public static class EndUser
     /// </summary>
     public static class Http
     {
-        /// <summary>
-        /// The URI scheme identifying the used protocol.
-        /// </summary>
-        /// <example>E.g. http or https.</example>
-        public const string Scheme = "http.scheme";
-
-        /// <summary>
-        /// Kind of HTTP protocol used.
-        /// </summary>
-        /// <example>E.g. 1.0, 1.1, 2.0, SPDY or QUIC.</example>
-        public const string Flavor = "http.flavor";
-
         /// <summary>
         /// The IP address of the original client behind all proxies, if known (e.g. from X-Forwarded-For).
         /// </summary>

diff --git a/...OrleansTemplate/Source/OrleansTemplate.Abstractions/Constants/OpenTelemetryHttpFlavour.cs b/...OrleansTemplate/Source/OrleansTemplate.Abstractions/Constants/OpenTelemetryHttpFlavour.cs
diff --git a/Source/OrleansTemplate/Source/OrleansTemplate.Server/TracerProviderBuilderExtensions.cs b/Source/OrleansTemplate/Source/OrleansTemplate.Server/TracerProviderBuilderExtensions.cs
@@ -63,8 +63,6 @@ private static void Enrich(Activity activity, string eventName, object obj)
         if (obj is HttpRequest request)
         {
             var context = request.HttpContext;
-            activity.AddTag(OpenTelemetryAttributeName.Http.Flavor, GetHttpFlavour(request.Protocol));
-            activity.AddTag(OpenTelemetryAttributeName.Http.Scheme, request.Scheme);
             activity.AddTag(OpenTelemetryAttributeName.Http.ClientIP, context.Connection.RemoteIpAddress);
             activity.AddTag(OpenTelemetryAttributeName.Http.RequestContentLength, request.ContentLength);
             activity.AddTag(OpenTelemetryAttributeName.Http.RequestContentType, request.ContentType);
@@ -82,26 +80,4 @@ private static void Enrich(Activity activity, string eventName, object obj)
             activity.AddTag(OpenTelemetryAttributeName.Http.ResponseContentType, response.ContentType);
         }
     }
-
-    private static string GetHttpFlavour(string protocol)
-    {
-        if (HttpProtocol.IsHttp10(protocol))
-        {
-            return OpenTelemetryHttpFlavour.Http10;
-        }
-        else if (HttpProtocol.IsHttp11(protocol))
-        {
-            return OpenTelemetryHttpFlavour.Http11;
-        }
-        else if (HttpProtocol.IsHttp2(protocol))
-        {
-            return OpenTelemetryHttpFlavour.Http20;
-        }
-        else if (HttpProtocol.IsHttp3(protocol))
-        {
-            return OpenTelemetryHttpFlavour.Http30;
-        }
-
-        throw new InvalidOperationException($"Protocol {protocol} not recognised.");
-    }
 }