Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enabled custom sampler configuration via env vars #2972

Merged
merged 27 commits into from
Oct 29, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7d58c22
Enable custom sampler configuration via env vars
jeremydvoss Oct 11, 2022
5b9009b
Merge branch 'main' into jeremyvoss
srikanthccv Oct 12, 2022
b51464e
lint
jeremydvoss Oct 13, 2022
4c16eda
Merge branch 'jeremyvoss' of https://github.com/jeremydvoss/opentelem…
jeremydvoss Oct 13, 2022
3c4a626
Using factory method approach instread
jeremydvoss Oct 13, 2022
6d9f942
lint
jeremydvoss Oct 13, 2022
f42555f
Merge branch 'main' into jeremyvoss
jeremydvoss Oct 13, 2022
49c3400
Resolving comments
jeremydvoss Oct 17, 2022
1cff6d1
Merge branch 'jeremyvoss' of https://github.com/jeremydvoss/opentelem…
jeremydvoss Oct 17, 2022
873f402
resolving comments
jeremydvoss Oct 17, 2022
da7b9f9
Aaron's feedback
jeremydvoss Oct 20, 2022
c091d56
lint
jeremydvoss Oct 24, 2022
34bd68e
renamed vars traces_sampler* for consistency
jeremydvoss Oct 24, 2022
9cffc97
Merge branch 'main' into jeremyvoss
srikanthccv Oct 25, 2022
63250c9
Enable custom sampler configuration via env vars
jeremydvoss Oct 11, 2022
5acf5b9
lint
jeremydvoss Oct 13, 2022
3c1d776
Using factory method approach instread
jeremydvoss Oct 13, 2022
d67ba77
lint
jeremydvoss Oct 13, 2022
fcddc03
Resolving comments
jeremydvoss Oct 17, 2022
e22c4dd
resolving comments
jeremydvoss Oct 17, 2022
0ae3134
Aaron's feedback
jeremydvoss Oct 20, 2022
f927379
lint
jeremydvoss Oct 24, 2022
708f1f9
renamed vars traces_sampler* for consistency
jeremydvoss Oct 24, 2022
b1a0f6e
Merge branch 'jeremyvoss' of https://github.com/jeremydvoss/opentelem…
jeremydvoss Oct 26, 2022
f25a262
Merge branch 'main' into jeremyvoss
jeremydvoss Oct 26, 2022
a313046
retrigger checks
jeremydvoss Oct 26, 2022
f171850
Merge branch 'main' into jeremyvoss
jeremydvoss Oct 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.13.0...HEAD)

- Enabled custom samplers via entry points
([#2972](https://github.com/open-telemetry/opentelemetry-python/pull/2972))
- Update explicit histogram bucket boundaries
([#2947](https://github.com/open-telemetry/opentelemetry-python/pull/2947))
- `exporter-otlp-proto-http`: add user agent string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from os import environ
from typing import Dict, Optional, Sequence, Tuple, Type

from pkg_resources import iter_entry_points
from typing_extensions import Literal

from opentelemetry.environment_variables import (
Expand Down Expand Up @@ -55,6 +54,7 @@
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import BatchSpanProcessor, SpanExporter
from opentelemetry.sdk.trace.id_generator import IdGenerator
from opentelemetry.sdk.util import _import_config_components
from opentelemetry.semconv.resource import ResourceAttributes
from opentelemetry.trace import set_tracer_provider

Expand Down Expand Up @@ -228,26 +228,6 @@ def _init_logging(
logging.getLogger().addHandler(handler)


def _import_config_components(
selected_components, entry_point_name
) -> Sequence[Tuple[str, object]]:
component_entry_points = {
ep.name: ep for ep in iter_entry_points(entry_point_name)
}
component_impls = []
for selected_component in selected_components:
entry_point = component_entry_points.get(selected_component, None)
if not entry_point:
raise RuntimeError(
f"Requested component '{selected_component}' not found in entry points for '{entry_point_name}'"
)

component_impl = entry_point.load()
component_impls.append((selected_component, component_impl))

return component_impls


jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
def _import_exporters(
trace_exporter_names: Sequence[str],
metric_exporter_names: Sequence[str],
Expand Down
82 changes: 80 additions & 2 deletions opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
...

The tracer sampler can also be configured via environment variables ``OTEL_TRACES_SAMPLER`` and ``OTEL_TRACES_SAMPLER_ARG`` (only if applicable).
The list of known values for ``OTEL_TRACES_SAMPLER`` are:
The list of built-in values for ``OTEL_TRACES_SAMPLER`` are:

* always_on - Sampler that always samples spans, regardless of the parent span's sampling decision.
* always_off - Sampler that never samples spans, regardless of the parent span's sampling decision.
Expand All @@ -73,7 +73,34 @@
* parentbased_always_off - Sampler that respects its parent span's sampling decision, but otherwise never samples.
* parentbased_traceidratio - Sampler that respects its parent span's sampling decision, but otherwise samples probabalistically based on rate.

Sampling probability can be set with ``OTEL_TRACES_SAMPLER_ARG`` if the sampler is traceidratio or parentbased_traceidratio, when not provided rate will be set to 1.0 (maximum rate possible).
In order to configure a custom sampler via environment variables, create an entry point for the custom sampler factory method under the entry point group, ``opentelemtry_traces_sampler``. Then, set
aabmass marked this conversation as resolved.
Show resolved Hide resolved
the ``OTEL_TRACES_SAMPLER`` environment variable to the key name of the entry point. The custom sampler factory method must take a single string argument. This input will come from
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
``OTEL_TRACES_SAMPLER_ARG``. If ``OTEL_TRACES_SAMPLER_ARG`` is not configured, the input will be an empty string. For example, set ``OTEL_TRACES_SAMPLER=custom_sampler_name`` and
``OTEL_TRACES_SAMPLER_ARG=0.5`` after creating the following entry point:

.. code:: python

setup(
...
entry_points={
...
"opentelemtry_traces_sampler": [
"custom_sampler_name = path.to.sampler.factory.method:CustomSamplerFactory.get_sampler"
]
}
)
...
class CustomRatioSampler(Sampler):
def __init__(rate):
...
...
class CustomSamplerFactory:
get_sampler(sampler_argument_str):
rate = float(sampler_argument_str)
return CustomSampler(rate)
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved

Sampling probability can be set with ``OTEL_TRACES_SAMPLER_ARG`` if the sampler is a ``TraceIdRatioBased`` Sampler, such as ``traceidratio`` and ``parentbased_traceidratio``. When not provided rate
aabmass marked this conversation as resolved.
Show resolved Hide resolved
will be set to 1.0 (maximum rate possible).


Prev example but with environment variables. Please make sure to set the env ``OTEL_TRACES_SAMPLER=traceidratio`` and ``OTEL_TRACES_SAMPLER_ARG=0.001``.
Expand Down Expand Up @@ -111,6 +138,7 @@
OTEL_TRACES_SAMPLER,
OTEL_TRACES_SAMPLER_ARG,
)
from opentelemetry.sdk.util import _import_config_components
from opentelemetry.trace import Link, SpanKind, get_current_span
from opentelemetry.trace.span import TraceState
from opentelemetry.util.types import Attributes
Expand Down Expand Up @@ -161,6 +189,9 @@ def __init__(
self.trace_state = trace_state


_OTEL_SAMPLER_ENTRY_POINT_GROUP = "opentelemtry_traces_sampler"


class Sampler(abc.ABC):
@abc.abstractmethod
def should_sample(
Expand Down Expand Up @@ -390,8 +421,55 @@ def _get_from_env_or_default() -> Sampler:
return _KNOWN_SAMPLERS[trace_sampler]


def _get_from_env_or_default() -> Sampler:
trace_sampler_name = os.getenv(
OTEL_TRACES_SAMPLER, "parentbased_always_on"
).lower()

if trace_sampler_name in _KNOWN_SAMPLERS:
if trace_sampler_name in ("traceidratio", "parentbased_traceidratio"):
try:
rate = float(os.getenv(OTEL_TRACES_SAMPLER_ARG))
except ValueError:
_logger.warning(
"Could not convert TRACES_SAMPLER_ARG to float."
)
rate = 1.0
return _KNOWN_SAMPLERS[trace_sampler_name](rate)
return _KNOWN_SAMPLERS[trace_sampler_name]
else:
try:
trace_sampler_factory = _import_sampler_factory(trace_sampler_name)
sampler_arg = os.getenv(OTEL_TRACES_SAMPLER_ARG, "")
trace_sampler = trace_sampler_factory(sampler_arg)
_logger.warning("JEREVOSS: trace_sampler: %s" % trace_sampler)
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
if not issubclass(type(trace_sampler), Sampler):
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
message = (
"Output of traces sampler factory, %s, was not a Sampler object."
% trace_sampler_factory
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
srikanthccv marked this conversation as resolved.
Show resolved Hide resolved
)
_logger.warning(message)
raise ValueError(message)
return trace_sampler
except Exception as exc:
_logger.warning(
"Failed to initialize custom sampler, %s: %s",
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
trace_sampler_name,
exc,
)
return _KNOWN_SAMPLERS["parentbased_always_on"]


def _get_parent_trace_state(parent_context) -> Optional["TraceState"]:
parent_span_context = get_current_span(parent_context).get_span_context()
if parent_span_context is None or not parent_span_context.is_valid:
return None
return parent_span_context.trace_state


def _import_sampler_factory(sampler_name: str) -> Sampler:
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
# pylint: disable=unbalanced-tuple-unpacking
[(sampler_name, sampler_impl)] = _import_config_components(
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
[sampler_name.strip()], _OTEL_SAMPLER_ENTRY_POINT_GROUP
)
return sampler_impl
30 changes: 25 additions & 5 deletions opentelemetry-sdk/src/opentelemetry/sdk/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

import datetime
import threading
from collections import OrderedDict, deque
from collections.abc import MutableMapping, Sequence
from typing import Optional
from collections import OrderedDict, abc, deque
from typing import Optional, Sequence, Tuple

from deprecated import deprecated
from pkg_resources import iter_entry_points


def ns_to_iso_str(nanoseconds):
Expand All @@ -41,7 +41,27 @@ def get_dict_as_key(labels):
)


class BoundedList(Sequence):
def _import_config_components(
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
selected_components, entry_point_name
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
) -> Sequence[Tuple[str, object]]:
component_entry_points = {
ep.name: ep for ep in iter_entry_points(entry_point_name)
}
component_impls = []
for selected_component in selected_components:
entry_point = component_entry_points.get(selected_component, None)
if not entry_point:
raise RuntimeError(
f"Requested component '{selected_component}' not found in entry points for '{entry_point_name}'"
)

component_impl = entry_point.load()
component_impls.append((selected_component, component_impl))

return component_impls


class BoundedList(abc.Sequence):
"""An append only list with a fixed max size.

Calls to `append` and `extend` will drop the oldest elements if there is
Expand Down Expand Up @@ -92,7 +112,7 @@ def from_seq(cls, maxlen, seq):


@deprecated(version="1.4.0") # type: ignore
class BoundedDict(MutableMapping):
class BoundedDict(abc.MutableMapping):
"""An ordered dict with a fixed max capacity.

Oldest elements are dropped when the dict is full and a new element is
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/tests/test_configurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def test_trace_init_otlp(self):

@patch.dict(environ, {OTEL_PYTHON_ID_GENERATOR: "custom_id_generator"})
@patch("opentelemetry.sdk._configuration.IdGenerator", new=IdGenerator)
@patch("opentelemetry.sdk._configuration.iter_entry_points")
@patch("opentelemetry.sdk.util.iter_entry_points")
def test_trace_init_custom_id_generator(self, mock_iter_entry_points):
mock_iter_entry_points.configure_mock(
return_value=[
Expand Down
Loading