Skip to content

Commit fc184d8

Browse files
committed
Resolving merge conflicts from #95842
1 parent 5ec526d commit fc184d8

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

articles/azure-monitor/app/opencensus-python-dependency.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
title: Dependency Tracking in Azure Application Insights with OpenCensus Python | Microsoft Docs
33
description: Monitor dependency calls for your Python apps via OpenCensus Python.
44
ms.topic: conceptual
5-
ms.date: 10/15/2019
5+
ms.date: 8/19/2022
66
ms.devlang: python
77
ms.custom: devx-track-python
8+
ms.reviewer: mmcc
89
---
910

1011
# Track dependencies with OpenCensus Python
@@ -104,6 +105,8 @@ OPENCENSUS = {
104105
}
105106
```
106107

108+
You can find a Django sample application that uses dependencies in the Azure Monitor OpenCensus Python samples repository located [here](https://github.com/Azure-Samples/azure-monitor-opencensus-python/tree/master/azure_monitor/django_sample).
109+
107110
## Dependencies with "mysql" integration
108111

109112
Track your MYSQL dependencies with the OpenCensus `mysql` integration. This integration supports the [mysql-connector](https://pypi.org/project/mysql-connector-python/) library.

articles/azure-monitor/app/opencensus-python-request.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Incoming Request Tracking in Azure Application Insights with OpenCensus Python | Microsoft Docs
33
description: Monitor request calls for your Python apps via OpenCensus Python.
44
ms.topic: conceptual
5-
ms.date: 10/15/2019
5+
ms.date: 8/19/2022
66
ms.devlang: python
77
ms.custom: devx-track-python
88
ms.reviewer: mmcc
@@ -42,6 +42,7 @@ First, instrument your Python application with latest [OpenCensus Python SDK](./
4242
}
4343
```
4444

45+
You can find a Django sample application in the sample Azure Monitor OpenCensus Python samples repository located [here](https://github.com/givenscj/azure-monitor-opencensus-python/tree/master/azure_monitor/django_sample).
4546
## Tracking Flask applications
4647

4748
1. Download and install `opencensus-ext-flask` from [PyPI](https://pypi.org/project/opencensus-ext-flask/) and instrument your application with the `flask` middleware. Incoming requests sent to your `flask` application will be tracked.
@@ -86,6 +87,8 @@ First, instrument your Python application with latest [OpenCensus Python SDK](./
8687
> [!NOTE]
8788
> To run Flask under uWSGI in a Docker environment, you must first add `lazy-apps = true` to the uWSGI configuration file (uwsgi.ini). For more information, see the [issue description](https://github.com/census-instrumentation/opencensus-python/issues/660).
8889

90+
You can find a Flask sample application that tracks requests in the Azure Monitor OpenCensus Python samples repository located [here](https://github.com/Azure-Samples/azure-monitor-opencensus-python/tree/master/azure_monitor/flask_sample).
91+
8992
## Tracking Pyramid applications
9093

9194
1. Download and install `opencensus-ext-django` from [PyPI](https://pypi.org/project/opencensus-ext-pyramid/) and instrument your application with the `pyramid` tween. Incoming requests sent to your `pyramid` application will be tracked.

articles/azure-monitor/app/opencensus-python.md

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Monitor Python applications with Azure Monitor | Microsoft Docs
33
description: Provides instructions to wire up OpenCensus Python with Azure Monitor
44
ms.topic: conceptual
5-
ms.date: 10/12/2021
5+
ms.date: 8/19/2022
66
ms.devlang: python
77
ms.custom: devx-track-python
88
ms.reviewer: mmcc
@@ -24,8 +24,6 @@ You may have noted that OpenCensus is converging into [OpenTelemetry](https://op
2424
## Prerequisites
2525

2626
- An Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
27-
- Python installation. This article uses [Python 3.7.0](https://www.python.org/downloads/release/python-370/), although other versions will likely work with minor changes. The Opencensus Python SDK only supports Python v2.7 and v3.4+.
28-
- Create an Application Insights [resource](./create-new-resource.md). You'll be assigned your own instrumentation key (ikey) for your resource.
2927

3028
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../../includes/azure-monitor-instrumentation-key-deprecation.md)]
3129

@@ -41,10 +39,7 @@ Install the OpenCensus Azure Monitor exporters:
4139
python -m pip install opencensus-ext-azure
4240
```
4341

44-
> [!NOTE]
45-
> The `python -m pip install opencensus-ext-azure` command assumes that you have a `PATH` environment variable set for your Python installation. If you haven't configured this variable, you need to give the full directory path to where your Python executable is located. The result is a command like this: `C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32\python.exe -m pip install opencensus-ext-azure`.
46-
47-
The SDK uses three Azure Monitor exporters to send different types of telemetry to Azure Monitor. They're trace, metrics, and logs. For more information on these telemetry types, see [the data platform overview](../data-platform.md). Use the following instructions to send these telemetry types via the three exporters.
42+
The SDK uses three Azure Monitor exporters to send different types of telemetry to Azure Monitor. They are `trace`, `metrics`, and `logs`. For more information on these telemetry types, see [the data platform overview](../data-platform.md). Use the following instructions to send these telemetry types via the three exporters.
4843

4944
## Telemetry type mappings
5045

@@ -118,7 +113,7 @@ Here are the exporters that OpenCensus provides mapped to the types of telemetry
118113
main()
119114
```
120115

121-
1. The exporter sends log data to Azure Monitor. You can find the data under `traces`.
116+
1. The exporter sends log data to Azure Monitor. You can find the data under `traces`.
122117

123118
> [!NOTE]
124119
> In this context, `traces` isn't the same as `tracing`. Here, `traces` refers to the type of telemetry that you'll see in Azure Monitor when you utilize `AzureLogHandler`. But `tracing` refers to a concept in OpenCensus and relates to [distributed tracing](./distributed-tracing.md).
@@ -560,7 +555,7 @@ For more detailed information about how to use queries and logs, see [Logs in Az
560555
* [Customization](https://github.com/census-instrumentation/opencensus-python/blob/master/README.rst#customization)
561556
* [Azure Monitor Exporters on GitHub](https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure)
562557
* [OpenCensus Integrations](https://github.com/census-instrumentation/opencensus-python#extensions)
563-
* [Azure Monitor Sample Applications](https://github.com/Azure-Samples/azure-monitor-opencensus-python)
558+
* [Azure Monitor Sample Applications](https://github.com/Azure-Samples/azure-monitor-opencensus-python/tree/master/azure_monitor)
564559

565560
## Next steps
566561

0 commit comments

Comments
 (0)