Skip to content

Commit 4ae188f

Browse files
authored
Merge pull request #276722 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c8cfa62 + bcc9ded commit 4ae188f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

articles/azure-monitor/app/opentelemetry-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ There are two methods to instrument your application:
2424
> [!TIP]
2525
> Currently, [Microsoft Entra authentication](azure-ad-authentication.md) is not available with autoinstrumentation. If you require Microsoft Entra auth, you'll need to use manual instrumentation.
2626
27-
**Manual instrumentation** is coding against the Application Insights or OpenTelemetry API. In the context of a user, it typically refers to installing a language-specific SDK in an application. There are two options for manual instrumentation:
27+
**Manual instrumentation** is coding against the Application Insights or OpenTelemetry API. In the context of a user, it typically refers to installing a language-specific SDK in an application. This means that you have to manage the updates to the latest package version by yourself. You can use this option if you need to make custom dependency calls or API calls that are not captured by default with autoinstrumentation. There are two options for manual instrumentation:
2828

2929
- [Application Insights SDKs](asp-net-core.md)
3030
- [Azure Monitor OpenTelemetry Distros](opentelemetry-enable.md).

articles/azure-resource-manager/management/delete-resource-group.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ ai-usage: ai-assisted
1313

1414
This article shows how to delete resource groups and resources. It describes how Azure Resource Manager orders the deletion of resources when you delete a resource group.
1515

16+
> [!NOTE]
17+
> To delete a resource group, you must first remove any underlying resource locks and backup data.
18+
>
19+
1620
## How order of deletion is determined
1721

1822
When you delete a resource group, Resource Manager determines the order to delete resources. It uses the following order:

0 commit comments

Comments
 (0)