Skip to content

Commit

Permalink
Merge branch 'master' into chrisnas/udpate_dotnet_profiling
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisnas authored Jan 31, 2025
2 parents 853595c + 1107dc6 commit 219a9a7
Show file tree
Hide file tree
Showing 299 changed files with 21,023 additions and 5,326 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2025-01-27 19:29:43.883160",
"spec_repo_commit": "4a99b1d3"
"regenerated": "2025-01-30 13:15:11.274786",
"spec_repo_commit": "833109b8"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2025-01-27 19:29:52.030961",
"spec_repo_commit": "4a99b1d3"
"regenerated": "2025-01-30 13:15:19.316918",
"spec_repo_commit": "833109b8"
}
}
}
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ content/en/logs/log_collection/android.md @Datadog/rum-mo
content/en/logs/log_collection/flutter.md @Datadog/rum-mobile @DataDog/documentation
content/en/logs/log_collection/unity.md @Datadog/rum-mobile @DataDog/documentation
content/en/logs/log_collection/ios.md @Datadog/rum-mobile @DataDog/documentation
content/en/logs/log_collection/kotlin-multiplatform.md @Datadog/rum-mobile @DataDog/documentation
content/en/logs/log_collection/kotlin_multiplatform.md @Datadog/rum-mobile @DataDog/documentation

# Traces
content/en/tracing/trace_collection/dd_libraries/android.md @Datadog/rum-mobile @DataDog/documentation
Expand All @@ -128,7 +128,7 @@ content/en/real_user_monitoring/error_tracking/flutter.md @Datado
content/en/real_user_monitoring/error_tracking/mobile/unity.md @Datadog/rum-mobile @DataDog/documentation
content/en/real_user_monitoring/error_tracking/ios.md @Datadog/rum-mobile @DataDog/documentation
content/en/real_user_monitoring/error_tracking/reactnative.md @Datadog/rum-mobile @DataDog/documentation
content/en/real_user_monitoring/error_tracking/kotlin-multiplatform.md @Datadog/rum-mobile @DataDog/documentation
content/en/real_user_monitoring/error_tracking/kotlin_multiplatform.md @Datadog/rum-mobile @DataDog/documentation

# Browser SDK
content/en/real_user_monitoring/browser/ @Datadog/rum-browser @DataDog/documentation
Expand Down
8 changes: 8 additions & 0 deletions assets/scripts/config/regions.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,14 @@ export default {
ap1: 'http://ip-ranges.ap1.datadoghq.com/webhooks.json',
gov: 'http://ip-ranges.ddog-gov.com/webhooks.json'
},
ip_ranges_url_api: {
us: 'http://ip-ranges.datadoghq.com/api.json',
us3: 'http://ip-ranges.us3.datadoghq.com/api.json',
us5: 'http://ip-ranges.us5.datadoghq.com/api.json',
eu: 'http://ip-ranges.datadoghq.eu/api.json',
ap1: 'http://ip-ranges.ap1.datadoghq.com/api.json',
gov: 'http://ip-ranges.ddog-gov.com/api.json'
},
vercel_setup: {
us: 'http://app.datadoghq.com/setup/vercel',
us3: 'http://us3.datadoghq.com/setup/vercel',
Expand Down
6 changes: 2 additions & 4 deletions config/_default/menus/api.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3850,8 +3850,7 @@ menu:
- v2
operationids:
- GetMonthlyCostAttribution
unstable:
- v2
unstable: []
order: 5
- name: Get active billing dimensions for cost attribution
url: '#get-active-billing-dimensions-for-cost-attribution'
Expand All @@ -3863,8 +3862,7 @@ menu:
- v2
operationids:
- GetActiveBillingDimensions
unstable:
- v2
unstable: []
order: 5
- name: Get all custom metrics by hourly average
url: '#get-all-custom-metrics-by-hourly-average'
Expand Down
Loading

0 comments on commit 219a9a7

Please sign in to comment.