Skip to content

Commit 8561882

Browse files
HweinstockHweinstock
committed
Merge branch 'hkobew/processTracking' of github.com:Hweinstock/aws-toolkit-common into hkobew/processTracking
2 parents 46033b7 + d0e0017 commit 8561882

File tree

45 files changed

+3088
-808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3088
-808
lines changed

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/AwsToolkit.Telemetry.Events.Generator.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
14-
<PackageReference Include="System.CodeDom" Version="8.0.0" />
14+
<PackageReference Include="System.CodeDom" Version="9.0.1" />
1515
</ItemGroup>
1616

1717
</Project>

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Core/DefinitionsBuilder.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class DefinitionsBuilder
2626
private static readonly string[] ImplicitFields =
2727
{
2828
"reason",
29+
"reasonDesc",
2930
"errorCode",
3031
"causedBy",
3132
"httpStatusCode",
@@ -434,6 +435,11 @@ private CodeMemberMethod CreateRecordMetricMethodByDataClass(Metric metric)
434435
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,
435436
new CodePrimitiveExpression("reason"), payloadReason)));
436437

438+
// Generate: datum.AddMetadata("reasonDesc", payload.ReasonDescription);
439+
var payloadReasonDescription = new CodeFieldReferenceExpression(payload, "ReasonDescription");
440+
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,
441+
new CodePrimitiveExpression("reasonDesc"), payloadReasonDescription)));
442+
437443
// Generate: datum.AddMetadata("errorCode", payload.ErrorCode);
438444
var payloadErrorCode = new CodeFieldReferenceExpression(payload, "ErrorCode");
439445
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="FluentAssertions" Version="6.12.1" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
16-
<PackageReference Include="xunit" Version="2.9.2" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
14+
<PackageReference Include="FluentAssertions" Version="7.0.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageReference Include="xunit" Version="2.9.3" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Outcomes/sampleDefinitions-generated.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ namespace Test
5757
datum.AddMetadata("awsAccount", payload.AwsAccount);
5858
datum.AddMetadata("awsRegion", payload.AwsRegion);
5959
datum.AddMetadata("reason", payload.Reason);
60+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
6061
datum.AddMetadata("errorCode", payload.ErrorCode);
6162
datum.AddMetadata("causedBy", payload.CausedBy);
6263
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -116,6 +117,7 @@ namespace Test
116117
datum.AddMetadata("awsAccount", payload.AwsAccount);
117118
datum.AddMetadata("awsRegion", payload.AwsRegion);
118119
datum.AddMetadata("reason", payload.Reason);
120+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
119121
datum.AddMetadata("errorCode", payload.ErrorCode);
120122
datum.AddMetadata("causedBy", payload.CausedBy);
121123
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -175,6 +177,7 @@ namespace Test
175177
datum.AddMetadata("awsAccount", payload.AwsAccount);
176178
datum.AddMetadata("awsRegion", payload.AwsRegion);
177179
datum.AddMetadata("reason", payload.Reason);
180+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
178181
datum.AddMetadata("errorCode", payload.ErrorCode);
179182
datum.AddMetadata("causedBy", payload.CausedBy);
180183
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -242,6 +245,7 @@ namespace Test
242245
datum.AddMetadata("awsAccount", payload.AwsAccount);
243246
datum.AddMetadata("awsRegion", payload.AwsRegion);
244247
datum.AddMetadata("reason", payload.Reason);
248+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
245249
datum.AddMetadata("errorCode", payload.ErrorCode);
246250
datum.AddMetadata("causedBy", payload.CausedBy);
247251
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -309,6 +313,7 @@ namespace Test
309313
datum.AddMetadata("awsAccount", payload.AwsAccount);
310314
datum.AddMetadata("awsRegion", payload.AwsRegion);
311315
datum.AddMetadata("reason", payload.Reason);
316+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
312317
datum.AddMetadata("errorCode", payload.ErrorCode);
313318
datum.AddMetadata("causedBy", payload.CausedBy);
314319
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -385,6 +390,7 @@ namespace Test
385390
datum.AddMetadata("awsAccount", payload.AwsAccount);
386391
datum.AddMetadata("awsRegion", payload.AwsRegion);
387392
datum.AddMetadata("reason", payload.Reason);
393+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
388394
datum.AddMetadata("errorCode", payload.ErrorCode);
389395
datum.AddMetadata("causedBy", payload.CausedBy);
390396
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -444,6 +450,7 @@ namespace Test
444450
datum.AddMetadata("awsAccount", payload.AwsAccount);
445451
datum.AddMetadata("awsRegion", payload.AwsRegion);
446452
datum.AddMetadata("reason", payload.Reason);
453+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
447454
datum.AddMetadata("errorCode", payload.ErrorCode);
448455
datum.AddMetadata("causedBy", payload.CausedBy);
449456
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/SampleData/Outcomes/sampleDefinitions-supplemental.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ namespace Test
5757
datum.AddMetadata("awsAccount", payload.AwsAccount);
5858
datum.AddMetadata("awsRegion", payload.AwsRegion);
5959
datum.AddMetadata("reason", payload.Reason);
60+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
6061
datum.AddMetadata("errorCode", payload.ErrorCode);
6162
datum.AddMetadata("causedBy", payload.CausedBy);
6263
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -116,6 +117,7 @@ namespace Test
116117
datum.AddMetadata("awsAccount", payload.AwsAccount);
117118
datum.AddMetadata("awsRegion", payload.AwsRegion);
118119
datum.AddMetadata("reason", payload.Reason);
120+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
119121
datum.AddMetadata("errorCode", payload.ErrorCode);
120122
datum.AddMetadata("causedBy", payload.CausedBy);
121123
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -175,6 +177,7 @@ namespace Test
175177
datum.AddMetadata("awsAccount", payload.AwsAccount);
176178
datum.AddMetadata("awsRegion", payload.AwsRegion);
177179
datum.AddMetadata("reason", payload.Reason);
180+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
178181
datum.AddMetadata("errorCode", payload.ErrorCode);
179182
datum.AddMetadata("causedBy", payload.CausedBy);
180183
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -242,6 +245,7 @@ namespace Test
242245
datum.AddMetadata("awsAccount", payload.AwsAccount);
243246
datum.AddMetadata("awsRegion", payload.AwsRegion);
244247
datum.AddMetadata("reason", payload.Reason);
248+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
245249
datum.AddMetadata("errorCode", payload.ErrorCode);
246250
datum.AddMetadata("causedBy", payload.CausedBy);
247251
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -309,6 +313,7 @@ namespace Test
309313
datum.AddMetadata("awsAccount", payload.AwsAccount);
310314
datum.AddMetadata("awsRegion", payload.AwsRegion);
311315
datum.AddMetadata("reason", payload.Reason);
316+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
312317
datum.AddMetadata("errorCode", payload.ErrorCode);
313318
datum.AddMetadata("causedBy", payload.CausedBy);
314319
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -385,6 +390,7 @@ namespace Test
385390
datum.AddMetadata("awsAccount", payload.AwsAccount);
386391
datum.AddMetadata("awsRegion", payload.AwsRegion);
387392
datum.AddMetadata("reason", payload.Reason);
393+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
388394
datum.AddMetadata("errorCode", payload.ErrorCode);
389395
datum.AddMetadata("causedBy", payload.CausedBy);
390396
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
@@ -444,6 +450,7 @@ namespace Test
444450
datum.AddMetadata("awsAccount", payload.AwsAccount);
445451
datum.AddMetadata("awsRegion", payload.AwsRegion);
446452
datum.AddMetadata("reason", payload.Reason);
453+
datum.AddMetadata("reasonDesc", payload.ReasonDescription);
447454
datum.AddMetadata("errorCode", payload.ErrorCode);
448455
datum.AddMetadata("causedBy", payload.CausedBy);
449456
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<Reference Include="System.Core" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="FluentAssertions" Version="6.12.1" />
14+
<PackageReference Include="FluentAssertions" Version="7.0.0" />
1515
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="xunit" Version="2.9.2" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
16+
<PackageReference Include="xunit" Version="2.9.3" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

0 commit comments

Comments
 (0)