Skip to content

Commit 8a247db

Browse files
rithikanarayanrithikanarayan
committed
null checks on lambda context
1 parent 85a92b9 commit 8a247db

10 files changed

+154
-58
lines changed

‎tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AWS/Lambda/LambdaCommon.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ internal static Scope SendStartInvocation(ILambdaExtensionRequest requestBuilder
4545
{
4646
var request = requestBuilder.GetStartInvocationRequest();
4747
WriteRequestPayload(request, data);
48-
WriteRequestHeaders(request, context.ClientContext?.Custom);
49-
if (context.AwsRequestId != null)
48+
WriteRequestHeaders(request, context?.ClientContext?.Custom);
49+
if (context?.AwsRequestId != null)
5050
{
51-
request.Headers.Add(LambdaRuntimeAwsRequestIdHeader, context.AwsRequestId);
51+
request.Headers.Add(LambdaRuntimeAwsRequestIdHeader, context?.AwsRequestId);
5252
}
5353

5454
using var response = (HttpWebResponse)request.GetResponse();

‎tracer/test/snapshots/AwsDynamoDbTests.NetCore.SchemaV0.verified.txt‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -62,10 +62,12 @@
6262
http.status_code: 200,
6363
http.url: http://localhost:00000/,
6464
language: dotnet,
65+
peer.service: MyTableName,
6566
runtime-id: Guid_1,
6667
span.kind: client,
6768
tablename: MyTableName,
68-
_dd.base_service: Samples.AWS.DynamoDBv2
69+
_dd.base_service: Samples.AWS.DynamoDBv2,
70+
_dd.peer.service.source: tablename
6971
},
7072
Metrics: {
7173
_dd.top_level: 1.0
@@ -91,10 +93,12 @@
9193
http.status_code: 200,
9294
http.url: http://localhost:00000/,
9395
language: dotnet,
96+
peer.service: MyTableName,
9497
runtime-id: Guid_1,
9598
span.kind: client,
9699
tablename: MyTableName,
97-
_dd.base_service: Samples.AWS.DynamoDBv2
100+
_dd.base_service: Samples.AWS.DynamoDBv2,
101+
_dd.peer.service.source: tablename
98102
},
99103
Metrics: {
100104
_dd.top_level: 1.0
@@ -120,10 +124,12 @@
120124
http.status_code: 200,
121125
http.url: http://localhost:00000/,
122126
language: dotnet,
127+
peer.service: MyTableName,
123128
runtime-id: Guid_1,
124129
span.kind: client,
125130
tablename: MyTableName,
126-
_dd.base_service: Samples.AWS.DynamoDBv2
131+
_dd.base_service: Samples.AWS.DynamoDBv2,
132+
_dd.peer.service.source: tablename
127133
},
128134
Metrics: {
129135
_dd.top_level: 1.0
@@ -159,10 +165,12 @@
159165
http.status_code: 200,
160166
http.url: http://localhost:00000/,
161167
language: dotnet,
168+
peer.service: MyTableName,
162169
runtime-id: Guid_1,
163170
span.kind: client,
164171
tablename: MyTableName,
165-
_dd.base_service: Samples.AWS.DynamoDBv2
172+
_dd.base_service: Samples.AWS.DynamoDBv2,
173+
_dd.peer.service.source: tablename
166174
},
167175
Metrics: {
168176
_dd.top_level: 1.0
@@ -198,10 +206,12 @@
198206
http.status_code: 200,
199207
http.url: http://localhost:00000/,
200208
language: dotnet,
209+
peer.service: MyTableName,
201210
runtime-id: Guid_1,
202211
span.kind: client,
203212
tablename: MyTableName,
204-
_dd.base_service: Samples.AWS.DynamoDBv2
213+
_dd.base_service: Samples.AWS.DynamoDBv2,
214+
_dd.peer.service.source: tablename
205215
},
206216
Metrics: {
207217
_dd.top_level: 1.0
@@ -227,10 +237,12 @@
227237
http.status_code: 200,
228238
http.url: http://localhost:00000/,
229239
language: dotnet,
240+
peer.service: MyTableName,
230241
runtime-id: Guid_1,
231242
span.kind: client,
232243
tablename: MyTableName,
233-
_dd.base_service: Samples.AWS.DynamoDBv2
244+
_dd.base_service: Samples.AWS.DynamoDBv2,
245+
_dd.peer.service.source: tablename
234246
},
235247
Metrics: {
236248
_dd.top_level: 1.0
@@ -256,10 +268,12 @@
256268
http.status_code: 200,
257269
http.url: http://localhost:00000/,
258270
language: dotnet,
271+
peer.service: MyTableName,
259272
runtime-id: Guid_1,
260273
span.kind: client,
261274
tablename: MyTableName,
262-
_dd.base_service: Samples.AWS.DynamoDBv2
275+
_dd.base_service: Samples.AWS.DynamoDBv2,
276+
_dd.peer.service.source: tablename
263277
},
264278
Metrics: {
265279
_dd.top_level: 1.0

‎tracer/test/snapshots/AwsEventBridgeTests.NetCore.SchemaV0.verified.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -62,10 +62,12 @@
6262
http.status_code: 200,
6363
http.url: http://localhost:00000/,
6464
language: dotnet,
65+
peer.service: MyEventBus,
6566
rulename: MyEventBus,
6667
runtime-id: Guid_1,
6768
span.kind: producer,
68-
_dd.base_service: Samples.AWS.EventBridge
69+
_dd.base_service: Samples.AWS.EventBridge,
70+
_dd.peer.service.source: rulename
6971
},
7072
Metrics: {
7173
_dd.top_level: 1.0

‎tracer/test/snapshots/AwsKinesisTests.NetCore.SchemaV0.verified.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -62,10 +62,12 @@
6262
http.status_code: 200,
6363
http.url: http://localhost:00000/,
6464
language: dotnet,
65+
peer.service: MyStreamName,
6566
runtime-id: Guid_1,
6667
span.kind: producer,
6768
streamname: MyStreamName,
68-
_dd.base_service: Samples.AWS.Kinesis
69+
_dd.base_service: Samples.AWS.Kinesis,
70+
_dd.peer.service.source: streamname
6971
},
7072
Metrics: {
7173
_dd.top_level: 1.0
@@ -91,10 +93,12 @@
9193
http.status_code: 200,
9294
http.url: http://localhost:00000/,
9395
language: dotnet,
96+
peer.service: MyStreamName,
9497
runtime-id: Guid_1,
9598
span.kind: producer,
9699
streamname: MyStreamName,
97-
_dd.base_service: Samples.AWS.Kinesis
100+
_dd.base_service: Samples.AWS.Kinesis,
101+
_dd.peer.service.source: streamname
98102
},
99103
Metrics: {
100104
_dd.top_level: 1.0

‎tracer/test/snapshots/AwsSnsTests.NetCore.SchemaV0.pre3.7.3.verified.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -64,10 +64,12 @@
6464
http.status_code: 200,
6565
http.url: http://localhost:00000/,
6666
language: dotnet,
67+
peer.service: MyTopic,
6768
runtime-id: Guid_1,
6869
span.kind: producer,
6970
topicname: MyTopic,
70-
_dd.base_service: Samples.AWS.SimpleNotificationService
71+
_dd.base_service: Samples.AWS.SimpleNotificationService,
72+
_dd.peer.service.source: topicname
7173
},
7274
Metrics: {
7375
_dd.top_level: 1.0
@@ -95,10 +97,12 @@
9597
http.status_code: 200,
9698
http.url: http://localhost:00000/,
9799
language: dotnet,
100+
peer.service: MyTopic,
98101
runtime-id: Guid_1,
99102
span.kind: producer,
100103
topicname: MyTopic,
101-
_dd.base_service: Samples.AWS.SimpleNotificationService
104+
_dd.base_service: Samples.AWS.SimpleNotificationService,
105+
_dd.peer.service.source: topicname
102106
},
103107
Metrics: {
104108
_dd.top_level: 1.0

‎tracer/test/snapshots/AwsSnsTests.NetCore.SchemaV0.verified.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -64,10 +64,12 @@
6464
http.status_code: 200,
6565
http.url: http://localhost:00000/,
6666
language: dotnet,
67+
peer.service: MyTopic,
6768
runtime-id: Guid_1,
6869
span.kind: producer,
6970
topicname: MyTopic,
70-
_dd.base_service: Samples.AWS.SimpleNotificationService
71+
_dd.base_service: Samples.AWS.SimpleNotificationService,
72+
_dd.peer.service.source: topicname
7173
},
7274
Metrics: {
7375
_dd.top_level: 1.0
@@ -95,10 +97,12 @@
9597
http.status_code: 200,
9698
http.url: http://localhost:00000/,
9799
language: dotnet,
100+
peer.service: MyTopic,
98101
runtime-id: Guid_1,
99102
span.kind: producer,
100103
topicname: MyTopic,
101-
_dd.base_service: Samples.AWS.SimpleNotificationService
104+
_dd.base_service: Samples.AWS.SimpleNotificationService,
105+
_dd.peer.service.source: topicname
102106
},
103107
Metrics: {
104108
_dd.top_level: 1.0

0 commit comments

Comments
 (0)