Thanks to visit codestin.com
Credit goes to github.com

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 CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## Unreleased
- Moved distro code to azure-monitor-opentelemetry-distro
([#190](https://github.com/microsoft/ApplicationInsights-Python/pull/190))
- Added OpenTelemetry Distro and Configurator
([#187](https://github.com/microsoft/ApplicationInsights-Python/pull/187))
- Initial commit
90 changes: 45 additions & 45 deletions setup.cfg → azure-monitor-opentelemetry-distro/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License in the project root for
# license information.
# --------------------------------------------------------------------------
[metadata]
name = azure-monitor-opentelemetry-distro
description = Azure Monitor Distro for OpenTelemetry Python
long_description = file: README.md
long_description_content_type = text/markdown
author = Microsoft Corporation
url = https://github.com/microsoft/ApplicationInsights-Python
platforms = any
license = MIT License
classifiers =
Development Status :: 4 - Beta
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
License :: OSI Approved :: MIT License
Typing :: Typed

[options]
python_requires = >=3.6
package_dir=
=src
packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
azure-monitor-opentelemetry-exporter == 1.0.0b7
opentelemetry-instrumentation == 0.32b0

[options.packages.find]
where = src

[options.entry_points]
opentelemetry_distro =
azure_monitor_opentelemetry_distro = azure.monitor.opentelemetry.distro.distro:AzureMonitorDistro
opentelemetry_configurator =
azure_monitor_opentelemetry_configurator = azure.monitor.opentelemetry.distro.configurator:AzureMonitorConfigurator
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License in the project root for
# license information.
# --------------------------------------------------------------------------
[metadata]
name = azure-monitor-opentelemetry-distro
description = Azure Monitor Distro for OpenTelemetry Python
long_description = file: README.md
long_description_content_type = text/markdown
author = Microsoft Corporation
url = https://github.com/microsoft/ApplicationInsights-Python
platforms = any
license = MIT License
classifiers =
Development Status :: 4 - Beta
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
License :: OSI Approved :: MIT License
Typing :: Typed

[options]
python_requires = >=3.6
package_dir=
=src
packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
azure-monitor-opentelemetry-exporter == 1.0.0b7
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is the only difference. I am not sure why the differ is not catching this correctly.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's whitespace related -- use the gear and select hide whitespace worked for me.

opentelemetry-instrumentation == 0.32b0

[options.packages.find]
where = src

[options.entry_points]
opentelemetry_distro =
azure_monitor_opentelemetry_distro = azure.monitor.opentelemetry.distro.distro:AzureMonitorDistro
opentelemetry_configurator =
azure_monitor_opentelemetry_configurator = azure.monitor.opentelemetry.distro.configurator:AzureMonitorConfigurator
File renamed without changes.
8 changes: 3 additions & 5 deletions tests/test_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@

import unittest

from azure.monitor.opentelemetry.exporter import (
AzureMonitorLogExporter,
AzureMonitorMetricExporter,
AzureMonitorTraceExporter,
)
from azure.monitor.opentelemetry.exporter import (AzureMonitorLogExporter,
AzureMonitorMetricExporter,
AzureMonitorTraceExporter)


class TestAzureMonitorExporters(unittest.TestCase):
Expand Down
14 changes: 9 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ envlist =
deps =
-r test-requirements.txt

commands_pre =
python -m pip install -e {toxinidir}/azure-monitor-opentelemetry-distro

commands =
pytest {posargs}

Expand All @@ -19,10 +22,11 @@ deps =
-r lint-requirements.txt

commands_pre =
python -m pip install -e {toxinidir}
python -m pip install -e {toxinidir}/azure-monitor-opentelemetry-distro

commands =
black src
isort --recursive src
pylint src
flake8 src
black {toxinidir}
isort --recursive {toxinidir}
; TODO
; pylint {toxinidir}
flake8 {toxinidir}