Skip to content

Enable sampler for attach #35218

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.

Sign up for GitHub

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

Merged
jeremydvoss merged 4 commits into from
Apr 17, 2024
Merged

Enable sampler for attach #35218

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebd0ea6
Enable sampler for attach
jeremydvoss Apr 15, 2024
0fafaff
Allow sampler to take None param
jeremydvoss Apr 15, 2024
bee78a0
lint
jeremydvoss Apr 17, 2024
338ae83
lint
jeremydvoss Apr 17, 2024
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: 1 addition & 1 deletion ...tor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/trace/_sampling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,5 @@ def azure_monitor_opentelemetry_sampler_factory(sampler_argument): # pylint: di
try:
rate = float(sampler_argument)
return ApplicationInsightsSampler(rate)
except ValueError:
except (ValueError, TypeError):
return ApplicationInsightsSampler()
18 changes: 18 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/tests/trace/test_sampling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@

from azure.monitor.opentelemetry.exporter.export.trace._sampling import (
ApplicationInsightsSampler,
azure_monitor_opentelemetry_sampler_factory,
)

# pylint: disable=protected-access
class TestApplicationInsightsSampler(unittest.TestCase):

def test_constructor(self):
sampler = ApplicationInsightsSampler()
self.assertEqual(sampler._ratio, 1.0)
self.assertEqual(sampler._sample_rate, 100)

def test_constructor_ratio(self):
sampler = ApplicationInsightsSampler(0.75)
self.assertEqual(sampler._ratio, 0.75)
self.assertEqual(sampler._sample_rate, 75)
Expand Down Expand Up @@ -38,3 +44,15 @@ def test_should_sample_not_sampled(self, score_mock):
result = sampler.should_sample(None, 0, "test")
self.assertEqual(result.attributes["_MS.sampleRate"], 50)
self.assertFalse(result.decision.is_sampled())

def test_sampler_factory(self):
sampler = azure_monitor_opentelemetry_sampler_factory("1.0")
self.assertEqual(sampler._ratio, 1.0)

def test_sampler_factory_none(self):
sampler = azure_monitor_opentelemetry_sampler_factory(None)
self.assertEqual(sampler._ratio, 1.0)

def test_sampler_factory_empty(self):
sampler = azure_monitor_opentelemetry_sampler_factory("")
self.assertEqual(sampler._ratio, 1.0)
3 changes: 3 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

### Features Added

- Enable sampling for attach
([#35218](https://github.com/Azure/azure-sdk-for-python/pull/35218))

### Breaking Changes

### Bugs Fixed
Expand Down
4 changes: 4 additions & 0 deletions ...or/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_autoinstrumentation/distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from opentelemetry.sdk.environment_variables import (
_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED,
OTEL_EXPERIMENTAL_RESOURCE_DETECTORS,
OTEL_TRACES_SAMPLER,
)

from azure.core.settings import settings
Expand Down Expand Up @@ -70,6 +71,9 @@ def _configure_auto_instrumentation() -> None:
environ.setdefault(
OTEL_LOGS_EXPORTER, "azure_monitor_opentelemetry_exporter"
)
environ.setdefault(
OTEL_TRACES_SAMPLER, "azure_monitor_opentelemetry_sampler"
)
environ.setdefault(
_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED, "true"
)
Expand Down
54 changes: 53 additions & 1 deletion sdk/monitor/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from os import environ
import warnings
from unittest import TestCase
from unittest.mock import patch
Expand All @@ -13,6 +14,7 @@


class TestDistro(TestCase):
@patch.dict("os.environ", {}, clear=True)
@patch("azure.monitor.opentelemetry._autoinstrumentation.distro._is_attach_enabled", return_value=True)
@patch("azure.monitor.opentelemetry._autoinstrumentation.distro.settings")
@patch(
Expand All @@ -30,8 +32,58 @@ def test_configure(self, mock_diagnostics, azure_core_mock, attach_mock):
self.assertEqual(
azure_core_mock.tracing_implementation, OpenTelemetrySpan
)
print(environ)
self.assertEqual(
environ,
{
"OTEL_METRICS_EXPORTER": "azure_monitor_opentelemetry_exporter",
"OTEL_TRACES_EXPORTER": "azure_monitor_opentelemetry_exporter",
"OTEL_LOGS_EXPORTER": "azure_monitor_opentelemetry_exporter",
"OTEL_TRACES_SAMPLER": "azure_monitor_opentelemetry_sampler",
"OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED": "true",
"OTEL_EXPERIMENTAL_RESOURCE_DETECTORS": "azure_app_service",
}
)

@patch.dict("os.environ", {
"OTEL_METRICS_EXPORTER": "custom_metrics_exporter",
"OTEL_TRACES_EXPORTER": "custom_traces_exporter",
"OTEL_LOGS_EXPORTER": "custom_logs_exporter",
"OTEL_TRACES_SAMPLER": "custom_traces_sampler",
"OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED": "false",
"OTEL_EXPERIMENTAL_RESOURCE_DETECTORS": "custom_resource_detector",
}, clear=True)
@patch("azure.monitor.opentelemetry._autoinstrumentation.distro._is_attach_enabled", return_value=True)
@patch("azure.monitor.opentelemetry._autoinstrumentation.distro.settings")
@patch(
"azure.monitor.opentelemetry._autoinstrumentation.distro.AzureDiagnosticLogging"
)
def test_configure_env_vars_set(self, mock_diagnostics, azure_core_mock, attach_mock):
distro = AzureMonitorDistro()
with warnings.catch_warnings():
warnings.simplefilter("error")
distro.configure()
mock_diagnostics.info.assert_called_once_with(
"Azure Monitor OpenTelemetry Distro configured successfully.",
_ATTACH_SUCCESS_DISTRO
)
self.assertEqual(
azure_core_mock.tracing_implementation, OpenTelemetrySpan
)
print(environ)
Comment thread
jeremydvoss marked this conversation as resolved.
Outdated
self.assertEqual(
environ,
{
"OTEL_METRICS_EXPORTER": "custom_metrics_exporter",
"OTEL_TRACES_EXPORTER": "custom_traces_exporter",
"OTEL_LOGS_EXPORTER": "custom_logs_exporter",
"OTEL_TRACES_SAMPLER": "custom_traces_sampler",
"OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED": "false",
"OTEL_EXPERIMENTAL_RESOURCE_DETECTORS": "custom_resource_detector",
}
)

@patch.dict("os.environ", {"OTEL_PYTHON_DISABLED_INSTRUMENTATIONS": " flask,azure_sdk , urllib3"})
@patch.dict("os.environ", {"OTEL_PYTHON_DISABLED_INSTRUMENTATIONS": " flask,azure_sdk , urllib3"}, clear=True)
@patch("azure.monitor.opentelemetry._autoinstrumentation.distro._is_attach_enabled", return_value=True)
@patch("azure.monitor.opentelemetry._autoinstrumentation.distro.settings")
@patch(
Expand Down
⚡