Skip to content

Commit

Permalink
Merge pull request #128 from rklein/transport_type_allowed_for_nrdt
Browse files Browse the repository at this point in the history 
Allow parent.transportType to be added regardless of headers received
  • Loading branch information
Loren Arthur authored and GitHub Enterprise committed Jan 29, 2020
2 parents 68d78b5 + ad99bab commit 6e60201
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
24 changes: 12 additions & 12 deletions distributed_tracing/distributed_tracing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -932,7 +932,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -969,7 +969,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand All @@ -992,7 +992,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1028,7 +1028,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand All @@ -1055,7 +1055,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1091,7 +1091,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1127,7 +1127,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1163,7 +1163,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1199,7 +1199,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1235,7 +1235,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1271,7 +1271,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down
5 changes: 2 additions & 3 deletions distributed_tracing/trace_context.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
"parent.app",
"parent.account",
"parent.transportDuration",
"parent.transportType",
"parentId"]
}
},
Expand Down Expand Up @@ -1114,7 +1113,7 @@
"target_events": ["Transaction"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.transportDuration", "parent.type", "parent.app", "parent.account", "parentId"]
}
},
"expected_metrics": [
Expand Down Expand Up @@ -1548,7 +1547,7 @@
"target_events": ["Transaction", "Span"],
"common":{
"expected": ["guid", "traceId", "priority", "sampled"],
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.type", "parent.app", "parent.account", "parent.transportType", "parentId", "parentSpanId", "parent.transportDuration", "tracingVendors"]
"unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes", "parent.type", "parent.app", "parent.account", "parentId", "parentSpanId", "parent.transportDuration", "tracingVendors"]
},
"Span": {
"expected": ["transactionId"]
Expand Down

0 comments on commit 6e60201

Please sign in to comment.