Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/sentry/api/serializers/models/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ class DetailedProjectSerializer(ProjectWithTeamSerializer):
"sentry:fingerprinting_rules",
"sentry:relay_pii_config",
"sentry:dynamic_sampling",
"sentry:breakdowns",
"feedback:branding",
"digests:mail:minimum_delay",
"digests:mail:maximum_delay",
Expand Down Expand Up @@ -698,6 +699,7 @@ def get_value_with_default(key):
"builtinSymbolSources": get_value_with_default("sentry:builtin_symbol_sources"),
"symbolSources": attrs["options"].get("sentry:symbol_sources"),
"dynamicSampling": get_value_with_default("sentry:dynamic_sampling"),
"breakdowns": get_value_with_default("sentry:breakdowns"),
}
)
return data
Expand Down
13 changes: 13 additions & 0 deletions src/sentry/projectoptions/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,16 @@

# Default dynamic sampling rules
register(key="sentry:dynamicSampling", epoch_defaults={1: []})

# Default breakdowns config
register(
key="sentry:breakdowns",
epoch_defaults={
1: {
"span_ops": {
"type": "span_operations",
"matches": ["http", "db", "browser", "resource"],
}
},
},
)
5 changes: 5 additions & 0 deletions src/sentry/relay/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ def get_project_config(project, full_config=True, project_keys=None):
if dynamic_sampling is not None:
cfg["config"]["dynamicSampling"] = dynamic_sampling

if features.has("organizations:performance-ops-breakdown", project.organization):
breakdowns_config = project.get_option("sentry:breakdowns")
if breakdowns_config is not None:
cfg["config"]["breakdowns"] = breakdowns_config

if not full_config:
# This is all we need for external Relay processors
return ProjectConfig(project, **cfg)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
---
created: '2021-03-24T22:52:16.803444Z'
creator: sentry
source: tests/sentry/relay/test_config.py
---
config:
allowedDomains:
- '*'
breakdowns:
span_ops:
matches:
- http
- db
- browser
- resource
type: span_operations
datascrubbingSettings:
excludeFields: []
scrubData: true
scrubDefaults: true
scrubIpAddresses: false
sensitiveFields: []
eventRetention: null
filterSettings:
browserExtensions:
isEnabled: false
csp:
disallowedSources:
- about
- ms-browser-extension
- chrome://*
- chrome-extension://*
- chromeinvokeimmediate://*
- chromenull://*
- data:text/html,chromewebdata
- safari-extension://*
- mxaddon-pkg://*
- jar://*
- webviewprogressproxy://*
- ms-browser-extension://*
- tmtbff://*
- mbinit://*
- symres://*
- resource://*
- moz-extension://*
- '*.metrext.com'
- static.image2play.com
- '*.tlscdn.com'
- 73a5b0806e464be8bd4e694c744624f0.com
- 020dfefc4ac745dab7594f2f771c1ded.com
- '*.superfish.com'
- addons.mozilla.org
- v.zilionfast.in
- widgets.amung.us
- '*.superfish.com'
- xls.searchfun.in
- istatic.datafastguru.info
- v.zilionfast.in
- localhost
- resultshub-a.akamaihd.net
- pulseadnetwork.com
- gateway.zscalertwo.net
- www.passpack.com
- middlerush-a.akamaihd.net
- www.websmartcenter.com
- a.linkluster.com
- saveyoutime.ru
- cdncache-a.akamaihd.net
- x.rafomedia.com
- savingsslider-a.akamaihd.net
- injections.adguard.com
- icontent.us
- amiok.org
- connectionstrenth.com
- siteheart.net
- netanalitics.space
- printapplink.com
- godlinkapp.com
- devappstor.com
- hoholikik.club
- smartlink.cool
- promfflinkdev.com
legacyBrowsers:
isEnabled: false
localhost:
isEnabled: false
webCrawlers:
isEnabled: false
groupingConfig:
enhancements: eJybzDhxY3J-bm5-npWRgaGlroGxrpHxBABcTQcY
id: newstyle:2019-10-29
piiConfig:
applications:
$string:
- organization:remove_ips_and_macs
- project:remove_ips_and_macs
rules:
organization:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
project:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
quotas: []
trustedRelays: []
disabled: false
slug: bar
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
created: '2021-03-24T22:52:16.674401Z'
creator: sentry
source: tests/sentry/relay/test_config.py
---
config:
allowedDomains:
- '*'
breakdowns:
span_ops:
matches:
- http
- db
- browser
- resource
type: span_operations
datascrubbingSettings:
excludeFields: []
scrubData: true
scrubDefaults: true
scrubIpAddresses: false
sensitiveFields: []
piiConfig:
applications:
$string:
- organization:remove_ips_and_macs
- project:remove_ips_and_macs
rules:
organization:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
project:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
trustedRelays: []
disabled: false
slug: bar
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
---
created: '2021-03-24T22:52:16.551136Z'
creator: sentry
source: tests/sentry/relay/test_config.py
---
config:
allowedDomains:
- '*'
datascrubbingSettings:
excludeFields: []
scrubData: true
scrubDefaults: true
scrubIpAddresses: false
sensitiveFields: []
eventRetention: null
filterSettings:
browserExtensions:
isEnabled: false
csp:
disallowedSources:
- about
- ms-browser-extension
- chrome://*
- chrome-extension://*
- chromeinvokeimmediate://*
- chromenull://*
- data:text/html,chromewebdata
- safari-extension://*
- mxaddon-pkg://*
- jar://*
- webviewprogressproxy://*
- ms-browser-extension://*
- tmtbff://*
- mbinit://*
- symres://*
- resource://*
- moz-extension://*
- '*.metrext.com'
- static.image2play.com
- '*.tlscdn.com'
- 73a5b0806e464be8bd4e694c744624f0.com
- 020dfefc4ac745dab7594f2f771c1ded.com
- '*.superfish.com'
- addons.mozilla.org
- v.zilionfast.in
- widgets.amung.us
- '*.superfish.com'
- xls.searchfun.in
- istatic.datafastguru.info
- v.zilionfast.in
- localhost
- resultshub-a.akamaihd.net
- pulseadnetwork.com
- gateway.zscalertwo.net
- www.passpack.com
- middlerush-a.akamaihd.net
- www.websmartcenter.com
- a.linkluster.com
- saveyoutime.ru
- cdncache-a.akamaihd.net
- x.rafomedia.com
- savingsslider-a.akamaihd.net
- injections.adguard.com
- icontent.us
- amiok.org
- connectionstrenth.com
- siteheart.net
- netanalitics.space
- printapplink.com
- godlinkapp.com
- devappstor.com
- hoholikik.club
- smartlink.cool
- promfflinkdev.com
legacyBrowsers:
isEnabled: false
localhost:
isEnabled: false
webCrawlers:
isEnabled: false
groupingConfig:
enhancements: eJybzDhxY3J-bm5-npWRgaGlroGxrpHxBABcTQcY
id: newstyle:2019-10-29
piiConfig:
applications:
$string:
- organization:remove_ips_and_macs
- project:remove_ips_and_macs
rules:
organization:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
project:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
quotas: []
trustedRelays: []
disabled: false
slug: bar
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
created: '2021-03-24T22:52:16.337094Z'
creator: sentry
source: tests/sentry/relay/test_config.py
---
config:
allowedDomains:
- '*'
datascrubbingSettings:
excludeFields: []
scrubData: true
scrubDefaults: true
scrubIpAddresses: false
sensitiveFields: []
piiConfig:
applications:
$string:
- organization:remove_ips_and_macs
- project:remove_ips_and_macs
rules:
organization:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
project:remove_ips_and_macs:
hide_rule: false
redaction:
method: remove
rules:
- '@ip'
- '@mac'
type: multiple
trustedRelays: []
disabled: false
slug: bar
Loading