@@ -419,21 +419,31 @@ def _test_inbound_dt_payload_acceptance():
419419
420420
421421@pytest .mark .parametrize (
422- "sampled ,remote_parent_sampled,remote_parent_not_sampled,expected_sampled,expected_priority,expected_adaptive_sampling_algo_called" ,
422+ "traceparent_sampled,newrelic_sampled ,remote_parent_sampled,remote_parent_not_sampled,expected_sampled,expected_priority,expected_adaptive_sampling_algo_called" ,
423423 (
424- (True , "default" , "default" , None , None , True ), # Uses sampling algo.
425- (True , "always_on" , "default" , True , 2 , False ), # Always sampled.
426- (True , "always_off" , "default" , False , 0 , False ), # Never sampled.
427- (False , "default" , "default" , None , None , True ), # Uses sampling algo.
428- (False , "always_on" , "default" , None , None , True ), # Uses sampling alog.
429- (False , "always_off" , "default" , None , None , True ), # Uses sampling algo.
430- (True , "default" , "always_on" , None , None , True ), # Uses sampling algo.
431- (True , "default" , "always_off" , None , None , True ), # Uses sampling algo.
432- (False , "default" , "always_on" , True , 2 , False ), # Always sampled.
433- (False , "default" , "always_off" , False , 0 , False ), # Never sampled.
424+ (True , None , "default" , "default" , None , None , True ), # Uses sampling algo.
425+ (True , None , "always_on" , "default" , True , 2 , False ), # Always sampled.
426+ (True , None , "always_off" , "default" , False , 0 , False ), # Never sampled.
427+ (False , None , "default" , "default" , None , None , True ), # Uses sampling algo.
428+ (False , None , "always_on" , "default" , None , None , True ), # Uses sampling alog.
429+ (False , None , "always_off" , "default" , None , None , True ), # Uses sampling algo.
430+ (True , None , "default" , "always_on" , None , None , True ), # Uses sampling algo.
431+ (True , None , "default" , "always_off" , None , None , True ), # Uses sampling algo.
432+ (False , None , "default" , "always_on" , True , 2 , False ), # Always sampled.
433+ (False , None , "default" , "always_off" , False , 0 , False ), # Never sampled.
434+ (None , True , "default" , "default" , None , None , True ), # Uses sampling algo.
435+ (None , True , "always_on" , "default" , True , 2 , False ), # Always sampled.
436+ (None , True , "always_off" , "default" , False , 0 , False ), # Never sampled.
437+ (None , False , "default" , "default" , None , None , True ), # Uses sampling algo.
438+ (None , False , "always_on" , "default" , None , None , True ), # Uses sampling alog.
439+ (None , False , "always_off" , "default" , None , None , True ), # Uses sampling algo.
440+ (None , True , "default" , "always_on" , None , None , True ), # Uses sampling algo.
441+ (None , True , "default" , "always_off" , None , None , True ), # Uses sampling algo.
442+ (None , False , "default" , "always_on" , True , 2 , False ), # Always sampled.
443+ (None , False , "default" , "always_off" , False , 0 , False ), # Never sampled.
434444 ),
435445)
436- def test_distributed_trace_w3cparent_sampling_decision (
446+ def test_distributed_trace_remote_parent_sampling_decision (
437447 sampled ,
438448 remote_parent_sampled ,
439449 remote_parent_not_sampled ,
@@ -471,10 +481,16 @@ def test_distributed_trace_w3cparent_sampling_decision(
471481 def _test ():
472482 txn = current_transaction ()
473483
474- headers = {
475- "traceparent" : f"00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-{ int (sampled ):02x} " ,
476- "tracestate" : "rojo=f06a0ba902b7,congo=t61rcWkgMzE" ,
477- }
484+ if traceparent_sampled is not None :
485+ headers = {
486+ "traceparent" : f"00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-{ int (traceparent_sampled ):02x} " ,
487+ "tracestate" : "33@nr=0-0-33-2827902-7d3efb1b173fecfa-e8b91a159289ff74-1-1.23456-1518469636035"
488+ "newrelic" : "{\" v\" :[0,1],\" d\" :{\" ty\" :\" Mobile\" ,\" ac\" :\" 123\" ,\" ap\" :\" 51424\" ,\" id\" :\" 5f474d64b9cc9b2a\" ,\" tr\" :\" 6e2fea0b173fdad0\" ,\" pr\" :0.1234,\" sa\" :true,\" ti\" :1482959525577,\" tx\" :\" 27856f70d3d314b7\" }}"
489+ }
490+ else :
491+ headers = {
492+ "newrelic" : "{\" v\" :[0,1],\" d\" :{\" ty\" :\" Mobile\" ,\" ac\" :\" 123\" ,\" ap\" :\" 51424\" ,\" id\" :\" 5f474d64b9cc9b2a\" ,\" tr\" :\" 6e2fea0b173fdad0\" ,\" pr\" :0.1234,\" sa\" :%s,\" ti\" :1482959525577,\" tx\" :\" 27856f70d3d314b7\" }}" % (str (newrelic_sampled ).lower ())
493+ }
478494 accept_distributed_trace_headers (headers )
479495
480496 _test ()
0 commit comments