From 0adfd41f67bf3f90a5442c2ba2bc9df48d1b9956 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Tue, 29 Aug 2023 16:31:51 -0700 Subject: [PATCH 1/4] bandit, pylint, and mypy --- sdk/monitor/azure-monitor-opentelemetry/pyproject.toml | 6 +++--- .../azure-monitor-opentelemetry/samples/tracing/simple.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml b/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml index 739b3f709776..835179598c4d 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml +++ b/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml @@ -2,6 +2,6 @@ type_check_samples = false verifytypes = false pyright = false -mypy = false -pylint = false -bandit = false +mypy = true +pylint = true +bandit = true diff --git a/sdk/monitor/azure-monitor-opentelemetry/samples/tracing/simple.py b/sdk/monitor/azure-monitor-opentelemetry/samples/tracing/simple.py index 80a45ab116dd..5bfdf21c374e 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/samples/tracing/simple.py +++ b/sdk/monitor/azure-monitor-opentelemetry/samples/tracing/simple.py @@ -6,7 +6,6 @@ from azure.monitor.opentelemetry import configure_azure_monitor from opentelemetry import trace -from opentelemetry.sdk.resources import Resource, ResourceAttributes configure_azure_monitor() From 08345a0e16859ea2e4635d74981a7dcbd86224d1 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Wed, 30 Aug 2023 10:29:03 -0700 Subject: [PATCH 2/4] Lint --- sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md | 2 ++ .../azure/monitor/opentelemetry/_configure.py | 2 +- .../azure/monitor/opentelemetry/_constants.py | 2 +- .../azure/monitor/opentelemetry/diagnostics/_status_logger.py | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 2a7876c3170e..63f604b97aae 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -12,6 +12,8 @@ ([#31744](https://github.com/Azure/azure-sdk-for-python/pull/31740)) - Add preview warning for Autoinstrumentation entry points ([#31767](https://github.com/Azure/azure-sdk-for-python/pull/31767)) +- Bandit, mypy, and pylint + ([#31881](https://github.com/Azure/azure-sdk-for-python/pull/31881)) ## 1.0.0b15 (2023-07-17) diff --git a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py index e5a833e3c685..a19510872ceb 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py @@ -34,7 +34,7 @@ SAMPLING_RATIO_ARG, ) from azure.monitor.opentelemetry._types import ConfigurationValue -from azure.monitor.opentelemetry.exporter import ( # pylint: disable=import-error +from azure.monitor.opentelemetry.exporter import ( # pylint: disable=import-error,no-name-in-module ApplicationInsightsSampler, AzureMonitorLogExporter, AzureMonitorMetricExporter, diff --git a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py index 079ce1f9c024..6f1011a0d409 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py +++ b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py @@ -10,7 +10,7 @@ from os.path import isdir from pathlib import Path -from azure.monitor.opentelemetry.exporter._connection_string_parser import ( # pylint: disable=import-error +from azure.monitor.opentelemetry.exporter._connection_string_parser import ( # pylint: disable=import-error,no-name-in-module ConnectionStringParser, ) diff --git a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/diagnostics/_status_logger.py b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/diagnostics/_status_logger.py index 898c96b7afab..ad91876fad12 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/diagnostics/_status_logger.py +++ b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/diagnostics/_status_logger.py @@ -54,7 +54,9 @@ def log_status(cls, agent_initialized_successfully, reason=None): # Change to be hostname and pid status_logger_file_name = _get_status_logger_file_name(pid) with open( - join(_STATUS_LOG_PATH, status_logger_file_name), "w" + join(_STATUS_LOG_PATH, status_logger_file_name), + "w", + encoding="utf8" ) as f: f.seek(0) f.write(dumps(status_json)) From 322832de77271ffa471a41a66fe63c722fcbfaa3 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Wed, 30 Aug 2023 11:10:35 -0700 Subject: [PATCH 3/4] Just pylint and bandit --- sdk/monitor/azure-monitor-opentelemetry/pyproject.toml | 2 +- sdk/monitor/azure-monitor-opentelemetry/setup.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml b/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml index 835179598c4d..0df88a919dca 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml +++ b/sdk/monitor/azure-monitor-opentelemetry/pyproject.toml @@ -2,6 +2,6 @@ type_check_samples = false verifytypes = false pyright = false -mypy = true +mypy = false pylint = true bandit = true diff --git a/sdk/monitor/azure-monitor-opentelemetry/setup.py b/sdk/monitor/azure-monitor-opentelemetry/setup.py index eff1896a51d3..1711f99cd10e 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -96,7 +96,6 @@ "opentelemetry-instrumentation-urllib~=0.40b0", "opentelemetry-instrumentation-urllib3~=0.40b0", "opentelemetry-sdk~=1.19.0", - "wrapt >= 1.14.0, < 2.0.0", ], entry_points={ "opentelemetry_distro": [ From ac13fdf35f8fdb7fb86ec815f2c175698ddee9c0 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Wed, 30 Aug 2023 11:11:37 -0700 Subject: [PATCH 4/4] Update changelog --- sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 63f604b97aae..ace784e19a79 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -12,7 +12,7 @@ ([#31744](https://github.com/Azure/azure-sdk-for-python/pull/31740)) - Add preview warning for Autoinstrumentation entry points ([#31767](https://github.com/Azure/azure-sdk-for-python/pull/31767)) -- Bandit, mypy, and pylint +- Bandit and pylint ([#31881](https://github.com/Azure/azure-sdk-for-python/pull/31881)) ## 1.0.0b15 (2023-07-17)