Move extensions into owning class namespace & rename add instrumentat…

…ions ext method (#276)
honeycombio · Sep 26, 2022 · c023766 · c023766
1 parent 2af039e
commit c023766
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/Honeycomb.OpenTelemetry.AutoInstrumentations/TracerProviderBuilderExtensions.cs b/src/Honeycomb.OpenTelemetry.AutoInstrumentations/TracerProviderBuilderExtensions.cs
@@ -1,7 +1,6 @@
 using Npgsql;
-using OpenTelemetry.Trace;
 
-namespace Honeycomb.OpenTelemetry.AutoInstrumentations
+namespace OpenTelemetry.Trace
 {
     /// <summary>
     /// Extension methods to add instrumentation support for many common instrumentation packages.
@@ -13,7 +12,7 @@ public static class TracerProviderBuilderExtensions
         /// </summary>
         /// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
         /// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
-        public static TracerProviderBuilder AddAllInstrumentation(this TracerProviderBuilder builder)
+        public static TracerProviderBuilder AddAutoInstrumentations(this TracerProviderBuilder builder)
         {
             return
                 builder

diff --git a/src/Honeycomb.OpenTelemetry/MeterProviderBuilderExtensions.cs b/src/Honeycomb.OpenTelemetry/MeterProviderBuilderExtensions.cs
@@ -1,8 +1,8 @@
-using OpenTelemetry.Metrics;
+using Honeycomb.OpenTelemetry;
 using OpenTelemetry.Resources;
 using System;
 
-namespace Honeycomb.OpenTelemetry
+namespace OpenTelemetry.Metrics
 {
     /// <summary>
     /// Extension methods to configure <see cref="MeterProviderBuilder"/> to send metrics telemetry data to Honeycomb.

diff --git a/src/Honeycomb.OpenTelemetry/ResourceBuilderExtensions.cs b/src/Honeycomb.OpenTelemetry/ResourceBuilderExtensions.cs
@@ -1,10 +1,9 @@
-using OpenTelemetry.Resources;
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Honeycomb.OpenTelemetry
+namespace OpenTelemetry.Resources
 {
     /// <summary>
     /// Extension methods to configure <see cref="ResourceBuilder"/> with Honeycomb distro attributes.
@@ -111,7 +110,7 @@ private static ResourceBuilder AddOSResource(this ResourceBuilder builder)
 
         private static string GetFileVersion()
         {
-            var version = typeof(ResourceBuilderExtensions)
+            var version = typeof(Honeycomb.OpenTelemetry.HoneycombOptions)
                 .Assembly
                 .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
                 .InformationalVersion;
@@ -120,7 +119,7 @@ private static string GetFileVersion()
             // the form `{version_prefix}{version_suffix}+{commit_hash}`.
             // We should trim the hash if present to just leave the version prefix and suffix
             var i = version.IndexOf("+");
-            return i > 0 
+            return i > 0
                 ? version.Substring(0, i)
                 : version;
         }

diff --git a/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs b/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
@@ -1,14 +1,13 @@
+using Honeycomb.OpenTelemetry;
 using Microsoft.Extensions.Configuration;
-using OpenTelemetry;
 using OpenTelemetry.Resources;
-using OpenTelemetry.Trace;
 using System;
 
 #if NET462
 using System.Collections.Generic;
 #endif
 
-namespace Honeycomb.OpenTelemetry
+namespace OpenTelemetry.Trace
 {
     /// <summary>
     /// Extension methods to configure <see cref="TracerProviderBuilder"/> to send telemetry data to Honeycomb.