Fix missing resource attributes

Author: stevejgordon

src/Elastic.OpenTelemetry.AutoInstrumentation/AutoInstrumentationPlugin.cs

@@ -44,8 +44,8 @@ public TracerProviderBuilder BeforeConfigureTracerProvider(TracerProviderBuilder
 
 			builder.ConfigureServices(sc => sc.Configure<OtlpExporterOptions>(OtlpExporterDefaults.OtlpExporterOptions));
 
-			CoreTracerProvderBuilderExtensions.AddActivitySourceWithLogging(builder, logger, "Elastic.Transport", "<n/a>");
-			CoreTracerProvderBuilderExtensions.AddElasticProcessorsCore(builder, null, _components, null);
+			TracerProvderBuilderExtensions.AddActivitySourceWithLogging(builder, logger, "Elastic.Transport", "<n/a>");
+			TracerProvderBuilderExtensions.AddElasticProcessorsCore(builder, null, _components, null);
 
 			logger.LogConfiguredSignalProvider("Traces", nameof(TracerProviderBuilder), "<n/a>");
 

src/Elastic.OpenTelemetry.Core/Extensions/ResourceBuilderExtensions.cs

@@ -33,8 +33,8 @@ internal static ResourceBuilder WithElasticDefaultsCore(
 		Action<ResourceBuilder, BuilderState>? configure) =>
 			WithElasticDefaultsCore(builder, builderState.Components, services, configure);
 
-	internal static ResourceBuilder WithElasticDefaultsCore
-		(this ResourceBuilder builder,
+	internal static ResourceBuilder WithElasticDefaultsCore(
+		this ResourceBuilder builder,
 		ElasticOpenTelemetryComponents components,
 		IServiceCollection? services,
 		Action<ResourceBuilder, BuilderState>? configure)

src/Elastic.OpenTelemetry.Core/Extensions/TracerProvderBuilderExtensions.cs

@@ -21,7 +21,7 @@ namespace OpenTelemetry.Trace;
 /// Provides extension methods on the <see cref="TracerProviderBuilder"/> used to register
 /// the Elastic Distribution of OpenTelemetry (EDOT) .NET defaults.
 /// </summary>
-public static class CoreTracerProvderBuilderExtensions
+internal static class TracerProvderBuilderExtensions
 {
 	private static int AddElasticProcessorsCallCount;
 

src/Elastic.OpenTelemetry.Core/SignalBuilder.cs

@@ -143,12 +143,11 @@ public static T WithElasticDefaults<T>(
 				components = ElasticOpenTelemetry.Bootstrap(options, services);
 				builderState = new BuilderState(components, instanceId);
 
-				components.Logger.LogStoringBuilderState(providerBuilderName, instanceId);
+				configure(builder, builderState, services);
 
+				components.Logger.LogStoringBuilderState(providerBuilderName, instanceId);
 				BuilderStateTable.Add(builder, builderState);
 			}
-
-			configure(builder, builderState, services);
 		}
 		catch (Exception ex)
 		{

src/Elastic.OpenTelemetry/Extensions/ResourceBuilderExtensions.cs

@@ -7,6 +7,7 @@
 using Elastic.OpenTelemetry.Diagnostics;
 using Elastic.OpenTelemetry.Instrumentation;
 using Microsoft.Extensions.DependencyInjection;
+using Elastic.OpenTelemetry.Resources;
 
 #if NET
 using System.Runtime.CompilerServices;
@@ -38,7 +39,7 @@ internal static ResourceBuilder WithElasticDefaults(this ResourceBuilder builder
 
 		components.Logger.LogWithElasticDefaultsCallCount(callCount, nameof(ResourceBuilder));
 
-		return SignalBuilder.WithElasticDefaults(builder, components.Options, components, services, (b, bs, _) => ConfigureBuilder(b, bs));
+		return builder.WithElasticDefaultsCore(components, services, ConfigureBuilder);
 	}
 
 	[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026", Justification = "The call to `AssemblyScanning.AddInstrumentationViaReflection` " +

src/Elastic.OpenTelemetry/Extensions/TracerProviderBuilderExtensions.cs

@@ -164,14 +164,14 @@ private static void ConfigureBuilder(TracerProviderBuilder builder, BuilderState
 		}
 		else
 		{
-			CoreTracerProvderBuilderExtensions.AddActivitySourceWithLogging(builder, logger, "System.Net.Http", builderState.InstanceIdentifier);
+			TracerProvderBuilderExtensions.AddActivitySourceWithLogging(builder, logger, "System.Net.Http", builderState.InstanceIdentifier);
 		}
 #else
 		AddWithLogging(builder, logger, "HTTP", b => b.AddHttpClientInstrumentation(), builderState.InstanceIdentifier);
 #endif
 
 		AddWithLogging(builder, logger, "GrpcClient", b => b.AddGrpcClientInstrumentation(), builderState.InstanceIdentifier);
-		CoreTracerProvderBuilderExtensions.AddActivitySourceWithLogging(builder, logger, "Elastic.Transport", builderState.InstanceIdentifier);
+		TracerProvderBuilderExtensions.AddActivitySourceWithLogging(builder, logger, "Elastic.Transport", builderState.InstanceIdentifier);
 
 		// NOTE: Despite them having no dependencies. We cannot add the OpenTelemetry.Instrumentation.ElasticsearchClient or
 		// OpenTelemetry.Instrumentation.EntityFrameworkCore instrumentations here, as including the package references causes
@@ -186,7 +186,7 @@ private static void ConfigureBuilder(TracerProviderBuilder builder, BuilderState
 			SignalBuilder.AddInstrumentationViaReflection(builder, components, ContribTraceInstrumentation.GetReflectionInstrumentationAssemblies(), builderState.InstanceIdentifier);
 		}
 
-		CoreTracerProvderBuilderExtensions.AddElasticProcessorsCore(builder, builderState, null, services);
+		TracerProvderBuilderExtensions.AddElasticProcessorsCore(builder, builderState, null, services);
 
 		if (components.Options.SkipOtlpExporter)
 		{