open-telemetry
/
opentelemetry-dotnet-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed 2 nits on the code generated by the SourceGenerator (#2708)

This commit is contained in:
Paulo Janotti 2023-06-28 21:41:30 -07:00 committed by GitHub
parent 6c1736c4be
commit c420a5ce75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenTelemetry.AutoInstrumentation/Generated/net462/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
View File

@ -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();

9
src/OpenTelemetry.AutoInstrumentation/Generated/net6.0/SourceGenerators/SourceGenerators.InstrumentationDefinitionsGenerator/InstrumentationDefinitions.g.cs
View File

@ -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();

13
src/SourceGenerators/InstrumentationDefinitionsGenerator.cs
View File

@ -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<string, List<(string IntegrationType, TargetToGenerate Target)>> 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();
}
}