From 7f6532d7f262547f0b878614eae3ca5d2b8077cf Mon Sep 17 00:00:00 2001 From: lspangler Date: Thu, 9 Apr 2020 18:30:03 -0700 Subject: [PATCH 1/2] Update trace_context.json Updates comment on "w3c_and_newrelic_headers_present_error_parsing_traceparent". On same test, changes newrelic `ac` field to match the `trusted_account_key` to avoid a failure for the wrong reason (newrelic header not trusted). --- distributed_tracing/trace_context.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distributed_tracing/trace_context.json b/distributed_tracing/trace_context.json index bff7d40d30..9744e051b2 100644 --- a/distributed_tracing/trace_context.json +++ b/distributed_tracing/trace_context.json @@ -1685,8 +1685,8 @@ "test_name": "w3c_and_newrelic_headers_present_error_parsing_traceparent", "comment": [ "If the traceparent header is present on an inbound request, conforming agents MUST", - "use this header to continue the trace. The newrelic header MUST be used _only_ when", - "traceparent is _missing_." + "ignore any newrelic header. If the traceparent header is invalid, a new trace MUST" + "be started. The newrelic header MUST be used _only_ when traceparent is _missing_." ], "trusted_account_key": "33", "account_id": "33", @@ -1700,7 +1700,7 @@ { "traceparent": "garbage", "tracestate": "33@nr=0-0-33-2827902-7d3efb1b173fecfa-e8b91a159289ff74-1-1.23456-1518469636035", - "newrelic": "{\"v\":[0,1],\"d\":{\"ty\":\"Mobile\",\"ac\":\"123\",\"ap\":\"51424\",\"id\":\"5f474d64b9cc9b2a\",\"tr\":\"6e2fea0b173fdad0\",\"pr\":0.1234,\"sa\":true,\"ti\":1482959525577,\"tx\":\"27856f70d3d314b7\"}}" + "newrelic": "{\"v\":[0,1],\"d\":{\"ty\":\"Mobile\",\"ac\":\"33\",\"ap\":\"51424\",\"id\":\"5f474d64b9cc9b2a\",\"tr\":\"6e2fea0b173fdad0\",\"pr\":0.1234,\"sa\":true,\"ti\":1482959525577,\"tx\":\"27856f70d3d314b7\"}}" } ], "outbound_payloads": [ From a2834a500f889bb1b6385fa18520e2f4893ad3f1 Mon Sep 17 00:00:00 2001 From: lspangler Date: Mon, 20 Apr 2020 07:59:28 -0700 Subject: [PATCH 2/2] add comment comma --- distributed_tracing/trace_context.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed_tracing/trace_context.json b/distributed_tracing/trace_context.json index 9744e051b2..d41b785837 100644 --- a/distributed_tracing/trace_context.json +++ b/distributed_tracing/trace_context.json @@ -1685,7 +1685,7 @@ "test_name": "w3c_and_newrelic_headers_present_error_parsing_traceparent", "comment": [ "If the traceparent header is present on an inbound request, conforming agents MUST", - "ignore any newrelic header. If the traceparent header is invalid, a new trace MUST" + "ignore any newrelic header. If the traceparent header is invalid, a new trace MUST", "be started. The newrelic header MUST be used _only_ when traceparent is _missing_." ], "trusted_account_key": "33",