Skip to content

Commit 46cebf0

Browse files
committed
PR feedback - handle SA1118
1 parent a4c18f7 commit 46cebf0

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

src/SourceGenerators/InstrumentationDefinitionsGenerator.cs

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,7 @@ private static string GenerateInstrumentationDefinitionsPartialClass(
132132

133133
var generatedMethodName = integrationKind == IntegrationKindDirect ? "GetDefinitionsArray" : "GetDerivedDefinitionsArray";
134134

135-
#pragma warning disable SA1118 // Parameter should not span multiple lines
136-
var sb = new StringBuilder()
137-
.AppendFormat(
138-
CultureInfo.InvariantCulture,
139-
@"//------------------------------------------------------------------------------
135+
const string headerTemplate = @"//------------------------------------------------------------------------------
140136
// <auto-generated>
141137
// This code was generated by the InstrumentationDefinitionsGenerator tool. To safely
142138
// modify this file, edit InstrumentMethodAttribute on the classes and
@@ -155,11 +151,10 @@ internal static partial class InstrumentationDefinitions
155151
{{
156152
private static NativeCallTargetDefinition[] {0}()
157153
{{
158-
var nativeCallTargetDefinitions = new List<NativeCallTargetDefinition>({1});",
159-
generatedMethodName,
160-
instrumentationCount)
154+
var nativeCallTargetDefinitions = new List<NativeCallTargetDefinition>({1});";
155+
var sb = new StringBuilder()
156+
.AppendFormat(CultureInfo.InvariantCulture, headerTemplate, generatedMethodName, instrumentationCount)
161157
.AppendLine();
162-
#pragma warning restore SA1118 // Parameter should not span multiple lines
163158

164159
const string tracesHeader = @" // Traces
165160
var tracerSettings = Instrumentation.TracerSettings.Value;
@@ -212,14 +207,9 @@ private static void GenerateIntegrations(Dictionary<string, List<(string Integra
212207

213208
sb.Append(" // ");
214209
sb.AppendLine(group.Key);
215-
#pragma warning disable SA1118 // Parameter should not span multiple lines
216-
sb.AppendFormat(
217-
CultureInfo.InvariantCulture,
218-
@" if ({0}.{1}))
219-
{{",
220-
conditionPrefix,
221-
group.Key);
222-
#pragma warning restore SA1118 // Parameter should not span multiple lines
210+
const string ifTemplate = @" if ({0}.{1}))
211+
{{";
212+
sb.AppendFormat(CultureInfo.InvariantCulture, ifTemplate, conditionPrefix, group.Key);
223213
sb.AppendLine();
224214

225215
foreach (var integration in group.Value)

0 commit comments

Comments
 (0)