Skip to content

Commit 7de2e9e

Browse files
hmstepanekhmstepanek
committed
Remove proxy logic
1 parent bd233c4 commit 7de2e9e

File tree

1 file changed

+102
-102
lines changed

1 file changed

+102
-102
lines changed

‎newrelic/core/samplers/sampler_proxy.py‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -28,108 +28,108 @@ def __init__(self, settings):
2828
adaptive_sampler = AdaptiveSampler(settings.sampling_target, sampling_target_period)
2929
self._samplers = {"global": adaptive_sampler}
3030

31-
full_gran_root_ratio = None
32-
full_gran_parent_sampled_ratio = None
33-
full_gran_parent_not_sampled_ratio = None
34-
# Add sampler instances for each config section if configured.
35-
if settings.distributed_tracing.sampler.full_granularity.enabled:
36-
# If the ratio is not defined fallback to adaptive sampler.
37-
if (
38-
settings.distributed_tracing.sampler._root == "trace_id_ratio_based"
39-
and settings.distributed_tracing.sampler.root.trace_id_ratio_based.ratio
40-
):
41-
full_gran_root_ratio = settings.distributed_tracing.sampler.root.trace_id_ratio_based.ratio
42-
self.add_trace_id_ratio_based_sampler((True, 0), full_gran_root_ratio)
43-
else:
44-
self.add_adaptive_sampler(
45-
(True, 0),
46-
settings.distributed_tracing.sampler.root.adaptive.sampling_target,
47-
sampling_target_period,
48-
)
49-
# If the ratio is not defined fallback to adaptive sampler.
50-
if (
51-
settings.distributed_tracing.sampler._remote_parent_sampled == "trace_id_ratio_based"
52-
and settings.distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio
53-
):
54-
full_gran_parent_sampled_ratio = (
55-
settings.distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio
56-
)
57-
self.add_trace_id_ratio_based_sampler((True, 1), full_gran_parent_sampled_ratio)
58-
else:
59-
self.add_adaptive_sampler(
60-
(True, 1),
61-
settings.distributed_tracing.sampler.remote_parent_sampled.adaptive.sampling_target,
62-
sampling_target_period,
63-
)
64-
# If the ratio is not defined fallback to adaptive sampler.
65-
if (
66-
settings.distributed_tracing.sampler._remote_parent_not_sampled == "trace_id_ratio_based"
67-
and settings.distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio
68-
):
69-
full_gran_parent_not_sampled_ratio = (
70-
settings.distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio
71-
)
72-
self.add_trace_id_ratio_based_sampler((True, 2), full_gran_parent_not_sampled_ratio)
73-
else:
74-
self.add_adaptive_sampler(
75-
(True, 2),
76-
settings.distributed_tracing.sampler.remote_parent_not_sampled.adaptive.sampling_target,
77-
sampling_target_period,
78-
)
79-
if settings.distributed_tracing.sampler.partial_granularity.enabled:
80-
# If the ratio is not defined fallback to adaptive sampler.
81-
if (
82-
settings.distributed_tracing.sampler.partial_granularity._root == "trace_id_ratio_based"
83-
and settings.distributed_tracing.sampler.partial_granularity.root.trace_id_ratio_based.ratio
84-
):
85-
# If both full and partial are set to use the trace id ratio based sampler,
86-
# set partial granularity ratio = full ratio + partial ratio.
87-
ratio = settings.distributed_tracing.sampler.partial_granularity.root.trace_id_ratio_based.ratio
88-
if full_gran_root_ratio:
89-
ratio = min(ratio + full_gran_root_ratio, 1)
90-
self.add_trace_id_ratio_based_sampler((False, 0), ratio)
91-
else:
92-
self.add_adaptive_sampler(
93-
(False, 0),
94-
settings.distributed_tracing.sampler.partial_granularity.root.adaptive.sampling_target,
95-
sampling_target_period,
96-
)
97-
# If the ratio is not defined fallback to adaptive sampler.
98-
if (
99-
settings.distributed_tracing.sampler.partial_granularity._remote_parent_sampled
100-
== "trace_id_ratio_based"
101-
and settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.trace_id_ratio_based.ratio
102-
):
103-
# If both full and partial are set to use the trace id ratio based sampler,
104-
# set partial granularity ratio = full ratio + partial ratio.
105-
ratio = settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.trace_id_ratio_based.ratio
106-
if full_gran_parent_sampled_ratio:
107-
ratio = min(ratio + full_gran_parent_sampled_ratio, 1)
108-
self.add_trace_id_ratio_based_sampler((False, 1), ratio)
109-
else:
110-
self.add_adaptive_sampler(
111-
(False, 1),
112-
settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.adaptive.sampling_target,
113-
sampling_target_period,
114-
)
115-
# If the ratio is not defined fallback to adaptive sampler.
116-
if (
117-
settings.distributed_tracing.sampler.partial_granularity._remote_parent_not_sampled
118-
== "trace_id_ratio_based"
119-
and settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.trace_id_ratio_based.ratio
120-
):
121-
# If both full and partial are set to use the trace id ratio based sampler,
122-
# set partial granularity ratio = full ratio + partial ratio.
123-
ratio = settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.trace_id_ratio_based.ratio
124-
if full_gran_parent_not_sampled_ratio:
125-
ratio = min(ratio + full_gran_parent_not_sampled_ratio, 1)
126-
self.add_trace_id_ratio_based_sampler((False, 2), ratio)
127-
else:
128-
self.add_adaptive_sampler(
129-
(False, 2),
130-
settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.adaptive.sampling_target,
131-
sampling_target_period,
132-
)
31+
#full_gran_root_ratio = None
32+
#full_gran_parent_sampled_ratio = None
33+
#full_gran_parent_not_sampled_ratio = None
34+
## Add sampler instances for each config section if configured.
35+
#if settings.distributed_tracing.sampler.full_granularity.enabled:
36+
# # If the ratio is not defined fallback to adaptive sampler.
37+
# if (
38+
# settings.distributed_tracing.sampler._root == "trace_id_ratio_based"
39+
# and settings.distributed_tracing.sampler.root.trace_id_ratio_based.ratio
40+
# ):
41+
# full_gran_root_ratio = settings.distributed_tracing.sampler.root.trace_id_ratio_based.ratio
42+
# self.add_trace_id_ratio_based_sampler((True, 0), full_gran_root_ratio)
43+
# else:
44+
# self.add_adaptive_sampler(
45+
# (True, 0),
46+
# settings.distributed_tracing.sampler.root.adaptive.sampling_target,
47+
# sampling_target_period,
48+
# )
49+
# # If the ratio is not defined fallback to adaptive sampler.
50+
# if (
51+
# settings.distributed_tracing.sampler._remote_parent_sampled == "trace_id_ratio_based"
52+
# and settings.distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio
53+
# ):
54+
# full_gran_parent_sampled_ratio = (
55+
# settings.distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio
56+
# )
57+
# self.add_trace_id_ratio_based_sampler((True, 1), full_gran_parent_sampled_ratio)
58+
# else:
59+
# self.add_adaptive_sampler(
60+
# (True, 1),
61+
# settings.distributed_tracing.sampler.remote_parent_sampled.adaptive.sampling_target,
62+
# sampling_target_period,
63+
# )
64+
# # If the ratio is not defined fallback to adaptive sampler.
65+
# if (
66+
# settings.distributed_tracing.sampler._remote_parent_not_sampled == "trace_id_ratio_based"
67+
# and settings.distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio
68+
# ):
69+
# full_gran_parent_not_sampled_ratio = (
70+
# settings.distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio
71+
# )
72+
# self.add_trace_id_ratio_based_sampler((True, 2), full_gran_parent_not_sampled_ratio)
73+
# else:
74+
# self.add_adaptive_sampler(
75+
# (True, 2),
76+
# settings.distributed_tracing.sampler.remote_parent_not_sampled.adaptive.sampling_target,
77+
# sampling_target_period,
78+
# )
79+
#if settings.distributed_tracing.sampler.partial_granularity.enabled:
80+
# # If the ratio is not defined fallback to adaptive sampler.
81+
# if (
82+
# settings.distributed_tracing.sampler.partial_granularity._root == "trace_id_ratio_based"
83+
# and settings.distributed_tracing.sampler.partial_granularity.root.trace_id_ratio_based.ratio
84+
# ):
85+
# # If both full and partial are set to use the trace id ratio based sampler,
86+
# # set partial granularity ratio = full ratio + partial ratio.
87+
# ratio = settings.distributed_tracing.sampler.partial_granularity.root.trace_id_ratio_based.ratio
88+
# if full_gran_root_ratio:
89+
# ratio = min(ratio + full_gran_root_ratio, 1)
90+
# self.add_trace_id_ratio_based_sampler((False, 0), ratio)
91+
# else:
92+
# self.add_adaptive_sampler(
93+
# (False, 0),
94+
# settings.distributed_tracing.sampler.partial_granularity.root.adaptive.sampling_target,
95+
# sampling_target_period,
96+
# )
97+
# # If the ratio is not defined fallback to adaptive sampler.
98+
# if (
99+
# settings.distributed_tracing.sampler.partial_granularity._remote_parent_sampled
100+
# == "trace_id_ratio_based"
101+
# and settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.trace_id_ratio_based.ratio
102+
# ):
103+
# # If both full and partial are set to use the trace id ratio based sampler,
104+
# # set partial granularity ratio = full ratio + partial ratio.
105+
# ratio = settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.trace_id_ratio_based.ratio
106+
# if full_gran_parent_sampled_ratio:
107+
# ratio = min(ratio + full_gran_parent_sampled_ratio, 1)
108+
# self.add_trace_id_ratio_based_sampler((False, 1), ratio)
109+
# else:
110+
# self.add_adaptive_sampler(
111+
# (False, 1),
112+
# settings.distributed_tracing.sampler.partial_granularity.remote_parent_sampled.adaptive.sampling_target,
113+
# sampling_target_period,
114+
# )
115+
# # If the ratio is not defined fallback to adaptive sampler.
116+
# if (
117+
# settings.distributed_tracing.sampler.partial_granularity._remote_parent_not_sampled
118+
# == "trace_id_ratio_based"
119+
# and settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.trace_id_ratio_based.ratio
120+
# ):
121+
# # If both full and partial are set to use the trace id ratio based sampler,
122+
# # set partial granularity ratio = full ratio + partial ratio.
123+
# ratio = settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.trace_id_ratio_based.ratio
124+
# if full_gran_parent_not_sampled_ratio:
125+
# ratio = min(ratio + full_gran_parent_not_sampled_ratio, 1)
126+
# self.add_trace_id_ratio_based_sampler((False, 2), ratio)
127+
# else:
128+
# self.add_adaptive_sampler(
129+
# (False, 2),
130+
# settings.distributed_tracing.sampler.partial_granularity.remote_parent_not_sampled.adaptive.sampling_target,
131+
# sampling_target_period,
132+
# )
133133

134134
def add_trace_id_ratio_based_sampler(self, key, ratio):
135135
"""

0 commit comments

Comments
 (0)