Skip to content

Commit 1a4fc9d

Browse files
jpinkney-awsjpinkney-aws
authored
Merge pull request #854 from aws/jpinkney-aws/traceId
feat(toolkits): Add distributed tracing events
2 parents 24c0bda + 9e48fb7 commit 1a4fc9d

File tree

18 files changed

+1892
-1437
lines changed

18 files changed

+1892
-1437
lines changed

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ public class DefinitionsBuilder
3232
"requestId",
3333
"requestServiceType",
3434
"duration",
35-
"locale"
35+
"locale",
36+
"traceId",
37+
"metricId",
38+
"parentId"
3639
};
3740

3841
private readonly CodeMethodReferenceExpression _invariantCulture =
@@ -454,8 +457,23 @@ private CodeMemberMethod CreateRecordMetricMethodByDataClass(Metric metric)
454457
// Generate: datum.AddMetadata("requestServiceType", payload.RequestServiceType);
455458
var payloadRequestServiceType = new CodeFieldReferenceExpression(payload, "RequestServiceType");
456459
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,
457-
new CodePrimitiveExpression("requestServiceType"), payloadRequestServiceType)));
460+
new CodePrimitiveExpression("requestServiceType"), payloadRequestServiceType)));
458461

462+
// Generate: datum.AddMetadata("traceId", payload.TraceId);
463+
var payloadTraceId = new CodeFieldReferenceExpression(payload, "TraceId");
464+
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,
465+
new CodePrimitiveExpression("traceId"), payloadTraceId)));
466+
467+
// Generate: datum.AddMetadata("metricId", payload.MetricId);
468+
var payloadMetricId = new CodeFieldReferenceExpression(payload, "MetricId");
469+
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,
470+
new CodePrimitiveExpression("metricId"), payloadMetricId)));
471+
472+
// Generate: datum.AddMetadata("parentId", payload.ParentId);
473+
var payloadParentId = new CodeFieldReferenceExpression(payload, "ParentId");
474+
tryStatements.Add(new CodeExpressionStatement(new CodeMethodInvokeExpression(datumAddData,
475+
new CodePrimitiveExpression("parentId"), payloadParentId)));
476+
459477
// Generate:
460478
// if (payload.Duration.HasValue)
461479
// {

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ namespace Test
6262
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
6363
datum.AddMetadata("requestId", payload.RequestId);
6464
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
65+
datum.AddMetadata("traceId", payload.TraceId);
66+
datum.AddMetadata("metricId", payload.MetricId);
67+
datum.AddMetadata("parentId", payload.ParentId);
6568
if (payload.Duration.HasValue)
6669
{
6770
datum.AddMetadata("duration", payload.Duration.Value);
@@ -118,6 +121,9 @@ namespace Test
118121
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
119122
datum.AddMetadata("requestId", payload.RequestId);
120123
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
124+
datum.AddMetadata("traceId", payload.TraceId);
125+
datum.AddMetadata("metricId", payload.MetricId);
126+
datum.AddMetadata("parentId", payload.ParentId);
121127
if (payload.Duration.HasValue)
122128
{
123129
datum.AddMetadata("duration", payload.Duration.Value);
@@ -174,6 +180,9 @@ namespace Test
174180
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
175181
datum.AddMetadata("requestId", payload.RequestId);
176182
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
183+
datum.AddMetadata("traceId", payload.TraceId);
184+
datum.AddMetadata("metricId", payload.MetricId);
185+
datum.AddMetadata("parentId", payload.ParentId);
177186
if (payload.Duration.HasValue)
178187
{
179188
datum.AddMetadata("duration", payload.Duration.Value);
@@ -238,6 +247,9 @@ namespace Test
238247
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
239248
datum.AddMetadata("requestId", payload.RequestId);
240249
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
250+
datum.AddMetadata("traceId", payload.TraceId);
251+
datum.AddMetadata("metricId", payload.MetricId);
252+
datum.AddMetadata("parentId", payload.ParentId);
241253
if (payload.Duration.HasValue)
242254
{
243255
datum.AddMetadata("duration", payload.Duration.Value);
@@ -302,6 +314,9 @@ namespace Test
302314
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
303315
datum.AddMetadata("requestId", payload.RequestId);
304316
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
317+
datum.AddMetadata("traceId", payload.TraceId);
318+
datum.AddMetadata("metricId", payload.MetricId);
319+
datum.AddMetadata("parentId", payload.ParentId);
305320
if (payload.Duration.HasValue)
306321
{
307322
datum.AddMetadata("duration", payload.Duration.Value);
@@ -375,6 +390,9 @@ namespace Test
375390
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
376391
datum.AddMetadata("requestId", payload.RequestId);
377392
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
393+
datum.AddMetadata("traceId", payload.TraceId);
394+
datum.AddMetadata("metricId", payload.MetricId);
395+
datum.AddMetadata("parentId", payload.ParentId);
378396
if (payload.Duration.HasValue)
379397
{
380398
datum.AddMetadata("duration", payload.Duration.Value);
@@ -431,6 +449,9 @@ namespace Test
431449
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
432450
datum.AddMetadata("requestId", payload.RequestId);
433451
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
452+
datum.AddMetadata("traceId", payload.TraceId);
453+
datum.AddMetadata("metricId", payload.MetricId);
454+
datum.AddMetadata("parentId", payload.ParentId);
434455
if (payload.Duration.HasValue)
435456
{
436457
datum.AddMetadata("duration", payload.Duration.Value);

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ namespace Test
6262
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
6363
datum.AddMetadata("requestId", payload.RequestId);
6464
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
65+
datum.AddMetadata("traceId", payload.TraceId);
66+
datum.AddMetadata("metricId", payload.MetricId);
67+
datum.AddMetadata("parentId", payload.ParentId);
6568
if (payload.Duration.HasValue)
6669
{
6770
datum.AddMetadata("duration", payload.Duration.Value);
@@ -118,6 +121,9 @@ namespace Test
118121
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
119122
datum.AddMetadata("requestId", payload.RequestId);
120123
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
124+
datum.AddMetadata("traceId", payload.TraceId);
125+
datum.AddMetadata("metricId", payload.MetricId);
126+
datum.AddMetadata("parentId", payload.ParentId);
121127
if (payload.Duration.HasValue)
122128
{
123129
datum.AddMetadata("duration", payload.Duration.Value);
@@ -174,6 +180,9 @@ namespace Test
174180
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
175181
datum.AddMetadata("requestId", payload.RequestId);
176182
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
183+
datum.AddMetadata("traceId", payload.TraceId);
184+
datum.AddMetadata("metricId", payload.MetricId);
185+
datum.AddMetadata("parentId", payload.ParentId);
177186
if (payload.Duration.HasValue)
178187
{
179188
datum.AddMetadata("duration", payload.Duration.Value);
@@ -238,6 +247,9 @@ namespace Test
238247
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
239248
datum.AddMetadata("requestId", payload.RequestId);
240249
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
250+
datum.AddMetadata("traceId", payload.TraceId);
251+
datum.AddMetadata("metricId", payload.MetricId);
252+
datum.AddMetadata("parentId", payload.ParentId);
241253
if (payload.Duration.HasValue)
242254
{
243255
datum.AddMetadata("duration", payload.Duration.Value);
@@ -302,6 +314,9 @@ namespace Test
302314
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
303315
datum.AddMetadata("requestId", payload.RequestId);
304316
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
317+
datum.AddMetadata("traceId", payload.TraceId);
318+
datum.AddMetadata("metricId", payload.MetricId);
319+
datum.AddMetadata("parentId", payload.ParentId);
305320
if (payload.Duration.HasValue)
306321
{
307322
datum.AddMetadata("duration", payload.Duration.Value);
@@ -375,6 +390,9 @@ namespace Test
375390
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
376391
datum.AddMetadata("requestId", payload.RequestId);
377392
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
393+
datum.AddMetadata("traceId", payload.TraceId);
394+
datum.AddMetadata("metricId", payload.MetricId);
395+
datum.AddMetadata("parentId", payload.ParentId);
378396
if (payload.Duration.HasValue)
379397
{
380398
datum.AddMetadata("duration", payload.Duration.Value);
@@ -431,6 +449,9 @@ namespace Test
431449
datum.AddMetadata("httpStatusCode", payload.HttpStatusCode);
432450
datum.AddMetadata("requestId", payload.RequestId);
433451
datum.AddMetadata("requestServiceType", payload.RequestServiceType);
452+
datum.AddMetadata("traceId", payload.TraceId);
453+
datum.AddMetadata("metricId", payload.MetricId);
454+
datum.AddMetadata("parentId", payload.ParentId);
434455
if (payload.Duration.HasValue)
435456
{
436457
datum.AddMetadata("duration", payload.Duration.Value);

0 commit comments

Comments
 (0)