Skip to content

Enable environment variables for attribute filters #1558

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
merged 11 commits into from
Nov 3, 2025
+56 −22
Merged

Enable environment variables for attribute filters #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5e18810
Enable env vars for attribute filters
lrafeei Oct 28, 2025
adf8530
[MegaLinter] Apply linters fixes
lrafeei Oct 28, 2025
d28e2d2
Trigger tests
lrafeei Oct 28, 2025
b3158d7
Change attribute filters to space delimited
lrafeei Oct 29, 2025
2df2591
Merge branch 'main' into add-attributes-env-vars
mergify[bot] Oct 30, 2025
334a118
Merge branch 'main' into add-attributes-env-vars
mergify[bot] Nov 3, 2025
4679c39
Merge branch 'main' into add-attributes-env-vars
mergify[bot] Nov 3, 2025
a88f0d0
Merge branch 'main' into add-attributes-env-vars
mergify[bot] Nov 3, 2025
56c8a9b
Fix test assertion
TimPansino Nov 3, 2025
cfc413a
Merge branch 'main' into add-attributes-env-vars
mergify[bot] Nov 3, 2025
7c371b8
Merge branch 'main' into add-attributes-env-vars
TimPansino Nov 3, 2025
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
76 changes: 55 additions & 21 deletions newrelic/core/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,9 +803,9 @@ def default_otlp_host(host):
_settings.compressed_content_encoding = "gzip"
_settings.max_payload_size_in_bytes = 1000000

_settings.attributes.enabled = True
_settings.attributes.exclude = []
_settings.attributes.include = []
_settings.attributes.enabled = _environ_as_bool("NEW_RELIC_ATTRIBUTES_ENABLED", default=True)
_settings.attributes.exclude = _environ_as_set(os.environ.get("NEW_RELIC_ATTRIBUTES_EXCLUDE", ""))
_settings.attributes.include = _environ_as_set(os.environ.get("NEW_RELIC_ATTRIBUTES_INCLUDE", ""))

_settings.thread_profiler.enabled = True
_settings.cross_application_tracer.enabled = False
Expand All @@ -821,9 +821,15 @@ def default_otlp_host(host):
_settings.event_harvest_config.harvest_limits.analytic_event_data = _environ_as_int(
"NEW_RELIC_ANALYTICS_EVENTS_MAX_SAMPLES_STORED", default=DEFAULT_RESERVOIR_SIZE
)
_settings.transaction_events.attributes.enabled = True
_settings.transaction_events.attributes.exclude = []
_settings.transaction_events.attributes.include = []
_settings.transaction_events.attributes.enabled = _environ_as_bool(
"NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_ENABLED", default=True
)
_settings.transaction_events.attributes.exclude = _environ_as_set(
os.environ.get("NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_EXCLUDE", "")
)
_settings.transaction_events.attributes.include = _environ_as_set(
os.environ.get("NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_INCLUDE", "")
)

_settings.custom_insights_events.enabled = True
_settings.event_harvest_config.harvest_limits.custom_event_data = _environ_as_int(
Expand All @@ -847,13 +853,23 @@ def default_otlp_host(host):
_settings.event_harvest_config.harvest_limits.span_event_data = _environ_as_int(
"NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED", default=SPAN_EVENT_RESERVOIR_SIZE
)
_settings.span_events.attributes.enabled = True
_settings.span_events.attributes.exclude = []
_settings.span_events.attributes.include = []
_settings.span_events.attributes.enabled = _environ_as_bool("NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_ENABLED", default=True)
_settings.span_events.attributes.exclude = _environ_as_set(
os.environ.get("NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_EXCLUDE", "")
)
_settings.span_events.attributes.include = _environ_as_set(
os.environ.get("NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_INCLUDE", "")
)

_settings.transaction_segments.attributes.enabled = True
_settings.transaction_segments.attributes.exclude = []
_settings.transaction_segments.attributes.include = []
_settings.transaction_segments.attributes.enabled = _environ_as_bool(
"NEW_RELIC_TRANSACTION_SEGMENTS_ATTRIBUTES_ENABLED", default=True
)
_settings.transaction_segments.attributes.exclude = _environ_as_set(
os.environ.get("NEW_RELIC_TRANSACTION_SEGMENTS_ATTRIBUTES_EXCLUDE", "")
)
_settings.transaction_segments.attributes.include = _environ_as_set(
os.environ.get("NEW_RELIC_TRANSACTION_SEGMENTS_ATTRIBUTES_INCLUDE", "")
)

_settings.transaction_tracer.enabled = True
_settings.transaction_tracer.transaction_threshold = None
Expand All @@ -864,9 +880,15 @@ def default_otlp_host(host):
_settings.transaction_tracer.function_trace = []
_settings.transaction_tracer.generator_trace = []
_settings.transaction_tracer.top_n = 20
_settings.transaction_tracer.attributes.enabled = True
_settings.transaction_tracer.attributes.exclude = []
_settings.transaction_tracer.attributes.include = []
_settings.transaction_tracer.attributes.enabled = _environ_as_bool(
"NEW_RELIC_TRANSACTION_TRACER_ATTRIBUTES_ENABLED", default=True
)
_settings.transaction_tracer.attributes.exclude = _environ_as_set(
os.environ.get("NEW_RELIC_TRANSACTION_TRACER_ATTRIBUTES_EXCLUDE", "")
)
_settings.transaction_tracer.attributes.include = _environ_as_set(
os.environ.get("NEW_RELIC_TRANSACTION_TRACER_ATTRIBUTES_INCLUDE", "")
)

_settings.error_collector.enabled = True
_settings.error_collector.capture_events = True
Expand All @@ -879,9 +901,15 @@ def default_otlp_host(host):
)
_settings.error_collector.expected_status_codes = set()
_settings.error_collector._error_group_callback = None
_settings.error_collector.attributes.enabled = True
_settings.error_collector.attributes.exclude = []
_settings.error_collector.attributes.include = []
_settings.error_collector.attributes.enabled = _environ_as_bool(
"NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_ENABLED", default=True
)
_settings.error_collector.attributes.exclude = _environ_as_set(
os.environ.get("NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_EXCLUDE", "")
)
_settings.error_collector.attributes.include = _environ_as_set(
os.environ.get("NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_INCLUDE", "")
)

_settings.browser_monitoring.enabled = True
_settings.browser_monitoring.auto_instrument = True
Expand All @@ -890,9 +918,15 @@ def default_otlp_host(host):
_settings.browser_monitoring.debug = False
_settings.browser_monitoring.ssl_for_http = None
_settings.browser_monitoring.content_type = ["text/html"]
_settings.browser_monitoring.attributes.enabled = False
_settings.browser_monitoring.attributes.exclude = []
_settings.browser_monitoring.attributes.include = []
_settings.browser_monitoring.attributes.enabled = _environ_as_bool(
"NEW_RELIC_BROWSER_MONITORING_ATTRIBUTES_ENABLED", default=False
)
_settings.browser_monitoring.attributes.exclude = _environ_as_set(
os.environ.get("NEW_RELIC_BROWSER_MONITORING_ATTRIBUTES_EXCLUDE", "")
)
_settings.browser_monitoring.attributes.include = _environ_as_set(
os.environ.get("NEW_RELIC_BROWSER_MONITORING_ATTRIBUTES_INCLUDE", "")
)

_settings.transaction_name.limit = None
_settings.transaction_name.naming_scheme = os.environ.get("NEW_RELIC_TRANSACTION_NAMING_SCHEME")
Expand Down
2 changes: 1 addition & 1 deletion tests/agent_unittests/test_agent_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ def test_connect(
# Verify that agent settings sent have converted null, containers, and
# unserializable types to string
assert agent_settings_payload["proxy_host"] == "None"
assert agent_settings_payload["attributes.include"] == "[]"
assert agent_settings_payload["attributes.include"] == str(set())
assert agent_settings_payload["feature_flag"] == str(set())
assert isinstance(agent_settings_payload["attribute_filter"], str)

Expand Down
Loading