diff --git a/src/OpenTelemetry.AutoInstrumentation/Generated/net462/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/src/OpenTelemetry.AutoInstrumentation/Generated/net462/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 41c3f768c..d2de51dfa 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Generated/net462/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Generated/net462/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -23,7 +23,7 @@ internal static partial class InstrumentationDefinitions // Traces var tracerSettings = Instrumentation.TracerSettings.Value; if (tracerSettings.TracesEnabled) -{ + { // AspNet if (tracerSettings.EnabledInstrumentations.Contains(TracerInstrumentation.AspNet)) { @@ -57,19 +57,17 @@ internal static partial class InstrumentationDefinitions { nativeCallTargetDefinitions.Add(new("System.ServiceModel", "System.ServiceModel.ServiceHostBase", "InitializeDescription", new[] {"System.Void", "System.ServiceModel.UriSchemeKeyedCollection"}, 4, 0, 0, 4, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.Wcf.Service.ServiceHostIntegration")); } - } // Metrics var metricSettings = Instrumentation.MetricSettings.Value; if (metricSettings.MetricsEnabled) -{ + { // NServiceBus if (metricSettings.EnabledInstrumentations.Contains(MetricInstrumentation.NServiceBus)) { nativeCallTargetDefinitions.Add(new("NServiceBus.Core", "NServiceBus.EndpointConfiguration", ".ctor", new[] {"System.Void", "System.String"}, 8, 0, 0, 8, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.NServiceBus.EndpointConfigurationIntegration")); } - } return nativeCallTargetDefinitions.ToArray(); diff --git a/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs b/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs index 818f02982..9982f018f 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs @@ -23,7 +23,7 @@ internal static partial class InstrumentationDefinitions // Traces var tracerSettings = Instrumentation.TracerSettings.Value; if (tracerSettings.TracesEnabled) -{ + { // MongoDB if (tracerSettings.EnabledInstrumentations.Contains(TracerInstrumentation.MongoDB)) { @@ -53,31 +53,28 @@ internal static partial class InstrumentationDefinitions nativeCallTargetDefinitions.Add(new("StackExchange.Redis", "StackExchange.Redis.ConnectionMultiplexer", "ConnectImplAsync", new[] {"System.Threading.Tasks.Task`1[StackExchange.Redis.ConnectionMultiplexer]", "StackExchange.Redis.ConfigurationOptions", "System.IO.TextWriter"}, 2, 0, 0, 2, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.StackExchangeRedis.StackExchangeRedisIntegrationAsync")); nativeCallTargetDefinitions.Add(new("StackExchange.Redis", "StackExchange.Redis.ConnectionMultiplexer", "ConnectImplAsync", new[] {"System.Threading.Tasks.Task`1[StackExchange.Redis.ConnectionMultiplexer]", "StackExchange.Redis.ConfigurationOptions", "System.IO.TextWriter", "System.Nullable`1[StackExchange.Redis.ServerType]"}, 2, 0, 0, 2, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.StackExchangeRedis.StackExchangeRedisIntegrationAsync")); } - } // Logs var logSettings = Instrumentation.LogSettings.Value; if (logSettings.LogsEnabled) -{ + { // ILogger if (logSettings.EnabledInstrumentations.Contains(LogInstrumentation.ILogger)) { nativeCallTargetDefinitions.Add(new("Microsoft.Extensions.Logging", "Microsoft.Extensions.Logging.LoggingBuilder", ".ctor", new[] {"System.Void", "Microsoft.Extensions.DependencyInjection.IServiceCollection"}, 3, 1, 0, 7, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.Logger.LoggingBuilderIntegration")); } - } // Metrics var metricSettings = Instrumentation.MetricSettings.Value; if (metricSettings.MetricsEnabled) -{ + { // NServiceBus if (metricSettings.EnabledInstrumentations.Contains(MetricInstrumentation.NServiceBus)) { nativeCallTargetDefinitions.Add(new("NServiceBus.Core", "NServiceBus.EndpointConfiguration", ".ctor", new[] {"System.Void", "System.String"}, 8, 0, 0, 8, 65535, 65535, AssemblyFullName, "OpenTelemetry.AutoInstrumentation.Instrumentations.NServiceBus.EndpointConfigurationIntegration")); } - } return nativeCallTargetDefinitions.ToArray(); diff --git a/src/SourceGenerators/InstrumentationDefinitionsGenerator.cs b/src/SourceGenerators/InstrumentationDefinitionsGenerator.cs index bf4dbd152..9eb4b3e75 100644 --- a/src/SourceGenerators/InstrumentationDefinitionsGenerator.cs +++ b/src/SourceGenerators/InstrumentationDefinitionsGenerator.cs @@ -192,7 +192,7 @@ internal static partial class InstrumentationDefinitions if (integrations.Count > 0) { sb.AppendLine(signalHeader) - .AppendLine("{"); + .AppendLine(" {"); GenerateIntegrations(integrations, sb, conditionPrefix); sb.AppendLine(" }") @@ -202,8 +202,18 @@ internal static partial class InstrumentationDefinitions private static void GenerateIntegrations(Dictionary> integrationsByName, StringBuilder sb, string conditionPrefix) { + bool firstLine = true; foreach (var group in integrationsByName) { + if (!firstLine) + { + sb.AppendLine(); + } + else + { + firstLine = false; + } + sb.Append(" // "); sb.AppendLine(group.Key); sb.AppendFormat( @@ -232,7 +242,6 @@ internal static partial class InstrumentationDefinitions } sb.AppendLine(" }"); - sb.AppendLine(); } }