diff --git a/CHANGELOG.md b/CHANGELOG.md index c9395915..737e4363 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 \ No newline at end of file diff --git a/setup.cfg b/azure-monitor-opentelemetry-distro/setup.cfg similarity index 97% rename from setup.cfg rename to azure-monitor-opentelemetry-distro/setup.cfg index 2f07471b..04b01265 100644 --- a/setup.cfg +++ b/azure-monitor-opentelemetry-distro/setup.cfg @@ -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 + 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 diff --git a/setup.py b/azure-monitor-opentelemetry-distro/setup.py similarity index 100% rename from setup.py rename to azure-monitor-opentelemetry-distro/setup.py diff --git a/src/azure/monitor/opentelemetry/distro/configurator.py b/azure-monitor-opentelemetry-distro/src/azure/monitor/opentelemetry/distro/configurator.py similarity index 100% rename from src/azure/monitor/opentelemetry/distro/configurator.py rename to azure-monitor-opentelemetry-distro/src/azure/monitor/opentelemetry/distro/configurator.py diff --git a/src/azure/monitor/opentelemetry/distro/distro.py b/azure-monitor-opentelemetry-distro/src/azure/monitor/opentelemetry/distro/distro.py similarity index 100% rename from src/azure/monitor/opentelemetry/distro/distro.py rename to azure-monitor-opentelemetry-distro/src/azure/monitor/opentelemetry/distro/distro.py diff --git a/src/azure/monitor/opentelemetry/distro/version.py b/azure-monitor-opentelemetry-distro/src/azure/monitor/opentelemetry/distro/version.py similarity index 100% rename from src/azure/monitor/opentelemetry/distro/version.py rename to azure-monitor-opentelemetry-distro/src/azure/monitor/opentelemetry/distro/version.py diff --git a/tests/test_exporter.py b/tests/test_exporter.py index 21561ac5..f2963a07 100644 --- a/tests/test_exporter.py +++ b/tests/test_exporter.py @@ -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): diff --git a/tox.ini b/tox.ini index 473372d0..7cd775c2 100644 --- a/tox.ini +++ b/tox.ini @@ -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} @@ -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}